Skip to content

Implemented matching against filename and path #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Implemented matching against filename and path #108

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a8fa66
Implemented matching against filename and path
m42e Mar 3, 2015
6fd2675
removed debug output
m42e Mar 3, 2015
9084a0e
Added comments and changed variable names
m42e Mar 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 97 additions & 90 deletions tvnamer/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,101 +322,108 @@ def parse(self):
"""
_, filename = os.path.split(self.path)

"""Create an array of operands to parse later.
This will make further additions like metadata contained
somewhere easier to add.
"""
filename = applyCustomInputReplacements(filename)
fullpath = applyCustomInputReplacements(self.path)
operands = [fullpath, filename]

for parsingelement in operands:
for cmatcher in self.compiled_regexs:
match = cmatcher.match(parsingelement)
if match:
namedgroups = match.groupdict().keys()

if 'episodenumber1' in namedgroups:
# Multiple episodes, have episodenumber1 or 2 etc
epnos = []
for cur in namedgroups:
epnomatch = re.match('episodenumber(\d+)', cur)
if epnomatch:
epnos.append(int(match.group(cur)))
epnos.sort()
episodenumbers = epnos

elif 'episodenumberstart' in namedgroups:
# Multiple episodes, regex specifies start and end number
start = int(match.group('episodenumberstart'))
end = int(match.group('episodenumberend'))
if end - start > 5:
warn("WARNING: %s episodes detected in file: %s, confused by numeric episode name, using first match: %s" %(end - start, parsingelement, start))
episodenumbers = [start]
elif start > end:
# Swap start and end
start, end = end, start
episodenumbers = list(range(start, end + 1))
else:
episodenumbers = list(range(start, end + 1))

elif 'episodenumber' in namedgroups:
episodenumbers = [int(match.group('episodenumber')), ]

elif 'year' in namedgroups or 'month' in namedgroups or 'day' in namedgroups:
if not all(['year' in namedgroups, 'month' in namedgroups, 'day' in namedgroups]):
raise ConfigValueError(
"Date-based regex must contain groups 'year', 'month' and 'day'")
match.group('year')

year = handleYear(match.group('year'))

episodenumbers = [datetime.date(year,
int(match.group('month')),
int(match.group('day')))]

for cmatcher in self.compiled_regexs:
match = cmatcher.match(filename)
if match:
namedgroups = match.groupdict().keys()

if 'episodenumber1' in namedgroups:
# Multiple episodes, have episodenumber1 or 2 etc
epnos = []
for cur in namedgroups:
epnomatch = re.match('episodenumber(\d+)', cur)
if epnomatch:
epnos.append(int(match.group(cur)))
epnos.sort()
episodenumbers = epnos

elif 'episodenumberstart' in namedgroups:
# Multiple episodes, regex specifies start and end number
start = int(match.group('episodenumberstart'))
end = int(match.group('episodenumberend'))
if end - start > 5:
warn("WARNING: %s episodes detected in file: %s, confused by numeric episode name, using first match: %s" %(end - start, filename, start))
episodenumbers = [start]
elif start > end:
# Swap start and end
start, end = end, start
episodenumbers = list(range(start, end + 1))
else:
episodenumbers = list(range(start, end + 1))

elif 'episodenumber' in namedgroups:
episodenumbers = [int(match.group('episodenumber')), ]

elif 'year' in namedgroups or 'month' in namedgroups or 'day' in namedgroups:
if not all(['year' in namedgroups, 'month' in namedgroups, 'day' in namedgroups]):
raise ConfigValueError(
"Date-based regex must contain groups 'year', 'month' and 'day'")
match.group('year')
"Regex does not contain episode number group, should"
"contain episodenumber, episodenumber1-9, or"
"episodenumberstart and episodenumberend\n\nPattern"
"was:\n" + cmatcher.pattern)

year = handleYear(match.group('year'))

episodenumbers = [datetime.date(year,
int(match.group('month')),
int(match.group('day')))]

else:
raise ConfigValueError(
"Regex does not contain episode number group, should"
"contain episodenumber, episodenumber1-9, or"
"episodenumberstart and episodenumberend\n\nPattern"
"was:\n" + cmatcher.pattern)

if 'seriesname' in namedgroups:
seriesname = match.group('seriesname')
else:
raise ConfigValueError(
"Regex must contain seriesname. Pattern was:\n" + cmatcher.pattern)

if seriesname != None:
seriesname = cleanRegexedSeriesName(seriesname)
seriesname = replaceInputSeriesName(seriesname)

extra_values = match.groupdict()

if 'seasonnumber' in namedgroups:
seasonnumber = int(match.group('seasonnumber'))

episode = EpisodeInfo(
seriesname = seriesname,
seasonnumber = seasonnumber,
episodenumbers = episodenumbers,
filename = self.path,
extra = extra_values)
elif 'year' in namedgroups and 'month' in namedgroups and 'day' in namedgroups:
episode = DatedEpisodeInfo(
seriesname = seriesname,
episodenumbers = episodenumbers,
filename = self.path,
extra = extra_values)
elif 'group' in namedgroups:
episode = AnimeEpisodeInfo(
seriesname = seriesname,
episodenumbers = episodenumbers,
filename = self.path,
extra = extra_values)
else:
# No season number specified, usually for Anime
episode = NoSeasonEpisodeInfo(
seriesname = seriesname,
episodenumbers = episodenumbers,
filename = self.path,
extra = extra_values)

return episode
if 'seriesname' in namedgroups:
seriesname = match.group('seriesname')
else:
raise ConfigValueError(
"Regex must contain seriesname. Pattern was:\n" + cmatcher.pattern)

if seriesname != None:
seriesname = cleanRegexedSeriesName(seriesname)
seriesname = replaceInputSeriesName(seriesname)

extra_values = match.groupdict()

if 'seasonnumber' in namedgroups:
seasonnumber = int(match.group('seasonnumber'))

episode = EpisodeInfo(
seriesname = seriesname,
seasonnumber = seasonnumber,
episodenumbers = episodenumbers,
parsingelement = self.path,
extra = extra_values)
elif 'year' in namedgroups and 'month' in namedgroups and 'day' in namedgroups:
episode = DatedEpisodeInfo(
seriesname = seriesname,
episodenumbers = episodenumbers,
parsingelement = self.path,
extra = extra_values)
elif 'group' in namedgroups:
episode = AnimeEpisodeInfo(
seriesname = seriesname,
episodenumbers = episodenumbers,
parsingelement = self.path,
extra = extra_values)
else:
# No season number specified, usually for Anime
episode = NoSeasonEpisodeInfo(
seriesname = seriesname,
episodenumbers = episodenumbers,
parsingelement = self.path,
extra = extra_values)

return episode
else:
emsg = "Cannot parse %r" % self.path
if len(Config['input_filename_replacements']) > 0:
Expand Down