Compare commits
2 commits
d4372d0595
...
10a8892a55
| Author | SHA1 | Date | |
|---|---|---|---|
| 10a8892a55 | |||
| c2762557b6 |
2 changed files with 6 additions and 12 deletions
13
config.jsonc
13
config.jsonc
|
|
@ -542,8 +542,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
|
|||
"sort": true
|
||||
},
|
||||
{
|
||||
"id": "batch",
|
||||
"title": "Batch",
|
||||
"id": "chapters",
|
||||
"title": "Chapters",
|
||||
"type": ["string"],
|
||||
"autocomplete": true,
|
||||
"columnWidth": 80,
|
||||
|
|
@ -551,15 +551,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
|
|||
"poster": true,
|
||||
"sort": true
|
||||
},
|
||||
{
|
||||
"id": "editingtags",
|
||||
"title": "Editing Tags",
|
||||
"type": ["string"],
|
||||
"autocomplete": true,
|
||||
"columnWidth": 380,
|
||||
"filter": true,
|
||||
"sort": true
|
||||
},
|
||||
{
|
||||
"id": "tags",
|
||||
"title": "Tags",
|
||||
|
|
|
|||
|
|
@ -877,6 +877,7 @@ def shift_clips(data, offset):
|
|||
for clip in data:
|
||||
clip['in'] += offset
|
||||
clip['out'] += offset
|
||||
return data
|
||||
|
||||
def scene_subtitles(scene, options):
|
||||
import item.models
|
||||
|
|
@ -1076,7 +1077,9 @@ def join_subtitles(base_prefix, options):
|
|||
scenes = list(sorted(glob('%s/*/scene.json' % base_prefix)))
|
||||
data = []
|
||||
position = 0
|
||||
for scene in scenes:
|
||||
for scene_json in scenes:
|
||||
with open(scene_json) as fd:
|
||||
scene = json.load(fd)
|
||||
subs = scene_subtitles(scene, options)
|
||||
data += shift_clips(subs, position)
|
||||
position += get_scene_duration(scene)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue