Use new provider named events for search. fix #2379
This commit is contained in:
@@ -38,19 +38,13 @@ class MovieResultModifier(Plugin):
|
|||||||
|
|
||||||
def returnByType(self, results):
|
def returnByType(self, results):
|
||||||
|
|
||||||
new_results = {'unknown':[]}
|
new_results = {}
|
||||||
for r in results:
|
for r in results:
|
||||||
if r.get('type'):
|
type_name = r.get('type', 'movie') + 's'
|
||||||
type_name = r.get('type') + 's'
|
if not new_results.has_key(type_name):
|
||||||
if not new_results.has_key(type_name):
|
new_results[type_name] = []
|
||||||
new_results[type_name] = []
|
|
||||||
|
|
||||||
new_results[type_name].append(r)
|
new_results[type_name].append(r)
|
||||||
else:
|
|
||||||
new_results['unknown'].append(r)
|
|
||||||
|
|
||||||
if len(new_results['unknown']) == 0:
|
|
||||||
del new_results['unknown']
|
|
||||||
|
|
||||||
# Combine movies, needs a cleaner way..
|
# Combine movies, needs a cleaner way..
|
||||||
if new_results.has_key('movies'):
|
if new_results.has_key('movies'):
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ class CouchPotatoApi(MovieProvider):
|
|||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
addEvent('movie.info', self.getInfo, priority = 1)
|
addEvent('movie.info', self.getInfo, priority = 1)
|
||||||
|
addEvent('info.search', self.search, priority = 1)
|
||||||
addEvent('movie.search', self.search, priority = 1)
|
addEvent('movie.search', self.search, priority = 1)
|
||||||
addEvent('movie.release_date', self.getReleaseDate)
|
addEvent('movie.release_date', self.getReleaseDate)
|
||||||
addEvent('movie.suggest', self.getSuggestions)
|
addEvent('movie.suggest', self.getSuggestions)
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ class OMDBAPI(MovieProvider):
|
|||||||
http_time_between_calls = 0
|
http_time_between_calls = 0
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
addEvent('info.search', self.search)
|
||||||
addEvent('movie.search', self.search)
|
addEvent('movie.search', self.search)
|
||||||
addEvent('movie.info', self.getInfo)
|
addEvent('movie.info', self.getInfo)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user