dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3750 from seedzero/tv

Browse Source
This commit is contained in:
Dean Gardiner
2014-08-10 13:06:09 +12:00
parent 12dd9c6b14 c8f0cdc90f
commit 4e78b0cac1
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/media/movie/searcher.py
+1 -1
View File
@@ -74,7 +74,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
self.in_progress = True self.in_progress = True
fireEvent('notify.frontend', type = 'movie.searcher.started', data = True, message = 'Full search started') 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) random.shuffle(medias)
total = len(medias) total = len(medias)
couchpotato/core/media/show/_base/static/search.js
+1 -1
View File
@@ -185,7 +185,7 @@ Block.Search.ShowItem = new Class({
self.category_select.show(); self.category_select.show();
categories.each(function(category){ categories.each(function(category){
new Element('option', { new Element('option', {
'value': category.data.id, 'value': category.data._id,
'text': category.data.label 'text': category.data.label
}).inject(self.category_select); }).inject(self.category_select);
}); });
couchpotato/core/media/show/providers/nzb/newznab.py
+10 -11
View File
@@ -18,15 +18,15 @@ class Newznab(MultiProvider):
class Season(SeasonProvider, Base): class Season(SeasonProvider, Base):
def buildUrl(self, media, api_key): def buildUrl(self, media, host):
search_title = fireEvent('media.search_query', media, include_identifier = False, single = True) related = fireEvent('library.related', media, single = True)
identifier = fireEvent('media.identifier', media, single = True) identifier = fireEvent('library.identifier', media, single = True)
query = tryUrlencode({ query = tryUrlencode({
't': 'tvsearch', 't': 'tvsearch',
'q': search_title, 'apikey': host['api_key'],
'q': related['show']['title'],
'season': identifier['season'], 'season': identifier['season'],
'apikey': api_key,
'extended': 1 'extended': 1
}) })
return query return query
@@ -34,16 +34,15 @@ class Season(SeasonProvider, Base):
class Episode(EpisodeProvider, Base): class Episode(EpisodeProvider, Base):
def buildUrl(self, media, api_key): def buildUrl(self, media, host):
search_title = fireEvent('media.search_query', media['show'], include_identifier = False, single = True) related = fireEvent('library.related', media, single = True)
identifier = fireEvent('media.identifier', media, single = True) identifier = fireEvent('library.identifier', media, single = True)
query = tryUrlencode({ query = tryUrlencode({
't': 'tvsearch', 't': 'tvsearch',
'q': search_title, 'apikey': host['api_key'],
'q': related['show']['title'],
'season': identifier['season'], 'season': identifier['season'],
'ep': identifier['episode'], 'ep': identifier['episode'],
'apikey': api_key,
'extended': 1 'extended': 1
}) })