From e1c3c334d9e9de6fc1042317cf67c2eb5f448e9f Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 20 Oct 2013 23:56:31 +0200 Subject: [PATCH] Use new provider named events for search. fix #2379 --- .../core/providers/info/_modifier/main.py | 16 +++++----------- .../core/providers/info/couchpotatoapi/main.py | 1 + couchpotato/core/providers/info/omdbapi/main.py | 1 + 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/couchpotato/core/providers/info/_modifier/main.py b/couchpotato/core/providers/info/_modifier/main.py index 091557d2..0bb2e6a4 100644 --- a/couchpotato/core/providers/info/_modifier/main.py +++ b/couchpotato/core/providers/info/_modifier/main.py @@ -38,19 +38,13 @@ class MovieResultModifier(Plugin): def returnByType(self, results): - new_results = {'unknown':[]} + new_results = {} for r in results: - if r.get('type'): - type_name = r.get('type') + 's' - if not new_results.has_key(type_name): - new_results[type_name] = [] + type_name = r.get('type', 'movie') + 's' + if not new_results.has_key(type_name): + new_results[type_name] = [] - new_results[type_name].append(r) - else: - new_results['unknown'].append(r) - - if len(new_results['unknown']) == 0: - del new_results['unknown'] + new_results[type_name].append(r) # Combine movies, needs a cleaner way.. if new_results.has_key('movies'): diff --git a/couchpotato/core/providers/info/couchpotatoapi/main.py b/couchpotato/core/providers/info/couchpotatoapi/main.py index ef7db1f9..89eddc3c 100644 --- a/couchpotato/core/providers/info/couchpotatoapi/main.py +++ b/couchpotato/core/providers/info/couchpotatoapi/main.py @@ -24,6 +24,7 @@ class CouchPotatoApi(MovieProvider): def __init__(self): addEvent('movie.info', self.getInfo, priority = 1) + addEvent('info.search', self.search, priority = 1) addEvent('movie.search', self.search, priority = 1) addEvent('movie.release_date', self.getReleaseDate) addEvent('movie.suggest', self.getSuggestions) diff --git a/couchpotato/core/providers/info/omdbapi/main.py b/couchpotato/core/providers/info/omdbapi/main.py index f05c7cb3..47374f47 100755 --- a/couchpotato/core/providers/info/omdbapi/main.py +++ b/couchpotato/core/providers/info/omdbapi/main.py @@ -20,6 +20,7 @@ class OMDBAPI(MovieProvider): http_time_between_calls = 0 def __init__(self): + addEvent('info.search', self.search) addEvent('movie.search', self.search) addEvent('movie.info', self.getInfo)