From 1bf6c5a82e860b1ec1e6ae40c2537c34e438fb3a Mon Sep 17 00:00:00 2001
From: Dean Gardiner <gardiner91@gmail.com>
Date: Fri, 6 Dec 2013 13:53:56 +1300
Subject: [PATCH] Changed 'searcher.get_search_title' to accept a 'library'
 instead of the 'media' as a parameter.

---
 couchpotato/core/media/_base/searcher/main.py | 2 +-
 couchpotato/core/media/movie/searcher/main.py | 8 ++++----
 couchpotato/core/media/show/searcher/main.py  | 8 ++++----
 couchpotato/core/providers/base.py            | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/couchpotato/core/media/_base/searcher/main.py b/couchpotato/core/media/_base/searcher/main.py
index 20cb78d..0f76bf8 100644
--- a/couchpotato/core/media/_base/searcher/main.py
+++ b/couchpotato/core/media/_base/searcher/main.py
@@ -171,7 +171,7 @@ class Searcher(SearcherBase):
         return False
 
     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))
 
         rel_name = simplifyString(rel_name)
diff --git a/couchpotato/core/media/movie/searcher/main.py b/couchpotato/core/media/movie/searcher/main.py
index 1b1177b..744d6ce 100644
--- a/couchpotato/core/media/movie/searcher/main.py
+++ b/couchpotato/core/media/movie/searcher/main.py
@@ -210,7 +210,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
 
         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)
         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())
             return False
 
-    def getSearchTitle(self, media):
-        if media['type'] == 'movie':
-            return getTitle(media['library'])
+    def getSearchTitle(self, library):
+        if library['type'] == 'movie':
+            return getTitle(library)
 
 class SearchSetupError(Exception):
     pass
diff --git a/couchpotato/core/media/show/searcher/main.py b/couchpotato/core/media/show/searcher/main.py
index 1364721..52406b9 100644
--- a/couchpotato/core/media/show/searcher/main.py
+++ b/couchpotato/core/media/show/searcher/main.py
@@ -133,11 +133,11 @@ class ShowSearcher(Plugin):
 
         return ret
 
-    def getSearchTitle(self, media):
-        if media['type'] not in ['show', 'season', 'episode']:
+    def getSearchTitle(self, library):
+        if library['type'] not in ['show', 'season', 'episode']:
             return
 
-        show, season, episode = self.getLibraries(media['library'])
+        show, season, episode = self.getLibraries(library)
 
         if not show:
             return None
@@ -173,7 +173,7 @@ class ShowSearcher(Plugin):
             return None
 
         # 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
         if identifier['season']:
diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py
index 82e03ce..9f72df8 100644
--- a/couchpotato/core/providers/base.py
+++ b/couchpotato/core/providers/base.py
@@ -207,7 +207,7 @@ class YarrProvider(Provider):
             self._search(media, quality, results)
         # Search possible titles
         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)
 
         return results