From c8f0cdc90f8d5319954121ee036a53e4e36d7c12 Mon Sep 17 00:00:00 2001 From: seedzero Date: Wed, 6 Aug 2014 14:30:59 +1000 Subject: [PATCH] Newznab search fixes --- .../core/media/show/providers/nzb/newznab.py | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/couchpotato/core/media/show/providers/nzb/newznab.py b/couchpotato/core/media/show/providers/nzb/newznab.py index e376d058..43546110 100644 --- a/couchpotato/core/media/show/providers/nzb/newznab.py +++ b/couchpotato/core/media/show/providers/nzb/newznab.py @@ -18,15 +18,15 @@ class Newznab(MultiProvider): class Season(SeasonProvider, Base): - def buildUrl(self, media, api_key): - search_title = fireEvent('media.search_query', media, include_identifier = False, single = True) - identifier = fireEvent('media.identifier', media, single = True) + def buildUrl(self, media, host): + related = fireEvent('library.related', media, single = True) + identifier = fireEvent('library.identifier', media, single = True) query = tryUrlencode({ 't': 'tvsearch', - 'q': search_title, + 'apikey': host['api_key'], + 'q': related['show']['title'], 'season': identifier['season'], - 'apikey': api_key, 'extended': 1 }) return query @@ -34,16 +34,15 @@ class Season(SeasonProvider, Base): class Episode(EpisodeProvider, Base): - def buildUrl(self, media, api_key): - search_title = fireEvent('media.search_query', media['show'], include_identifier = False, single = True) - identifier = fireEvent('media.identifier', media, single = True) - + def buildUrl(self, media, host): + related = fireEvent('library.related', media, single = True) + identifier = fireEvent('library.identifier', media, single = True) query = tryUrlencode({ 't': 'tvsearch', - 'q': search_title, + 'apikey': host['api_key'], + 'q': related['show']['title'], 'season': identifier['season'], 'ep': identifier['episode'], - 'apikey': api_key, 'extended': 1 })