Merge branch 'hotfix-3220' into develop

sickbeard/providers/scc.py

@@ -95,15 +95,18 @@ class SCCProvider(generic.TorrentProvider):
         title = '<title>.+? \| %s</title>' % section
         return re.search(title, text, re.IGNORECASE)
 
-    def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0, epObj=None):
-        #FIXME ADD MODE
-        results = data = []
+    def _doSearch(self, search_strings, search_mode='eponly', epcount=0, age=0, epObj=None):
 
         if not self._doLogin():
             return results
 
-        for search_string in [search_params]:
+        results = []
+        items = {'Season': [], 'Episode': [], 'RSS': []}
+
+        for mode in search_strings.keys():
+            if mode != 'RSS':
                 logger.log(u"Search Mode: %s" % mode, logger.DEBUG)
+            for search_string in search_strings[mode]:
                 if mode != 'RSS':
                     logger.log(u"Search string: %s " % search_string, logger.DEBUG)
 
@@ -174,8 +177,13 @@ class SCCProvider(generic.TorrentProvider):
                             if mode != 'RSS':
                                 logger.log(u"Found result: %s " % title, logger.DEBUG)
 
-                        results.append(item)
-        #FIX ME SORTING
+                            items[mode].append(item)
+
+            #For each search mode sort all the items by seeders if available
+            items[mode].sort(key=lambda tup: tup[3], reverse=True)
+
+            results += items[mode]
+
         return results
 
     def findPropers(self, search_date=datetime.datetime.today()):