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

movie.py: more bugfixes

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

4
ox/movie.py
View file

@ -66,7 +66,7 @@ def parse_item_files(files):
return '\n'.join([ return '\n'.join([
file['version'] or '', file['version'] or '',
file['part'] or '', file['part'] or '',
file['language'] if file['language'] and file['type'] == 'subtitle' else '', file['language'] or '',
file['extension'] or '' file['extension'] or ''
]) ])
def get_version_key(file, extension=True): def get_version_key(file, extension=True):
@ -295,7 +295,7 @@ def parse_path(path):
while data['partTitle'] and len(parts) and not re.search('^[a-z]{2}$', parts[0]): while data['partTitle'] and len(parts) and not re.search('^[a-z]{2}$', parts[0]):
data['partTitle'] += '.%s' % parts.pop(0) data['partTitle'] += '.%s' % parts.pop(0)
# language # language
data['language'] = parts.pop(0) if len(parts) and re.search('^[a-z]{2}$', parts[0]) else None data['language'] = parts.pop(0) if len(parts) and re.search('^[a-z]{2}$', parts[0]) and data['type'] == 'subtitle' else None
# extension # extension
data['extension'] = re.sub('^mpeg$', 'mpg', extension.lower()) if extension else None data['extension'] = re.sub('^mpeg$', 'mpg', extension.lower()) if extension else None
# type # type