Merge branch 'master' into develop

CHANGES.md

@@ -26,6 +26,13 @@
 
 
 ### 0.21.9 (2020-01-30 21:00:00 UTC)
+### 0.21.11 (2020-02-01 21:40:00 UTC)
+
+* Change ended show mark "[ ! ]" of view-show/"Change show" pull down because Chromium removed the CSS method
+* Fix creating show list when there is no list at the cycle of backlog search spread
+
+
+### 0.21.10 (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

gui/slick/css/style.css

@@ -1724,9 +1724,6 @@ body.back-art.avoid #livepanel #rate-art .icon-glyph:hover,
 	font-weight:700;
 	color:#888
 }
-#display-show.pro #pickShow .ended:before{
-	content:"[ ! ] "
-}
 
 #details-top{
 	height:70px

gui/slick/js/livepanel.js

@@ -288,6 +288,25 @@ $(document).ready(function() {
 					: (isSet('pro') ? pTitle['viewmode1']
 						: pTitle['viewmode0']),
 				refreshAll);
+
+			// update pick show drop down
+			var reg = new RegExp(isSet('pro') ? '^(?!\\[\\s!\\s]).' : '^\\[\\s!\\s]'),
+				ended$ = $('#display-show').find('#pickShow').find('.ended')
+					.filter(function () { return reg.test(this.text);});
+			if (ended$.length) {
+				var change;
+				if (isSet('pro')) {
+					change = function() {
+						this.prepend('[ ! ] ');
+					};
+				} else {
+					reg = new RegExp('^\\[\\s!\\s]\\s');
+					change = function() {
+						this.text = this.text.replace(reg, '');
+					};
+				}
+				ended$.each(change);
+			}
 		}
 		return result;
 	}

sickbeard/databases/mainDB.py

@@ -42,6 +42,12 @@ class MainSanityCheck(db.DBSanityCheck):
         self.fix_scene_exceptions()
         self.fix_orphan_not_found_show()
         self.fix_fallback_mapping()
+        self.fix_indexer_mapping_tvdb()
+
+    def fix_indexer_mapping_tvdb(self):
+        if not self.connection.has_flag('fix_indexer_mapping_tvdb'):
+            self.connection.action('DELETE FROM indexer_mapping WHERE mindexer = ?', [10001])
+            self.connection.set_flag('fix_indexer_mapping_tvdb')
 
     def fix_duplicate_shows(self, column='indexer_id'):
 
@@ -823,8 +829,9 @@ class ConvertTVShowsToIndexerScheme(db.SchemaUpgrade):
 
         self.connection.action('CREATE UNIQUE INDEX idx_indexer_id ON tv_shows (indexer_id);')
 
-        # noinspection SqlResolve
+        # noinspection SqlResolve,SqlConstantCondition
         self.connection.action('UPDATE tv_shows SET classification = "Scripted" WHERE 1=1')
+        # noinspection SqlConstantCondition
         self.connection.action('UPDATE tv_shows SET indexer = 1 WHERE 1=1')
 
         self.incDBVersion()
@@ -865,6 +872,7 @@ class ConvertTVEpisodesToIndexerScheme(db.SchemaUpgrade):
         self.connection.action('CREATE INDEX idx_sta_epi_air ON tv_episodes (status,episode, airdate)')
         self.connection.action('CREATE INDEX idx_sta_epi_sta_air ON tv_episodes (season,episode, status, airdate)')
 
+        # noinspection SqlConstantCondition
         self.connection.action('UPDATE tv_episodes SET indexer = 1 WHERE 1=1')
 
         self.incDBVersion()

sickbeard/providers/newznab.py

@@ -1117,7 +1117,7 @@ class NewznabProvider(generic.NZBProvider):
                 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')
+                          (self.enable_scheduled_backlog, 'scheduled')) if en[0]) or 'None')
 
     def __repr__(self):
         return self.__str__()