movie.py: correctly handle S00 and E00

This commit is contained in:
rolux 2012-08-18 14:06:52 +02:00
commit 5bd546af09

View file

@ -58,8 +58,8 @@ def format_path(data, has_director_directory=True):
def parse_path(path): def parse_path(path):
''' '''
# all keys # all keys
>>> parse_path('F/Frost, Mark; Lynch, David/Twin Peaks (1991)/Twin Peaks (S01E01) Pilot.European Version.Part 1.Welcome to Twin Peaks.en.fr.MPEG')['path'] >>> parse_path('F/Frost, Mark; Lynch, David/Twin Peaks (1991)/Twin Peaks (S01E00) Pilot.European Version.Part 1.Welcome to Twin Peaks.en.fr.MPEG')['path']
'F/Frost, Mark; Lynch, David/Twin Peaks (1991)/Twin Peaks (S01E01) Pilot.European Version.Part 1.Welcome to Twin Peaks.en.fr.mpg' 'F/Frost, Mark; Lynch, David/Twin Peaks (1991)/Twin Peaks (S01E00) Pilot.European Version.Part 1.Welcome to Twin Peaks.en.fr.mpg'
# pop directory title off file name # pop directory title off file name
>>> parse_path('U/Unknown Director/www.xxx.com.._/www.xxx.com....Directors\'s Cut.avi')['version'] >>> parse_path('U/Unknown Director/www.xxx.com.._/www.xxx.com....Directors\'s Cut.avi')['version']
'Director\'s Cut' 'Director\'s Cut'
@ -149,8 +149,8 @@ def parse_path(path):
data['seriesTitle'] = data['title'] data['seriesTitle'] = data['title']
data['title'] = '%s (%s%s)%s' % ( data['title'] = '%s (%s%s)%s' % (
data['title'], data['title'],
'S%02d' % data['season'] if data['season'] else '', 'S%02d' % data['season'] if data['season'] != None else '',
'E%02d' % data['episode'] if data['episode'] else '', 'E%02d' % data['episode'] if data['episode'] != None else '',
' %s' % data['episodeTitle'] if data['episodeTitle'] else '' ' %s' % data['episodeTitle'] if data['episodeTitle'] else ''
) )
data['seriesYear'] = data['year'] data['seriesYear'] = data['year']