Always check for correct quality

couchpotato/core/plugins/searcher/main.py

@@ -242,7 +242,6 @@ class Searcher(Plugin):
     def correctMovie(self, nzb = {}, movie = {}, quality = {}, **kwargs):
 
         imdb_results = kwargs.get('imdb_results', False)
-        single_category = kwargs.get('single_category', False)
         retention = Env.setting('retention', section = 'nzb')
 
         if nzb.get('seeds') is None and retention < nzb.get('age', 0):
@@ -275,7 +274,7 @@ class Searcher(Plugin):
         preferred_quality = fireEvent('quality.single', identifier = quality['identifier'], single = True)
 
         # Contains lower quality string
-        if self.containsOtherQuality(nzb, movie_year = movie['library']['year'], preferred_quality = preferred_quality, single_category = single_category):
+        if self.containsOtherQuality(nzb, movie_year = movie['library']['year'], preferred_quality = preferred_quality):
             log.info('Wrong: %s, looking for %s', (nzb['name'], quality['label']))
             return False
 
@@ -327,7 +326,7 @@ class Searcher(Plugin):
         log.info("Wrong: %s, undetermined naming. Looking for '%s (%s)'" % (nzb['name'], movie_name, movie['library']['year']))
         return False
 
-    def containsOtherQuality(self, nzb, movie_year = None, preferred_quality = {}, single_category = False):
+    def containsOtherQuality(self, nzb, movie_year = None, preferred_quality = {}):
 
         name = nzb['name']
         size = nzb.get('size', 0)
@@ -358,9 +357,6 @@ class Searcher(Plugin):
             if found.get(allowed):
                 del found[allowed]
 
-        if (len(found) == 0 and single_category):
-            return False
-
         return not (found.get(preferred_quality['identifier']) and len(found) == 1)
 
     def checkIMDB(self, haystack, imdbId):

couchpotato/core/providers/nzb/mysterbin/main.py

@@ -88,7 +88,7 @@ class Mysterbin(NZBProvider):
                         new['score'] = fireEvent('score.calculate', new, movie, single = True)
                         is_correct_movie = fireEvent('searcher.correct_movie',
                                                         nzb = new, movie = movie, quality = quality,
-                                                        imdb_results = False, single_category = False, single = True)
+                                                        imdb_results = False, single = True)
                         if is_correct_movie:
                             results.append(new)
                             self.found(new)

couchpotato/core/providers/nzb/newznab/main.py

@@ -96,13 +96,12 @@ class Newznab(NZBProvider, RSS):
         url = "%s&%s" % (self.getUrl(host['host'], self.urls['search']), arguments)
 
         cache_key = 'newznab.%s.%s.%s' % (host['host'], movie['library']['identifier'], cat_id[0])
-        single_cat = (len(cat_id) == 1 and cat_id[0] != self.cat_backup_id)
 
-        results = self.createItems(url, cache_key, host, single_cat = single_cat, movie = movie, quality = quality)
+        results = self.createItems(url, cache_key, host, movie = movie, quality = quality)
 
         return results
 
-    def createItems(self, url, cache_key, host, single_cat = False, movie = None, quality = None, for_feed = False):
+    def createItems(self, url, cache_key, host, movie = None, quality = None, for_feed = False):
         results = []
 
         data = self.getCache(cache_key, url, cache_timeout = 1800, headers = {'User-Agent': Env.getIdentifier()})
@@ -146,7 +145,7 @@ class Newznab(NZBProvider, RSS):
                     if not for_feed:
                         is_correct_movie = fireEvent('searcher.correct_movie',
                                                      nzb = new, movie = movie, quality = quality,
-                                                     imdb_results = True, single_category = single_cat, single = True)
+                                                     imdb_results = True, single = True)
 
                         if is_correct_movie:
                             new['score'] = fireEvent('score.calculate', new, movie, single = True)

couchpotato/core/providers/nzb/nzbclub/main.py

@@ -86,7 +86,7 @@ class NZBClub(NZBProvider, RSS):
 
                     is_correct_movie = fireEvent('searcher.correct_movie',
                                                  nzb = new, movie = movie, quality = quality,
-                                                 imdb_results = False, single_category = False, single = True)
+                                                 imdb_results = False, single = True)
 
                     if is_correct_movie:
                         new['score'] = fireEvent('score.calculate', new, movie, single = True)

couchpotato/core/providers/nzb/nzbindex/main.py

@@ -93,7 +93,7 @@ class NzbIndex(NZBProvider, RSS):
 
                     is_correct_movie = fireEvent('searcher.correct_movie',
                                                  nzb = new, movie = movie, quality = quality,
-                                                 imdb_results = False, single_category = False, single = True)
+                                                 imdb_results = False, single = True)
 
                     if is_correct_movie:
                         new['score'] = fireEvent('score.calculate', new, movie, single = True)

couchpotato/core/providers/nzb/nzbmatrix/main.py

@@ -49,7 +49,6 @@ class NZBMatrix(NZBProvider, RSS):
         url = "%s?%s" % (self.urls['search'], arguments)
 
         cache_key = 'nzbmatrix.%s.%s' % (movie['library'].get('identifier'), cat_ids)
-        single_cat = True
 
         data = self.getCache(cache_key, url, cache_timeout = 1800, headers = {'User-Agent': Env.getIdentifier()})
         if data:
@@ -86,7 +85,7 @@ class NZBMatrix(NZBProvider, RSS):
 
                     is_correct_movie = fireEvent('searcher.correct_movie',
                                                  nzb = new, movie = movie, quality = quality,
-                                                 imdb_results = True, single_category = single_cat, single = True)
+                                                 imdb_results = True, single = True)
 
                     if is_correct_movie:
                         new['score'] = fireEvent('score.calculate', new, movie, single = True)

couchpotato/core/providers/torrent/kickasstorrents/main.py

@@ -89,7 +89,7 @@ class KickAssTorrents(TorrentProvider):
                                 new['score'] += fireEvent('score.calculate', new, movie, single = True)
                                 is_correct_movie = fireEvent('searcher.correct_movie',
                                                                 nzb = new, movie = movie, quality = quality,
-                                                                imdb_results = True, single_category = False, single = True)
+                                                                imdb_results = True, single = True)
                                 if is_correct_movie:
                                     results.append(new)
                                     self.found(new)

couchpotato/core/providers/torrent/publichd/main.py

@@ -70,7 +70,7 @@ class PublicHD(TorrentProvider):
 
                         new['score'] = fireEvent('score.calculate', new, movie, single = True)
                         is_correct_movie = fireEvent('searcher.correct_movie', nzb = new, movie = movie, quality = quality,
-                                                        imdb_results = False, single_category = False, single = True)
+                                                        imdb_results = False, single = True)
 
                         if is_correct_movie:
                             results.append(new)

couchpotato/core/providers/torrent/sceneaccess/main.py

@@ -86,7 +86,7 @@ class SceneAccess(TorrentProvider):
 
                     new['score'] = fireEvent('score.calculate', new, movie, single = True)
                     is_correct_movie = fireEvent('searcher.correct_movie', nzb = new, movie = movie, quality = quality,
-                                                     imdb_results = False, single_category = False, single = True)
+                                                     imdb_results = False, single = True)
 
                     if is_correct_movie:
                         results.append(new)

couchpotato/core/providers/torrent/scenehd/main.py

@@ -79,7 +79,7 @@ class SceneHD(TorrentProvider):
 
                     new['score'] = fireEvent('score.calculate', new, movie, single = True)
                     is_correct_movie = fireEvent('searcher.correct_movie', nzb = new, movie = movie, quality = quality,
-                                                     imdb_results = imdb_results, single_category = False, single = True)
+                                                     imdb_results = imdb_results, single = True)
 
                     if is_correct_movie:
                         results.append(new)

couchpotato/core/providers/torrent/thepiratebay/main.py

@@ -120,7 +120,7 @@ class ThePirateBay(TorrentProvider):
 
                         new['score'] = fireEvent('score.calculate', new, movie, single = True)
                         is_correct_movie = fireEvent('searcher.correct_movie', nzb = new, movie = movie, quality = quality,
-                                                        imdb_results = False, single_category = False, single = True)
+                                                        imdb_results = False, single = True)
 
                         if is_correct_movie:
                             results.append(new)

couchpotato/core/providers/torrent/torrentleech/main.py

@@ -80,7 +80,7 @@ class TorrentLeech(TorrentProvider):
 
                     new['score'] = fireEvent('score.calculate', new, movie, single = True)
                     is_correct_movie = fireEvent('searcher.correct_movie', nzb = new, movie = movie, quality = quality,
-                                                    imdb_results = imdb_results, single_category = False, single = True)
+                                                    imdb_results = imdb_results, single = True)
 
                     if is_correct_movie:
                         results.append(new)