monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-11-15 01:15:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/ChangeBacklogSort' into dev

Browse source
This commit is contained in:
JackDandy 2023-09-05 23:30:33 +01:00
commit 25b32bdf7e
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -3,6 +3,8 @@
* Update Beautiful Soup 4.11.1 (r642) to 4.12.2 * Update Beautiful Soup 4.11.1 (r642) to 4.12.2
* Update soupsieve 2.3.2.post1 (792d566) to 2.4.1 (2e66beb) * Update soupsieve 2.3.2.post1 (792d566) to 2.4.1 (2e66beb)
* Fix regex that was not using py312 notation * Fix regex that was not using py312 notation
* Change sort backlog and manual segment search results episode number
* Change sort episodes when set to wanted on display show page
### 3.29.4 (2023-06-07 13:45:00 UTC) ### 3.29.4 (2023-06-07 13:45:00 UTC)

10
sickgear/search_queue.py
View file

@ -653,6 +653,11 @@ class ManualSearchQueueItem(BaseSearchQueueItem):
search_result = search.search_providers(self.show_obj, [self.segment], True, try_other_searches=True) search_result = search.search_providers(self.show_obj, [self.segment], True, try_other_searches=True)
if search_result: if search_result:
# sort results by season, episode number
try:
search_result.sort(key=lambda a: (a.ep_obj_list[0].season or 0, a.ep_obj_list[0].episode or 0))
except (BaseException, Exception):
pass
for result in search_result: # type: sickgear.classes.NZBSearchResult for result in search_result: # type: sickgear.classes.NZBSearchResult
logger.log(f'Downloading {result.name} from {result.provider.name}') logger.log(f'Downloading {result.name} from {result.provider.name}')
self.success = search.snatch_episode(result) self.success = search.snatch_episode(result)
@ -734,6 +739,11 @@ class BacklogQueueItem(BaseSearchQueueItem):
scheduled=self.standard_backlog) scheduled=self.standard_backlog)
if search_result: if search_result:
# sort results by season, episode number
try:
search_result.sort(key=lambda a: (a.ep_obj_list[0].season or 0, a.ep_obj_list[0].episode or 0))
except (BaseException, Exception):
pass
for result in search_result: # type: sickgear.classes.NZBSearchResult for result in search_result: # type: sickgear.classes.NZBSearchResult
logger.log(f'Downloading {result.name} from {result.provider.name}') logger.log(f'Downloading {result.name} from {result.provider.name}')
if search.snatch_episode(result): if search.snatch_episode(result):

5
sickgear/webserve.py
View file

@ -3202,7 +3202,10 @@ class Home(MainHandler):
if None is not eps: if None is not eps:
sql_l = [] sql_l = []
for cur_ep in eps.split('|'): # sort episode numbers
eps_list = eps.split('|')
eps_list.sort()
for cur_ep in eps_list:
logger.debug(f'Attempting to set status on episode {cur_ep} to {status}') logger.debug(f'Attempting to set status on episode {cur_ep} to {status}')