From 2a23ae4b2504614f0871f70ace0fec3abdf86fc8 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Sat, 1 Feb 2020 13:48:56 +0000 Subject: [PATCH 1/2] Change ended show mark "[ ! ]" of view-show/"Change show" pull down because Chromium removed the CSS method. --- CHANGES.md | 7 ++++++- gui/slick/css/style.css | 3 --- gui/slick/js/livepanel.js | 19 +++++++++++++++++++ sickbeard/providers/newznab.py | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ac80eb5..9a3d4ed 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 0.21.9 (2020-01-30 21:00:00 UTC) +### 0.21.11 (2020-01-31 00:00:00 UTC) + +* Change ended show mark "[ ! ]" of view-show/"Change show" pull down because Chromium removed the CSS method + + +### 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 diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 4c97571..3d3afe3 100644 --- a/gui/slick/css/style.css +++ b/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 diff --git a/gui/slick/js/livepanel.js b/gui/slick/js/livepanel.js index cee1f5b..45d7c09 100644 --- a/gui/slick/js/livepanel.js +++ b/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; } diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py index 3f5cfc3..83650d3 100755 --- a/sickbeard/providers/newznab.py +++ b/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__() From f307e3aa27eafee34efc2929fed79db043ae57be Mon Sep 17 00:00:00 2001 From: Prinz23 Date: Sat, 1 Feb 2020 21:40:16 +0000 Subject: [PATCH 2/2] Fix creating show list when there is no list at the cycle of backlog search spread. Change remove possible old TVDB (v1) mappings. --- CHANGES.md | 3 ++- sickbeard/databases/mainDB.py | 10 +++++++++- sickbeard/search_backlog.py | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 9a3d4ed..45d4f36 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ -### 0.21.11 (2020-01-31 00: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) diff --git a/sickbeard/databases/mainDB.py b/sickbeard/databases/mainDB.py index 4dac983..5379ca0 100644 --- a/sickbeard/databases/mainDB.py +++ b/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() diff --git a/sickbeard/search_backlog.py b/sickbeard/search_backlog.py index 668de9a..d1852a1 100644 --- a/sickbeard/search_backlog.py +++ b/sickbeard/search_backlog.py @@ -284,7 +284,7 @@ class BacklogSearcher(object): if not runparts and parts: runparts = parts[0] wanted_list = filter_list( - lambda wi: wi and itervalues(wi).next()[0].show_obj.tvid_prodid in runparts, wanted_list) + lambda wi: wi and next(itervalues(wi))[0].show_obj.tvid_prodid in runparts, wanted_list) limited_wanted_list = [] if standard_backlog and not any_torrent_enabled and runparts: