From 05146c08066a2c8e86ca4b6c9a3432ffcbe7aabd Mon Sep 17 00:00:00 2001 From: Prinz23 Date: Tue, 17 Jan 2023 03:22:21 +0100 Subject: [PATCH 1/2] Change forced show updates process during startup to prevent webUI blocking. --- CHANGES.md | 7 ++++++- sickgear.py | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ceae1956..03efbb5f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 3.26.0 (2023-01-12 02:00:00 UTC) +### 3.26.1 (2023-01-25 01:45:00 UTC) + +* Change forced show updates process during startup to prevent webUI blocking + + +### 3.26.0 (2023-01-12 02:00:00 UTC) * Change bump to major version 3.xx to signal that this branch supports Python3+ only * Update Tornado Web Server 6.1.0 (2047e7a) to 6.2.0 (a4f08a3) diff --git a/sickgear.py b/sickgear.py index db9f97fe..0f4d1774 100755 --- a/sickgear.py +++ b/sickgear.py @@ -628,7 +628,9 @@ class SickGear(object): # Start an update if we're supposed to if not switching and (self.force_update or sickgear.UPDATE_SHOWS_ON_START): sickgear.classes.loading_msg.message = 'Starting a forced show update' - sickgear.show_update_scheduler.action.run() + background_start_forced_show_update = threading.Thread(name='STARTUP-FORCE-SHOW-UPDATE', + target=sickgear.show_update_scheduler.action.run) + background_start_forced_show_update.start() sickgear.classes.loading_msg.message = 'Switching to default web server' time.sleep(2) From 3faeee2233ed87850c4a8991cbee64d31549bb06 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Wed, 8 Feb 2023 20:51:12 +0000 Subject: [PATCH 2/2] Change allow Python 3.11.2, 3.10.10 --- CHANGES.md | 3 ++- sickgear.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 03efbb5f..0e2a4a63 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ -### 3.26.1 (2023-01-25 01:45:00 UTC) +### 3.26.1 (2023-02-08 20:50:00 UTC) * Change forced show updates process during startup to prevent webUI blocking +* Change allow Python 3.11.2, 3.10.10 ### 3.26.0 (2023-01-12 02:00:00 UTC) diff --git a/sickgear.py b/sickgear.py index 0f4d1774..d8caf88f 100755 --- a/sickgear.py +++ b/sickgear.py @@ -41,7 +41,7 @@ warnings.filterwarnings('ignore', message='.*deprecated in cryptography.*') versions = [((3, 7, 1), (3, 8, 16)), ((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 16)), - ((3, 10, 0), (3, 11, 1))] # inclusive version ranges + ((3, 10, 0), (3, 11, 2))] # inclusive version ranges if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)): print('Python %s.%s.%s detected.' % sys.version_info[:3]) print('Sorry, SickGear requires a Python version %s' % ', '.join(map( @@ -528,8 +528,8 @@ class SickGear(object): # Build from the DB to start with sickgear.classes.loading_msg.message = 'Loading shows from db' sickgear.indexermapper.indexer_list = [i for i in sickgear.TVInfoAPI().all_sources - if sickgear.TVInfoAPI(i).config.get('show_url') - and True is not sickgear.TVInfoAPI(i).config.get('people_only')] + if sickgear.TVInfoAPI(i).config.get('show_url') + and True is not sickgear.TVInfoAPI(i).config.get('people_only')] self.load_shows_from_db() sickgear.MEMCACHE['history_tab'] = sickgear.webserve.History.menu_tab( sickgear.MEMCACHE['history_tab_limit'])