From eff064f347886b0b480d73764a4f0b961b83bc86 Mon Sep 17 00:00:00 2001 From: echel0n Date: Sat, 19 Jul 2014 05:06:18 -0700 Subject: [PATCH] Accuracey and speed improved for nameparser. --- sickbeard/name_parser/parser.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py index f8e416db..429d921d 100644 --- a/sickbeard/name_parser/parser.py +++ b/sickbeard/name_parser/parser.py @@ -142,6 +142,16 @@ class NameParser(object): result.score += 1 + elif result.show: + if regexMode == self.NORMAL_REGEX and not (result.show.is_anime or result.show.is_sports): + result.score += 1 + elif regexMode == self.SPORTS_REGEX and result.show.is_sports: + result.score += 1 + elif regexMode == self.ANIME_REGEX and result.show.is_anime: + result.score += 1 + else: + break + if 'season_num' in named_groups: tmp_season = int(match.group('season_num')) if not (cur_regex_name == 'bare' and tmp_season in (19, 20)): @@ -214,14 +224,6 @@ class NameParser(object): result.release_group = match.group('release_group') result.score += 1 - if result.show: - if regexMode == self.NORMAL_REGEX and not (result.show.is_anime or result.show.is_sports): - result.score += 1 - elif regexMode == self.SPORTS_REGEX and result.show.is_sports: - result.score += 1 - elif regexMode == self.ANIME_REGEX and result.show.is_anime: - result.score += 1 - matches.append(result) time.sleep(0.02)