From 3d43c6b5bf87178fe4483d2f0c6dd10aa9680e74 Mon Sep 17 00:00:00 2001 From: echel0n Date: Fri, 25 Apr 2014 23:26:53 -0700 Subject: [PATCH] Fix for invalid scene release issues due to no ignore words being set causing a match on spaces, issue resolved. --- sickbeard/show_name_helpers.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py index 4cd49f24..2e3e8722 100644 --- a/sickbeard/show_name_helpers.py +++ b/sickbeard/show_name_helpers.py @@ -31,12 +31,10 @@ from sickbeard import encodingKludge as ek from name_parser.parser import NameParser, InvalidNameException from lib.unidecode import unidecode - resultFilters = ["sub(pack|s|bed)", "swesub(bed)?", "(dir|sample|sub|nfo)fix", "sample", "(dvd)?extras", "dub(bed)?"] - def filterBadReleases(name): """ Filters out non-english and just all-around stupid releases by comparing them @@ -69,10 +67,12 @@ def filterBadReleases(name): # return True # if any of the bad strings are in the name then say no - for ignore_word in resultFilters + sickbeard.IGNORE_WORDS.split(','): - ignore_word = ignore_word.strip() - if re.search('(^|[\W_]|[\s_])' + ignore_word + '($|[\W_]|[\s_])', name, re.I): - logger.log(u"Invalid scene release: " + name + " contains " + ignore_word + ", ignoring it", logger.DEBUG) + if sickbeard.IGNORE_WORDS: + resultFilters + sickbeard.IGNORE_WORDS.split(',') + filters = [re.compile('(^|[\W_]|[\s_])%s($|[\W_]|[\s_])' % filter.strip(), re.I) for filter in resultFilters] + for regfilter in filters: + if regfilter.search(name): + logger.log(u"Invalid scene release: " + name + " contains " + regfilter.pattern + ", ignoring it", logger.DEBUG) return False return True @@ -80,7 +80,7 @@ def filterBadReleases(name): def sceneToNormalShowNames(name): """ - Takes a show name from a scene dirname and converts it to a more "human-readable" format. + Takes a show name from a scene dirname and converts it to a more "human-readable" format. name: The show name to convert