0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

movie.py: use '/', not '.', as separator in version key

Browse source
This commit is contained in:
rolux 2012-08-22 12:53:02 +02:00
parent f630291584
commit f1e897e96e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ox/movie.py
View file

@ -70,7 +70,7 @@ def parse_item_files(files):
file['extension'] or '' file['extension'] or ''
]) ])
def get_version_key(file, extension=True): def get_version_key(file, extension=True):
return '%s.%s-part.%s' % ( return '%s/%s-part/%s' % (
file['version'] or '', file['version'] or '',
'single' if file['part'] == None else 'multi', 'single' if file['part'] == None else 'multi',
file['extension'] if extension else '' file['extension'] if extension else ''
@ -99,8 +99,8 @@ def parse_item_files(files):
time[version_key] = sorted([time[version_key], file['time']])[-1] if version_key in time else file['time'] time[version_key] = sorted([time[version_key], file['time']])[-1] if version_key in time else file['time']
# determine preferred video extension (newest) # determine preferred video extension (newest)
extension = {} extension = {}
for key in set(['.'.join(version_key.split('.')[:-1]) + '.' for version_key in version_files]): for key in set(['/'.join(version_key.split('/')[:-1]) + '.' for version_key in version_files]):
extensions = set([version_key.split('.')[-1] for version_key in version_files if version_key.startswith(key)]) extensions = set([version_key.split('/')[-1] for version_key in version_files if version_key.startswith(key)])
extension[key] = sorted(extensions, key=lambda x: time[key + x])[-1] extension[key] = sorted(extensions, key=lambda x: time[key + x])[-1]
# associate other (non-video) files # associate other (non-video) files
other_files = [file for file in unique_files if file['type'] != 'video'] other_files = [file for file in unique_files if file['type'] != 'video']