Compare commits

...

2 Commits

Author SHA1 Message Date
j 3c80c721d3 typo 2018-12-01 19:47:06 +01:00
j 97a65ad52d use code as secondary sort 2018-12-01 19:47:06 +01:00
1 changed files with 7 additions and 2 deletions

View File

@ -470,10 +470,15 @@ class Engine:
f.write(json.dumps(videos, indent=4, sort_keys=True))
# Get video order
order = {video['id']: int(video['order']) for video in videos}
code = {video['id']: video['code'] for video in videos}
# Sort clips
clips = sorted(
clips,
key=lambda clip: (order[clip['id'].split('/')[0]], clip['in'])
key=lambda clip: (
order[clip['id'].split('/')[0]],
ox.sort_string(code[clip['id'].split('/')[0]]),
clip['in']
)
)
# Get and cache playlists
self.playlists = [playlist for playlist in [{
@ -488,7 +493,7 @@ class Engine:
} for clip in clips if clip['value'] == storyline['name']]
} for storyline in storylines] if playlist['clips']]
with open(os.path.join(self.path, 'playlists.json'), 'w') as f:
f.write(json.dumps(self.playlists, indent=4, sort_keys=True))
f.write(json.dumps(self.playlists, indent=4, sort_keys=True, ensure_ascii=False))
self.update_keywords()
def update_keywords(self):