From 5e438e5343de23450aa08e50308f77ae69e29b38 Mon Sep 17 00:00:00 2001 From: seedzero Date: Tue, 29 Jul 2014 18:13:02 +1000 Subject: [PATCH 1/3] Stop movie searcher searching for TV shows and hosing episodes --- couchpotato/core/media/movie/searcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/media/movie/searcher.py b/couchpotato/core/media/movie/searcher.py index e943c219..a8d6fe55 100755 --- a/couchpotato/core/media/movie/searcher.py +++ b/couchpotato/core/media/movie/searcher.py @@ -74,7 +74,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase): self.in_progress = True fireEvent('notify.frontend', type = 'movie.searcher.started', data = True, message = 'Full search started') - medias = [x['_id'] for x in fireEvent('media.with_status', 'active', with_doc = False, single = True)] + medias = [x['_id'] for x in fireEvent('media.with_status', 'active', 'movie', single = True)] random.shuffle(medias) total = len(medias) From ce80ac5a336435020d7962f0a0be546b4c565b9e Mon Sep 17 00:00:00 2001 From: seedzero Date: Wed, 6 Aug 2014 12:50:11 +1000 Subject: [PATCH 2/3] Fix show search not including quality profile --- couchpotato/core/media/show/_base/static/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/media/show/_base/static/search.js b/couchpotato/core/media/show/_base/static/search.js index 91e2ed3b..44bb8944 100644 --- a/couchpotato/core/media/show/_base/static/search.js +++ b/couchpotato/core/media/show/_base/static/search.js @@ -185,7 +185,7 @@ Block.Search.ShowItem = new Class({ self.category_select.show(); categories.each(function(category){ new Element('option', { - 'value': category.data.id, + 'value': category.data._id, 'text': category.data.label }).inject(self.category_select); }); From c8f0cdc90f8d5319954121ee036a53e4e36d7c12 Mon Sep 17 00:00:00 2001 From: seedzero Date: Wed, 6 Aug 2014 14:30:59 +1000 Subject: [PATCH 3/3] 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 })