support new series format in parse_movie_path
This commit is contained in:
parent
b728fdc9b7
commit
ebf3b691b2
1 changed files with 38 additions and 25 deletions
63
ox/movie.py
63
ox/movie.py
|
@ -374,32 +374,45 @@ def parse_movie_path(path):
|
||||||
language = ''
|
language = ''
|
||||||
|
|
||||||
#season/episode/episodeTitle
|
#season/episode/episodeTitle
|
||||||
season = find_re(parts[-1], '\.Season (\d+)\.')
|
match = re.compile('(.+?) \((S(\d+))?(E(\d+))?\)( (.+?))?\.').match(parts[-1])
|
||||||
if season:
|
if match:
|
||||||
season = int(season)
|
seriesTitle = match.group(1)
|
||||||
else:
|
season = match.group(3)
|
||||||
season = None
|
episode = match.group(5)
|
||||||
|
episodeTitle = (match.group(6) or '').strip()
|
||||||
episode = find_re(parts[-1], '\.Episode[s]* ([\d+]+)\.')
|
if episode != None:
|
||||||
if episode:
|
episode = int(episode)
|
||||||
episode = episode.split('+')[0]
|
if season != None:
|
||||||
episode = int(episode)
|
season = int(season)
|
||||||
else:
|
if episode and not season:
|
||||||
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
|
season = 1
|
||||||
|
else:
|
||||||
|
season = find_re(parts[-1], '\.Season (\d+)\.')
|
||||||
|
if season:
|
||||||
|
season = int(season)
|
||||||
|
else:
|
||||||
|
season = None
|
||||||
|
|
||||||
|
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
|
||||||
|
|
Loading…
Add table
Reference in a new issue