Compare commits

..

No commits in common. "10a8892a551031b8524bf872bd16d5687743c259" and "d4372d05957d25796879399111b6f5bc53f98751" have entirely different histories.

2 changed files with 12 additions and 6 deletions

View file

@ -542,8 +542,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"sort": true
},
{
"id": "chapters",
"title": "Chapters",
"id": "batch",
"title": "Batch",
"type": ["string"],
"autocomplete": true,
"columnWidth": 80,
@ -551,6 +551,15 @@ 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",

View file

@ -877,7 +877,6 @@ 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
@ -1077,9 +1076,7 @@ def join_subtitles(base_prefix, options):
scenes = list(sorted(glob('%s/*/scene.json' % base_prefix)))
data = []
position = 0
for scene_json in scenes:
with open(scene_json) as fd:
scene = json.load(fd)
for scene in scenes:
subs = scene_subtitles(scene, options)
data += shift_clips(subs, position)
position += get_scene_duration(scene)