Merge pull request #2146 from SiCKRAGETV/nzbgeek

Add NZBGeek to newznab providers (Thanks NZBGeek for dev apikey) +fix

sickbeard/providers/__init__.py

@@ -214,12 +214,12 @@ def makeTorrentRssProvider(configString):
 
 def getDefaultNewznabProviders():
     #name|url|key|catIDs|enabled|search_mode|search_fallback|enable_daily|enable_backlog
-    return 'NZB.Cat|https://nzb.cat/||5030,5040,5010,5060|0|eponly|1|1|1!!!' + \
+    return 'NZB.Cat|https://nzb.cat/||5030,5040,5010|0|eponly|1|1|1!!!' + \
+           'NZBGeek|https://api.nzbgeek.info/||5030,5040|0|eponly|0|0|0!!!' + \
            'Sick Beard Index|http://lolo.sickbeard.com/|0|5030,5040|0|eponly|0|0|0!!!' + \
            'NZBs.org|https://nzbs.org/||5030,5040|0|eponly|0|0|0!!!' + \
            'Usenet-Crawler|https://www.usenet-crawler.com/||5030,5040|0|eponly|0|0|0'
 
-
 def getProviderModule(name):
     name = name.lower()
     prefix = "sickbeard.providers."

sickbeard/providers/newznab.py

@@ -260,6 +260,9 @@ class NewznabProvider(generic.NZBProvider):
                   "attrs": "rageid",
                   "offset": 0}
 
+        if search_params:
+            params.update(search_params)
+
         # category ids
         if self.show and self.show.is_sports:
             params['cat'] = self.catIDs + ',5060'
@@ -268,9 +271,6 @@ class NewznabProvider(generic.NZBProvider):
         else:
             params['cat'] = self.catIDs
 
-        if search_params:
-            params.update(search_params)
-
         if self.needs_auth and self.key:
             params['apikey'] = self.key