Merge branch 'master' into develop

CHANGES.md

@@ -22,6 +22,12 @@
 
 
 
+### 0.21.9 (2020-01-30 21:00:00 UTC)
+
+* Fix init of custom newznab categories
+* Change improve clarity of custom newznab category selection with "+/-" and usage text
+
+
 ### 0.21.9 (2020-01-28 01:00:00 UTC)
 
 * Fix reading service.py under Docker

gui/slick/interfaces/default/config_providers.tmpl

@@ -849,12 +849,12 @@ name = '' if not client else get_client_instance(sickbeard.TORRENT_METHOD)().nam
 									<div id="nn-cats" class="hide">
 										<div class="pull-left">
 											<select class="pull-left" id="newznab_cap" multiple="multiple" style="min-width:10em;min-height:72px"></select>
-											<input class="btn" type="button" class="newznab_cat_update" id="newznab_cat_update" value=">>" style="position:relative;bottom:-15px">
+											<input class="btn" type="button" class="newznab_cat_update" id="newznab_cat_update" value="+/-" style="position:relative;bottom:-15px">
 										</div>
 										<select id="newznab_cat" multiple="multiple" style="min-width:7em;min-height:72px"></select>
 										<div class="clear-left">
 											<p>multi-select newznab categories on the left<br />
-											then click ">>" and finally "Save Changes"</p>
+											"+/-" will add/remove all, finally "Save Changes"</p>
 										</div>
 									</div>
 									<div id="nn-nocats" class="hide">

sickbeard/providers/newznab.py

@@ -141,7 +141,6 @@ class NewznabProvider(generic.NZBProvider):
         self.server_type = try_int(server_type, None) or NewznabConstants.SERVER_DEFAULT
         self._exclude = set()
         self.cat_ids = cat_ids or ''
-        self._cat_ids = None
         self.search_mode = search_mode or 'eponly'
         self.search_fallback = bool(try_int(search_fallback))
         self.enable_recentsearch = bool(try_int(enable_recentsearch))
@@ -1112,6 +1111,17 @@ class NewznabProvider(generic.NZBProvider):
             self._log_search(mode, count, url)
         return count
 
+    def __str__(self):
+        return 'NewznabProvider: %s (%s); server type: %s; enabled searches: %s' % \
+               (self.name, ('disabled', 'enabled')[self.enabled in (True, 1)],
+                NewznabConstants.server_types.get(self.server_type, 'unknown'),
+                ','.join(en[1] for en in
+                         ((self.enable_recentsearch, 'recent'), (self.enable_scheduled_backlog, 'backlog'),
+                          (self.enable_scheduled_backlog, 'scheduled'))) or 'None')
+
+    def __repr__(self):
+        return self.__str__()
+
 
 class NewznabCache(tvcache.TVCache):