Properly split and strip words. fixes #137

This commit is contained in:
Ruud
2012-04-25 21:57:47 +02:00
parent 269fc66e4c
commit ac15df31d8
8 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -77,6 +77,6 @@ class Manage(Plugin):
def directories(self):
try:
return self.conf('library', default = '').split('::')
return [x.strip() for x in self.conf('library', default = '').split('::')]
except:
return []
+3 -3
View File
@@ -139,7 +139,7 @@ class MoviePlugin(Plugin):
if limit_offset:
splt = limit_offset.split(',')
splt = [x.strip() for x in limit_offset.split(',')]
limit = splt[0]
offset = 0 if len(splt) is 1 else splt[1]
q2 = q2.limit(limit).offset(offset)
@@ -324,7 +324,7 @@ class MoviePlugin(Plugin):
available_status = fireEvent('status.get', 'available', single = True)
ids = params.get('id').split(',')
ids = [x.strip() for x in params.get('id').split(',')]
for movie_id in ids:
m = db.query(Movie).filter_by(id = movie_id).first()
@@ -356,7 +356,7 @@ class MoviePlugin(Plugin):
params = getParams()
ids = params.get('id').split(',')
ids = [x.strip() for x in params.get('id').split(',')]
for movie_id in ids:
self.delete(movie_id)
+1 -1
View File
@@ -40,7 +40,7 @@ def nameScore(name, year):
# Contains preferred word
nzb_words = re.split('\W+', simplifyString(name))
preferred_words = Env.setting('preferred_words', section = 'searcher').split(',')
preferred_words = [x.strip() for x in Env.setting('preferred_words', section = 'searcher').split(',')]
for word in preferred_words:
if word.strip() and word.strip().lower() in nzb_words:
score = score + 100
+2 -2
View File
@@ -192,13 +192,13 @@ class Searcher(Plugin):
movie_name = simplifyString(nzb['name'])
nzb_words = re.split('\W+', movie_name)
required_words = self.conf('required_words').split(',')
required_words = [x.strip() for x in self.conf('required_words').split(',')]
if self.conf('required_words') and not list(set(nzb_words) & set(required_words)):
log.info("NZB doesn't contain any of the required words.")
return False
ignored_words = self.conf('ignored_words').split(',')
ignored_words = [x.strip() for x in self.conf('ignored_words').split(',')]
blacklisted = list(set(nzb_words) & set(ignored_words))
if self.conf('ignored_words') and blacklisted:
log.info("Wrong: '%s' blacklisted words: %s" % (nzb['name'], ", ".join(blacklisted)))