moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-12 11:02:21 -05:00
Code Issues Releases Wiki Activity

Moved code out of series_name check for show object creation/checking.

Browse Source
This commit is contained in:
echel0n 2014-07-19 05:13:11 -07:00
parent eff064f347
commit 09a3333399
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sickbeard/name_parser/parser.py
View File

@ -103,7 +103,6 @@ class NameParser(object):
return return
matches = [] matches = []
doneSearch = False
bestResult = None bestResult = None
for regexMode in self.regexModes: for regexMode in self.regexModes:
@ -129,28 +128,24 @@ class NameParser(object):
result.series_name = match.group('series_name') result.series_name = match.group('series_name')
if result.series_name: if result.series_name:
result.series_name = self.clean_series_name(result.series_name) result.series_name = self.clean_series_name(result.series_name)
if not result.show:
if self.showObj and self.showObj.name.lower() == result.series_name.lower():
result.show = self.showObj
else:
if not self.naming_pattern:
result.show = helpers.get_show_by_name(result.series_name, useIndexer=self.useIndexers)
if not result.show:
continue
result.score += 1 result.score += 1
elif result.show: # confirm show object
if regexMode == self.NORMAL_REGEX and not (result.show.is_anime or result.show.is_sports): if result.show:
result.score += 1 if self.showObj and self.showObj.name.lower() == result.show.name.lower():
elif regexMode == self.SPORTS_REGEX and result.show.is_sports: continue
result.score += 1
elif regexMode == self.ANIME_REGEX and result.show.is_anime: if regexMode == self.NORMAL_REGEX and not (result.show.is_anime or result.show.is_sports):
result.score += 1 result.score += 1
else: elif regexMode == self.SPORTS_REGEX and result.show.is_sports:
break result.score += 1
elif regexMode == self.ANIME_REGEX and result.show.is_anime:
result.score += 1
else:
break
else:
if not self.naming_pattern:
result.show = helpers.get_show_by_name(result.series_name, useIndexer=self.useIndexers)
if 'season_num' in named_groups: if 'season_num' in named_groups:
tmp_season = int(match.group('season_num')) tmp_season = int(match.group('season_num'))