0x2620/pandora_render
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix index sort

Browse source
This commit is contained in:
j 2018-11-12 11:52:02 +00:00
parent 5ec372e7ed
commit 2680a96072
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edit.py
View file

@ -72,6 +72,10 @@ def normalize(name):
def sort_clips(edit, sort): def sort_clips(edit, sort):
clips = edit['clips'] clips = edit['clips']
idx = 0
for clip in clips:
clip['index'] = idx
idx += 1
reverse = sort.startswith('-') reverse = sort.startswith('-')
last = '' if reverse else 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' last = '' if reverse else 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
sort = sort.lstrip('-') sort = sort.lstrip('-')
@ -83,7 +87,7 @@ def sort_clips(edit, sort):
'id', 'index', 'in', 'out', 'duration', 'id', 'index', 'in', 'out', 'duration',
'title', 'director', 'year', 'videoRatio', 'title', 'director', 'year', 'videoRatio',
]: ]:
s = sorted(clips, key=lambda c: (str(c.get(sort, last)), c['title'], c['in'], c['out'])) s = sorted(clips, key=lambda c: (ox.sort_string(str(c.get(sort, last))), c['title'], c['in'], c['out']))
if reverse: if reverse:
s = reversed(s) s = reversed(s)
else: else: