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

merging changes

Browse source
This commit is contained in:
rolux 2012-09-01 05:16:28 +02:00
parent fb26797b95
commit e04cc5b819
1 changed files with 24 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
ox/movie.py
View file

@ -39,7 +39,6 @@ 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']
language = 'en' if data['type'] == 'subtitle' and data['language'] == None else data['language']
parts = 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,
@ -58,7 +57,6 @@ def format_path(data, has_director_directory=True):
return '/'.join(parts) return '/'.join(parts)
def parse_item_files(files): def parse_item_files(files):
# parses a list of file objects associated with one item (file objects # parses a list of file objects associated with one item (file objects
# as returned by parse_path, but extended with 'path' and 'time') # as returned by parse_path, but extended with 'path' and 'time')
@ -374,45 +372,32 @@ def parse_movie_path(path):
language = '' language = ''
#season/episode/episodeTitle #season/episode/episodeTitle
match = re.compile('(.+?) \((S(\d+))?(E(\d+))?\)( (.+?))?\.').match(parts[-1]) season = find_re(parts[-1], '\.Season (\d+)\.')
if match: if season:
seriesTitle = match.group(1) season = int(season)
season = match.group(3)
episode = match.group(5)
episodeTitle = (match.group(6) or '').strip()
if episode != None:
episode = int(episode)
if season != None:
season = int(season)
if episode and not season:
season = 1
else: else:
season = find_re(parts[-1], '\.Season (\d+)\.') season = None
if season:
season = int(season) episode = find_re(parts[-1], '\.Episode[s]* ([\d+]+)\.')
if episode:
episode = episode.split('+')[0]
episode = int(episode)
else:
episode = None
if episode and 'Episode %d'%episode in fileparts:
episodeTitle = fileparts.index('Episode %d' % episode) + 1
episodeTitle = fileparts[episodeTitle]
if episodeTitle == extension or episodeTitle.startswith('Part'):
episodeTitle = None
if not season and 'Episode' in fileparts:
episodeTitle = fileparts.index('Episode') + 1
episodeTitle = fileparts[episodeTitle]
if episodeTitle == extension or episodeTitle.startswith('Part'):
episodeTitle = None
else: else:
season = None season = 1
episode = find_re(parts[-1], '\.Episode[s]* ([\d+]+)\.')
if episode:
episode = episode.split('+')[0]
episode = int(episode)
else:
episode = None
if episode and 'Episode %d'%episode in fileparts:
episodeTitle = fileparts.index('Episode %d' % episode) + 1
episodeTitle = fileparts[episodeTitle]
if episodeTitle == extension or episodeTitle.startswith('Part'):
episodeTitle = None
if not season and 'Episode' in fileparts:
episodeTitle = fileparts.index('Episode') + 1
episodeTitle = fileparts[episodeTitle]
if episodeTitle == extension or episodeTitle.startswith('Part'):
episodeTitle = None
else:
season = 1
if season: if season:
seriesTitle = title seriesTitle = title