monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-01 00:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes issue #53, ignore words not working correctly

Browse source
This commit is contained in:
echel0n 2014-04-23 21:04:36 -07:00
parent 8d9d62caf5
commit 9171a28f68
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sickbeard/show_name_helpers.py
View file

@ -70,7 +70,7 @@ def filterBadReleases(name):
# if any of the bad strings are in the name then say no # if any of the bad strings are in the name then say no
for x in resultFilters + sickbeard.IGNORE_WORDS.split(','): 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) logger.log(u"Invalid scene release: " + name + " contains " + x + ", ignoring it", logger.DEBUG)
return False return False

4
sickbeard/tv.py
View file

@ -1194,10 +1194,8 @@ class TVEpisode(object):
previous_subtitles = self.subtitles previous_subtitles = self.subtitles
try: 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) 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, services=sickbeard.subtitles.getEnabledServiceList(), force=force,
multi=True, cache_dir=sickbeard.CACHE_DIR) multi=True, cache_dir=sickbeard.CACHE_DIR)