Improve multi-episode and season snatches. Fixes #229. Fixes #4750 #4675
Conversation
medariox
added
Concluded
Needs testing
medariox
changed the title
medusa/search/core.py
Outdated
| all_wanted = False | ||
| else: | ||
| any_wanted = True | ||
| for ep_obj in candidate.episodes: |
There was a problem hiding this comment.
How do you feel about this?
wanted_check = (
series_obj.want_episode(ep_obj.season, ep_obj.episode, candidate.quality, down_cur_quality)
for ep_obj in candidate.episodes
)
all_wanted = all(wanted_check)
any_wanted = any(wanted_check)And since all_wanted/any_wanted are only used once,
lose the variables and just if all(wanted_check): ... elif not any(wanted_check):
It would also make the checks lazy.
I didn't test my code.
There was a problem hiding this comment.
That's indeed better than the legacy code.
medusa/providers/generic_provider.py
Outdated
| @@ -247,21 +247,24 @@ def find_search_results(self, series, episodes, search_mode, forced_search=False | |||
|
|
|||
| results = {} | |||
| items_list = [] | |||
| season_search = ( | |||
| len(episodes) > 1 or manual_search_type == 'season' | |||
| ) and search_mode == 'sponly' | |||
There was a problem hiding this comment.
The line breaks don't help readability in this case, IMO.
| @@ -861,15 +861,6 @@ def collect_multi_candidates(candidates, series_obj, episodes, down_cur_quality) | |||
| elif len(cur_result.episodes) > 1: | |||
| multi_candidates.append(cur_result) | |||
|
|
|||
| # If this is a torrent all we can do is get the entire torrent, | |||
There was a problem hiding this comment.
We should highlight this change in the changes & news.
There was a problem hiding this comment.
Added to the changelog.
medusa/search/core.py
Outdated
| """ | ||
| found_results = {} | ||
|
|
||
| """Check providers for details on wanted episodes.""" |
There was a problem hiding this comment.
Can you complete this docstring please?
"""
Check providers for details on wanted episodes.
:param force: ???
:return: a list of ???
"""
| if not Quality.is_higher_quality(single_results[episode_no].quality, | ||
| best_result.quality, allowed_qualities, | ||
| preferred_qualities): | ||
| continue |
There was a problem hiding this comment.
Log a debug message when a result is skipped.
There was a problem hiding this comment.
I wouldn't add this. It's going to be very spammy.
sharkykh
changed the title
|
@sharkykh would you mind approving? I think its good |
CHANGELOG.md
Outdated
| #### Fixes | ||
| - Fixed error when changing episode status from episode status management ([#4783](https://github.com/pymedusa/Medusa/pull/4783)) | ||
| - Fixed multi-episode snatches not being marked as snatched in history ([#229](https://github.com/pymedusa/Medusa/issues/229)) | ||
| - Fixed whole seasons being downloaded as multi-episode replacement ([#4750](https://github.com/pymedusa/Medusa/issues/4750)) |
There was a problem hiding this comment.
Please merge develop and put these in the "Unreleased" section.
If we start setting version numbers and dates too soon we'll have to keep updating them until we actually release.
There was a problem hiding this comment.
Also, thank you for including #4783 which I forgot to add!
TODO:
- [ ] Add support for cached season results(for another PR)The old code was extremely error-prone, tried to do too much and was causing unexpected behaviors. The poor implementation was probably caused by the fact that season results didn't have any
episodesunlike single and multi-episodes. As a bonus, it fixes the oldest bug #229 🎉