diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py index 08cd2890..9ed3c0f3 100644 --- a/sickbeard/name_parser/parser.py +++ b/sickbeard/name_parser/parser.py @@ -124,9 +124,6 @@ class NameParser(object): if 'series_num' in named_groups and match.group('series_num'): result.score += 1 - if 'series_event' in named_groups and match.group('series_event'): - result.score += 1 - if 'season_num' in named_groups: tmp_season = int(match.group('season_num')) if cur_regex_name == 'bare' and tmp_season in (19, 20): diff --git a/sickbeard/name_parser/regexes.py b/sickbeard/name_parser/regexes.py index ea054265..ba30f72b 100644 --- a/sickbeard/name_parser/regexes.py +++ b/sickbeard/name_parser/regexes.py @@ -99,13 +99,11 @@ normal_regexes = [ # Show.Name.2010.11.23.Source.Quality.Etc-Group # Show Name - 2010-11-23 - Ep Name ''' - ^(?P(UEFA|MLB|ESPN|WWE|MMA|UFC|TNA|EPL|NASCAR|NBA|NFL|NHL|NRL|PGA|SUPER LEAGUE|FORMULA|FIFA|NETBALL|MOTOGP))[. _-]+ - ((?P\d+)[. _-]+)? # Show_Number and seperator - ((?P.+?)[. _-]+)? # Show_Event and seperator - (?P(\d{4}[. _-]+\d{1,2}[. _-]+\d{1,2})|(\d{1,2}\w{2}[. _-]+\w+[. _-]+\d{4})|(\w+[. _-]+\d{1,2}\w{2}[. _-]+\d{4})) - [. _-]*((?P.+?) # Source_Quality_Etc- - ((?[^- ]+([. _-]\[.*\])?))?)?$ # Group + ^(?P.*?(UEFA|MLB|ESPN|WWE|MMA|UFC|TNA|EPL|NASCAR|NBA|NFL|NHL|NRL|PGA|SUPER LEAGUE|FORMULA|FIFA|NETBALL|MOTOGP).*?)[. _-]+ + ((?P\d{1,3}).*?)? + (?P(\d{2}[. _-]+\d{2}[. _-]+\d{2})|(\d{4}[. _-]+\d{1,2}[. _-]+\d{1,2})|(\d{1,2}\w{2}[. _-]+\w+[. _-]+\d{4})|(\w+[. _-]+\d{1,2}\w{2}[. _-]+\d{4}))[. _-]* + ((?P.+?)((?[^- ]+([. _-]\[.*\])?))?)?$ '''), ('stupid',