1
0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 11:32:20 -05:00

NameParser now won't bother to proceed parsing release name results untill it finds a valid show object in the DB to confirm its a show in our list, naming patterns automatically bypass this restriction.

This commit is contained in:
echel0n 2014-06-19 18:13:07 -07:00
parent 4ef88961b5
commit fcc91bedd9
3 changed files with 30 additions and 27 deletions

View File

@ -35,7 +35,7 @@ class NameParser(object):
SPORTS_REGEX = 2
ANIME_REGEX = 3
def __init__(self, file_name=True, showObj=None, epObj=None, useIndexers=False, convert=False):
def __init__(self, file_name=True, showObj=None, epObj=None, useIndexers=False, convert=False, naming_pattern=False):
self.file_name = file_name
self.showList = sickbeard.showList or []
@ -43,6 +43,7 @@ class NameParser(object):
self.showObj = showObj
self.epObj = epObj
self.convert = convert
self.naming_pattern = naming_pattern
def clean_series_name(self, series_name):
"""Cleans up series name by removing any . and _
@ -103,6 +104,27 @@ class NameParser(object):
if not name:
return
if not self.naming_pattern:
if not self.showObj:
for curShow in self.showList:
if sickbeard.show_name_helpers.isGoodResult(name, curShow, False):
self.showObj = curShow
break
if not self.showObj:
return
regexMode = self.ALL_REGEX
if self.showObj and self.showObj.is_anime:
regexMode = self.ANIME_REGEX
elif self.showObj and self.showObj.is_sports:
regexMode = self.SPORTS_REGEX
elif self.showObj and not self.showObj.is_anime and not self.showObj.is_sports:
regexMode = self.NORMAL_REGEX
self.compiled_regexes = {}
self._compile_regexes(regexMode)
matches = []
result = None
for (cur_regex_type, cur_regex_name), cur_regex in self.compiled_regexes.items():
@ -194,8 +216,8 @@ class NameParser(object):
result.release_group = match.group('release_group')
result.score += 1
if not self.showObj:
self.showObj = helpers.get_show_by_name(result.series_name, useIndexer=self.useIndexers)
# if not self.showObj:
# self.showObj = helpers.get_show_by_name(result.series_name, useIndexer=self.useIndexers)
if self.showObj:
if self.showObj.air_by_date and result.air_date:
@ -293,25 +315,6 @@ class NameParser(object):
if cached:
return cached
if not self.showObj:
for show in self.showList:
if not show.name.lower() in name.lower():
continue
self.showObj = show
break
regexMode = self.ALL_REGEX
if self.showObj and self.showObj.is_anime:
regexMode = self.ANIME_REGEX
elif self.showObj and self.showObj.is_sports:
regexMode = self.SPORTS_REGEX
elif self.showObj and not self.showObj.is_anime and not self.showObj.is_sports:
regexMode = self.NORMAL_REGEX
self.compiled_regexes = {}
self._compile_regexes(regexMode)
# break it into parts if there are any (dirname, file name, extension)
dir_name, file_name = os.path.split(name)
ext_match = re.match('(.*)\.\w{3,4}$', file_name)
@ -320,15 +323,15 @@ class NameParser(object):
else:
base_file_name = file_name
# use only the direct parent dir
dir_name = os.path.basename(dir_name)
# set up a result to use
final_result = ParseResult(name)
# try parsing the file name
file_name_result = self._parse_string(base_file_name)
# use only the direct parent dir
dir_name = os.path.basename(dir_name)
# parse the dirname for extra info if needed
dir_name_result = self._parse_string(dir_name)

View File

@ -181,7 +181,7 @@ def validate_name(pattern, multi=None, anime_type=None, file_only=False, abd=Fal
logger.log(u"Trying to parse " + new_name, logger.DEBUG)
parser = NameParser(True, showObj=ep.show)
parser = NameParser(True, showObj=ep.show, naming_pattern=True)
try:
result = parser.parse(new_name)

View File

@ -2028,7 +2028,7 @@ class TVEpisode(object):
return ''
try:
np = NameParser(name)
np = NameParser(name, naming_pattern=True)
parse_result = np.parse(name)
except InvalidNameException, e:
logger.log(u"Unable to get parse release_group: " + ex(e), logger.DEBUG)