From fcd54c93d6a6482f0e0f8daeea964ee4f7b45f1b Mon Sep 17 00:00:00 2001 From: echel0n Date: Mon, 23 Jun 2014 23:59:08 -0700 Subject: [PATCH] Fixed minor regex mistake in code. --- sickbeard/name_parser/parser.py | 2 +- sickbeard/name_parser/regexes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py index ac353d08..290dc983 100644 --- a/sickbeard/name_parser/parser.py +++ b/sickbeard/name_parser/parser.py @@ -243,7 +243,7 @@ class NameParser(object): matches.append(result) if len(matches): - result = max(matches, key=lambda x: x.score) + result = max(sorted(matches, reverse=True), key=lambda x: x.score) if result.show: if self.convert and not self.naming_pattern: diff --git a/sickbeard/name_parser/regexes.py b/sickbeard/name_parser/regexes.py index 2816b3e3..62b16bc4 100644 --- a/sickbeard/name_parser/regexes.py +++ b/sickbeard/name_parser/regexes.py @@ -182,7 +182,7 @@ normal_regexes = {'normal':[ (?P\d{1,2}) # 1 (?P\d{2}) # 02 and separator ([. _-]+(?P(?!\d{3}[. _-]+)[^-]+) # Source_Quality_Etc- - (-(?P.+))?)?$ # Group + (-(?P[^- ]+([. _-]\[.*\])?))?)?$ # Group '''), ]}