From 5bd546af095168f791294164746478fc859237c1 Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 18 Aug 2012 14:06:52 +0200 Subject: [PATCH] movie.py: correctly handle S00 and E00 --- ox/movie.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ox/movie.py b/ox/movie.py index 4cd42e6..73b5be8 100644 --- a/ox/movie.py +++ b/ox/movie.py @@ -58,8 +58,8 @@ def format_path(data, has_director_directory=True): def parse_path(path): ''' # 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'] - 'F/Frost, Mark; Lynch, David/Twin Peaks (1991)/Twin Peaks (S01E01) Pilot.European Version.Part 1.Welcome to Twin Peaks.en.fr.mpg' + >>> 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 (S01E00) Pilot.European Version.Part 1.Welcome to Twin Peaks.en.fr.mpg' # pop directory title off file name >>> parse_path('U/Unknown Director/www.xxx.com.._/www.xxx.com....Directors\'s Cut.avi')['version'] 'Director\'s Cut' @@ -149,8 +149,8 @@ def parse_path(path): data['seriesTitle'] = data['title'] data['title'] = '%s (%s%s)%s' % ( data['title'], - 'S%02d' % data['season'] if data['season'] else '', - 'E%02d' % data['episode'] if data['episode'] else '', + 'S%02d' % data['season'] if data['season'] != None else '', + 'E%02d' % data['episode'] if data['episode'] != None else '', ' %s' % data['episodeTitle'] if data['episodeTitle'] else '' ) data['seriesYear'] = data['year']