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 'main' into dev

Browse source
This commit is contained in:
JackDandy 2023-06-07 14:13:36 +01:00
commit d0585b7345
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.md
View file

@ -4,6 +4,12 @@
* Update soupsieve 2.3.2.post1 (792d566) to 2.4.1 (2e66beb)
### 3.29.4 (2023-06-07 13:45:00 UTC)
* Change allow Python 3.8.17, 3.9.17, 3.10.12
* Fix setting airtime timezone for "Wanted" episodes during auto search
### 3.29.3 (2023-05-31 13:30:00 UTC)
* Update UnRar x64 for Windows 6.21 to 6.22

4
sickgear.py
View file

@ -36,8 +36,8 @@ warnings.filterwarnings('ignore', module=r'.*ssl_.*', message='.*SSLContext obje
warnings.filterwarnings('ignore', module=r'.*zoneinfo.*', message='.*file or directory.*')
warnings.filterwarnings('ignore', message='.*deprecated in cryptography.*')
versions = [((3, 8, 2), (3, 8, 16)),
((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 16)),
versions = [((3, 8, 2), (3, 8, 17)),
((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 17)),
((3, 10, 0), (3, 11, 4))] # 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)):
major, minor, micro = sys.version_info[:3]

16
sickgear/search_queue.py
View file

@ -467,13 +467,15 @@ class RecentSearchQueueItem(generic_queue.QueueItem):
continue
try:
end_time = network_timezones.get_episode_time(cur_result['airdate'],
cur_result['airtime'] or show_obj.airs,
show_obj.network,
show_obj.timezone,
cur_result['timestamp'],
cur_result['network'],
cur_result['timezone']
end_time = network_timezones.get_episode_time(d=cur_result['airdate'],
t=show_obj.airs,
show_network=show_obj.network,
show_airtime=show_obj.airtime,
show_timezone=show_obj.timezone,
ep_timestamp=cur_result['timestamp'],
ep_network=cur_result['network'],
ep_airtime=cur_result['airtime'],
ep_timezone=cur_result['timezone']
)
end_time += datetime.timedelta(minutes=helpers.try_int(cur_result['runtime'] or show_obj.runtime, 60))