Changed 'searcher.get_search_title' to accept a 'library' instead of the 'media' as a parameter.
This commit is contained in:
1 parent
45484461b5
commit
1bf6c5a82e
4 files changed
+10
-10
No files matched your search
@@ -171,7 +171,7 @@ class Searcher(SearcherBase):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
def correctWords(self, rel_name, media):
|
def correctWords(self, rel_name, media):
|
||||||
media_title = fireEvent('searcher.get_search_title', media, single = True)
|
media_title = fireEvent('searcher.get_search_title', media['library'], single = True)
|
||||||
media_words = re.split('\W+', simplifyString(media_title))
|
media_words = re.split('\W+', simplifyString(media_title))
|
||||||
|
|
||||||
rel_name = simplifyString(rel_name)
|
rel_name = simplifyString(rel_name)
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
|
|||||||
|
|
||||||
if media.get('type') != 'movie': return
|
if media.get('type') != 'movie': return
|
||||||
|
|
||||||
media_title = fireEvent('searcher.get_search_title', media, single = True)
|
media_title = fireEvent('searcher.get_search_title', media['library'], single = True)
|
||||||
|
|
||||||
imdb_results = kwargs.get('imdb_results', False)
|
imdb_results = kwargs.get('imdb_results', False)
|
||||||
retention = Env.setting('retention', section = 'nzb')
|
retention = Env.setting('retention', section = 'nzb')
|
||||||
@@ -343,9 +343,9 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
|
|||||||
log.error('Failed searching for next release: %s', traceback.format_exc())
|
log.error('Failed searching for next release: %s', traceback.format_exc())
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def getSearchTitle(self, media):
|
def getSearchTitle(self, library):
|
||||||
if media['type'] == 'movie':
|
if library['type'] == 'movie':
|
||||||
return getTitle(media['library'])
|
return getTitle(library)
|
||||||
|
|
||||||
class SearchSetupError(Exception):
|
class SearchSetupError(Exception):
|
||||||
pass
|
pass
|
||||||
@@ -133,11 +133,11 @@ class ShowSearcher(Plugin):
|
|||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def getSearchTitle(self, media):
|
def getSearchTitle(self, library):
|
||||||
if media['type'] not in ['show', 'season', 'episode']:
|
if library['type'] not in ['show', 'season', 'episode']:
|
||||||
return
|
return
|
||||||
|
|
||||||
show, season, episode = self.getLibraries(media['library'])
|
show, season, episode = self.getLibraries(library)
|
||||||
|
|
||||||
if not show:
|
if not show:
|
||||||
return None
|
return None
|
||||||
@@ -173,7 +173,7 @@ class ShowSearcher(Plugin):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
# Add the identifier to search title
|
# Add the identifier to search title
|
||||||
identifier = fireEvent('library.identifier', media['library'], single = True)
|
identifier = fireEvent('library.identifier', library, single = True)
|
||||||
|
|
||||||
# TODO this needs to support other identifier formats
|
# TODO this needs to support other identifier formats
|
||||||
if identifier['season']:
|
if identifier['season']:
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ class YarrProvider(Provider):
|
|||||||
self._search(media, quality, results)
|
self._search(media, quality, results)
|
||||||
# Search possible titles
|
# Search possible titles
|
||||||
else:
|
else:
|
||||||
for title in possibleTitles(fireEvent('searcher.get_search_title', media, single = True)):
|
for title in possibleTitles(fireEvent('searcher.get_search_title', media['library'], single = True)):
|
||||||
self._searchOnTitle(title, media, quality, results)
|
self._searchOnTitle(title, media, quality, results)
|
||||||
|
|
||||||
return results
|
return results
|
||||||
|
|||||||
Reference in new issue
Block a user