Browse Source

Use new provider named events for search. fix #2379

pull/2392/head
Ruud 12 years ago
parent
commit
e1c3c334d9
  1. 16
      couchpotato/core/providers/info/_modifier/main.py
  2. 1
      couchpotato/core/providers/info/couchpotatoapi/main.py
  3. 1
      couchpotato/core/providers/info/omdbapi/main.py

16
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'):

1
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)

1
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)

Loading…
Cancel
Save