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

movie.py: correctly handle subdirectories

Browse source
This commit is contained in:
rolux 2012-08-16 16:31:58 +02:00
parent 9de043422e
commit 3e657b09c0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ox/movie.py
View file

@ -25,11 +25,10 @@ def format_path(data, has_director_directory=True):
director = data['seriesDirectorSort' if data['isEpisode'] else 'directorSort'] or ['Unknown Director'] director = data['seriesDirectorSort' if data['isEpisode'] else 'directorSort'] or ['Unknown Director']
title = data['seriesTitle' if data['isEpisode'] else 'title'] or 'Untitled' title = data['seriesTitle' if data['isEpisode'] else 'title'] or 'Untitled'
year = data['seriesYear' if data['isEpisode'] else 'year'] year = data['seriesYear' if data['isEpisode'] else 'year']
return '/'.join(map(format_underscores, filter(lambda x: x != None, [ parts = map(format_underscores, filter(lambda x: x != None, [
data['directory'] or director[0][0] if has_director_directory else title[0], data['directory'] or director[0][0] if has_director_directory else title[0],
'; '.join(director) if has_director_directory else None, '; '.join(director) if has_director_directory else None,
'%s%s' % (title, ' (%s)' % year if year else ''), '%s%s' % (title, ' (%s)' % year if year else ''),
data['subdirectory'],
'%s%s%s%s%s%s' % ( '%s%s%s%s%s%s' % (
data['title'] or 'Untitled', data['title'] or 'Untitled',
'.%s' % data['version'] if data['version'] else '', '.%s' % data['version'] if data['version'] else '',
@ -38,7 +37,10 @@ def format_path(data, has_director_directory=True):
'.%s' % data['language'].replace('/', '.') if not data['language'] in [None, 'en'] else '', '.%s' % data['language'].replace('/', '.') if not data['language'] in [None, 'en'] else '',
'.%s' % data['extension'] if data['extension'] else '' '.%s' % data['extension'] if data['extension'] else ''
) )
]))) ]))
if data['subdirectory']:
parts.insert(-1, data['subdirectory'])
return '/'.join(parts)
def parse_path(path): def parse_path(path):
''' '''
@ -87,7 +89,7 @@ def parse_path(path):
parts = map(parse_underscores, path.split('/')) parts = map(parse_underscores, path.split('/'))
# subdirectory # subdirectory
if len(parts) > 4: if len(parts) > 4:
data['subdirectory'] = parts[3:-1] data['subdirectory'] = '/'.join(parts[3:-1])
parts = parts[:3] + parts[-1:] parts = parts[:3] + parts[-1:]
else: else:
data['subdirectory'] = None data['subdirectory'] = None