diff --git a/sickbeard/name_parser/regexes.py b/sickbeard/name_parser/regexes.py index 724d34a6..f500e038 100644 --- a/sickbeard/name_parser/regexes.py +++ b/sickbeard/name_parser/regexes.py @@ -102,7 +102,7 @@ ep_regexes = [ ''' ^(?P.*?(UEFA|MLB|ESPN|WWE|MMA|UFC|TNA|EPL|NASCAR|NBA|NFL|NHL|NRL|PGA|SUPER LEAGUE|FORMULA|FIFA|NETBALL|MOTOGP).*?) (?P\d{1,2}[a-zA-Z]{2})[. _-]+ # 23rd and seperator - (?P[a-zA-Z]{3,4})[. _-]+ # Nov and seperator + (?P[a-zA-Z]{3,})[. _-]+ # Nov and seperator (?P\d{4})[. _-]+ # 2010 (?P.*?(?.*?)$ # Group diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py index c01b72be..b1df71f8 100644 --- a/sickbeard/show_name_helpers.py +++ b/sickbeard/show_name_helpers.py @@ -194,7 +194,7 @@ def isGoodResult(name, show, log=True): escaped_name = re.sub('\\\\[\\s.-]', '\W+', re.escape(curName)) if show.startyear: escaped_name += "(?:\W+" + str(show.startyear) + ")?" - curRegex = '^' + escaped_name + '\W+(?:(?:S\d[\dE._ -])|(?:\d\d?x)|(?:\d{4}\W\d\d\W\d\d)|(?:(?:part|pt)[\._ -]?(\d|[ivx]))|Season\W+\d+\W+|E\d+\W+)|((.+?)[. _-]+)(\d{1,2}[a-zA-Z]{2})[. _-]+([a-zA-Z]{3,4})[. _-]+(\d{4})*(.+?)([. _-])()((([^- ]+))?)?$' + curRegex = '^' + escaped_name + '\W+(?:(?:S\d[\dE._ -])|(?:\d\d?x)|(?:\d{4}\W\d\d\W\d\d)|(?:(?:part|pt)[\._ -]?(\d|[ivx]))|Season\W+\d+\W+|E\d+\W+)|((.+?)[. _-]+)(\d{1,2}[a-zA-Z]{2})[. _-]+([a-zA-Z]{3,})[. _-]+(\d{4})*(.+?)([. _-])()((([^- ]+))?)?$' if log: logger.log(u"Checking if show " + name + " matches " + curRegex, logger.DEBUG)