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

Added optional parameter 'include_identifier' to the 'searcher.get_search_title' event handler.

Browse Source
This commit is contained in:
Dean Gardiner
2013-12-06 14:04:00 +13:00
parent 1bf6c5a82e
commit 2fd54901e7
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
couchpotato/core/media/movie/searcher/main.py
View File

@@ -343,7 +343,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
log.error('Failed searching for next release: %s', traceback.format_exc())
return False
def getSearchTitle(self, library):
def getSearchTitle(self, library, include_identifier = False):
if library['type'] == 'movie':
return getTitle(library)

6
couchpotato/core/media/show/searcher/main.py
View File

@@ -133,7 +133,7 @@ class ShowSearcher(Plugin):
return ret
def getSearchTitle(self, library):
def getSearchTitle(self, library, include_identifier = False):
if library['type'] not in ['show', 'season', 'episode']:
return
@@ -172,6 +172,10 @@ class ShowSearcher(Plugin):
else:
return None
# Return show title if we aren't including the identifier
if not include_identifier:
return title
# Add the identifier to search title
identifier = fireEvent('library.identifier', library, single = True)

4
couchpotato/core/providers/base.py
View File

@@ -207,7 +207,9 @@ class YarrProvider(Provider):
self._search(media, quality, results)
# Search possible titles
else:
for title in possibleTitles(fireEvent('searcher.get_search_title', media['library'], single = True)):
media_title = fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)
for title in possibleTitles(media_title):
self._searchOnTitle(title, media, quality, results)
return results

4
couchpotato/core/providers/nzb/newznab/main.py
View File

@@ -191,7 +191,7 @@ class Movie(MovieProvider, Base):
class Season(SeasonProvider, Base):
def buildUrl(self, media, api_key):
search_title = fireEvent('searcher.get_search_title', media['library']['root_library'])
search_title = fireEvent('searcher.get_search_title', media['library'])
identifier = fireEvent('library.identifier', media['library'])
query = tryUrlencode({
@@ -206,7 +206,7 @@ class Season(SeasonProvider, Base):
class Episode(EpisodeProvider, Base):
def buildUrl(self, media, api_key):
search_title = fireEvent('searcher.get_search_title', media['library']['root_library'])
search_title = fireEvent('searcher.get_search_title', media['library'])
identifier = fireEvent('library.identifier', media['library'])
query = tryUrlencode({

4
couchpotato/core/providers/torrent/sceneaccess/main.py
View File

@@ -122,7 +122,7 @@ class Season(SeasonProvider, Base):
]
def buildUrl(self, media, quality):
return self._buildUrl(fireEvent('searcher.get_search_title', media['library']['root_library']), quality['identifier'])
return self._buildUrl(fireEvent('searcher.get_search_title', media['library']), quality['identifier'])
class Episode(EpisodeProvider, Base):
@@ -132,4 +132,4 @@ class Episode(EpisodeProvider, Base):
]
def buildUrl(self, media, quality):
return self._buildUrl(fireEvent('searcher.get_search_title', media['library']['root_library']), quality['identifier'])
return self._buildUrl(fireEvent('searcher.get_search_title', media['library']), quality['identifier'])