monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-18 08:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/3.26.1'

Browse source
This commit is contained in:
JackDandy 2023-02-09 13:45:42 +00:00
commit e353ddb5ae
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES.md
View file

@ -1,4 +1,10 @@
### 3.26.0 (2023-01-12 02:00: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)
* 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)

10
sickgear.py
View file

@ -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'])
@ -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)