From 9171a28f68e2bc635d50fa3e6f889483004740f9 Mon Sep 17 00:00:00 2001 From: echel0n Date: Wed, 23 Apr 2014 21:04:36 -0700 Subject: [PATCH] Fixes issue #53, ignore words not working correctly --- sickbeard/show_name_helpers.py | 2 +- sickbeard/tv.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py index c2f14cd5..8fe8272f 100644 --- a/sickbeard/show_name_helpers.py +++ b/sickbeard/show_name_helpers.py @@ -70,7 +70,7 @@ def filterBadReleases(name): # if any of the bad strings are in the name then say no for x in resultFilters + sickbeard.IGNORE_WORDS.split(','): - if re.search('(^|[\s_])' + x.strip() + '($|[\s_])', name, re.I): + if re.search('(^|[\W_]|[\s_])' + x.strip() + '($|[\W_]|[\s_])', name, re.I): logger.log(u"Invalid scene release: " + name + " contains " + x + ", ignoring it", logger.DEBUG) return False diff --git a/sickbeard/tv.py b/sickbeard/tv.py index 59a49984..3ea8b5aa 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -1194,10 +1194,8 @@ class TVEpisode(object): previous_subtitles = self.subtitles try: - subliminal.cache_region.configure('dogpile.cache.dbm', arguments={'filename': os.path.join(sickbeard.CACHE_DIR, '/path/to/cachefile.dbm')}) - videos = subliminal.scan_videos([self.location], subtitles=True, embedded_subtitles=True) need_languages = set(sickbeard.SUBTITLES_LANGUAGES) - set(self.subtitles) - subtitles = subliminal.download_best_subtitles([self.location], languages=need_languages, + subtitles = subliminal.download_subtitles([self.location], languages=need_languages, services=sickbeard.subtitles.getEnabledServiceList(), force=force, multi=True, cache_dir=sickbeard.CACHE_DIR)