Added 'searcher.get_media_searcher_id' event, Cleaned up some 'status.get' calls, Renamed some references of 'nzb' to 'rel'.

Conflicts:

	couchpotato/core/media/_base/searcher/main.py

couchpotato/core/media/_base/searcher/main.py

@@ -55,7 +55,7 @@ class Searcher(SearcherBase):
         return progress
 
     def tryDownloadResult(self, results, media, quality_type, manual = False):
-        available_status, ignored_status, failed_status = fireEvent('status.get', ['available', 'ignored', 'failed'], single = True)
+        ignored_status, failed_status = fireEvent('status.get', ['ignored', 'failed'], single = True)
 
         for rel in results:
             if not quality_type.get('finish', False) and quality_type.get('wait_for', 0) > 0 and rel.get('age') <= quality_type.get('wait_for', 0):
@@ -89,7 +89,6 @@ class Searcher(SearcherBase):
         downloader_enabled = fireEvent('download.enabled', manual, data, single = True)
 
         if downloader_enabled:
-
             snatched_status, done_status, active_status = fireEvent('status.get', ['snatched', 'done', 'active'], single = True)
 
             # Download release to temp
@@ -158,14 +157,10 @@ class Searcher(SearcherBase):
     def search(self, protocols, media, quality):
         results = []
 
-        search_type = None
+        searcher_id = fireEvent('searcher.get_media_searcher_id', media['type'], single = True)
-        if media['type'] == 'movie':
-            search_type = 'movie'
-        elif media['type'] in ['show', 'season', 'episode']:
-            search_type = 'show'
 
         for search_protocol in protocols:
-            protocol_results = fireEvent('provider.search.%s.%s' % (search_protocol, search_type), media, quality, merge = True)
+            protocol_results = fireEvent('provider.search.%s.%s' % (search_protocol, searcher_id), media, quality, merge = True)
             if protocol_results:
                 results += protocol_results
 
@@ -186,13 +181,13 @@ class Searcher(SearcherBase):
 
         for rel in search_results:
 
-            nzb_identifier = md5(rel['url'])
+            rel_identifier = md5(rel['url'])
-            found_releases.append(nzb_identifier)
+            found_releases.append(rel_identifier)
 
-            rls = db.query(Release).filter_by(identifier = nzb_identifier).first()
+            rls = db.query(Release).filter_by(identifier = rel_identifier).first()
             if not rls:
                 rls = Release(
-                    identifier = nzb_identifier,
+                    identifier = rel_identifier,
                     movie_id = media.get('id'),
                     #media_id = media.get('id'),
                     quality_id = quality_type.get('quality_id'),

couchpotato/core/media/movie/searcher/main.py

@@ -31,6 +31,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
         addEvent('movie.searcher.could_be_released', self.couldBeReleased)
         addEvent('searcher.correct_release', self.correctRelease)
         addEvent('searcher.get_search_title', self.getSearchTitle)
+        addEvent('searcher.get_media_searcher_id', self.getMediaSearcherId)
 
         addApiView('movie.searcher.try_next', self.tryNextReleaseView, docs = {
             'desc': 'Marks the snatched results as ignored and try the next best release',
@@ -347,5 +348,9 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
         if media['type'] == 'movie':
             return getTitle(media['library'])
 
+    def getMediaSearcherId(self, media_type):
+        if media_type == 'movie':
+            return 'movie'
+
 class SearchSetupError(Exception):
     pass

couchpotato/core/providers/base.py

@@ -294,6 +294,7 @@ class ResultList(list):
 
             old_score = new_result['score']
             new_result['score'] = int(old_score * is_correct_weight)
+
             log.info('Found correct release with weight %.02f, old_score(%d) now scaled to score(%d)', (
                 is_correct_weight,
                 old_score,