dockeruser
/
SickGear
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'hotfix/0.21.24'

tags/release_0.21.24^0 release_0.21.24
JackDandy 5 years ago
parent
2c485491fd a1200bdbad
commit
800d42b4a4
3 changed files with 40 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      CHANGES.md
  2. 34
      sickbeard/properFinder.py
  3. 10
      sickbeard/search.py

8
CHANGES.md
View File

@ -1,4 +1,10 @@
### 0.21.23 (2020-03-31 10:00:00 UTC)
### 0.21.24 (2020-04-04 00:30:00 UTC)
* Fix use release group for Propers check from history if status is snatched
* Change add provider filter fallbacks into Propers search flow
### 0.21.23 (2020-03-31 10:00:00 UTC)
* Update UnRar for Windows 5.80 to 5.90 x64
* Fix viewing Manage/Bulk Change" page skews "Added last..." list

34
sickbeard/properFinder.py
View File

@ -229,6 +229,8 @@ def _get_proper_list(aired_since_shows, recent_shows, recent_anime, proper_dict=
:rtype: List[sickbeard.classes.Proper]
"""
propers = {}
# make sure the episode has been downloaded before
history_limit = datetime.datetime.today() - datetime.timedelta(days=30)
my_db = db.DBConnection()
# for each provider get a list of arbitrary Propers
@ -336,7 +338,25 @@ def _get_proper_list(aired_since_shows, recent_shows, recent_anime, proper_dict=
cur_proper.is_repack, cur_proper.properlevel = Quality.get_proper_level(
parse_result.extra_info_no_name(), parse_result.version, parse_result.is_anime, check_is_repack=True)
cur_proper.proper_level = cur_proper.properlevel # local non global value
old_release_group = sql_result[0]['release_group']
if old_status in SNATCHED_ANY:
old_release_group = ''
# noinspection SqlResolve
history_results = my_db.select(
'SELECT resource FROM history'
' WHERE indexer = ? AND showid = ?'
' AND season = ? AND episode = ? AND quality = ? AND date >= ?'
' AND (%s) ORDER BY date DESC LIMIT 1' % ' OR '.join(
['action = "%d%02d"' % (old_quality, x) for x in SNATCHED_ANY]),
[cur_proper.tvid, cur_proper.prodid,
cur_proper.season, cur_proper.episode, cur_proper.quality,
history_limit.strftime(history.dateFormat)])
if len(history_results):
try:
old_release_group = np.parse(history_results[0]['resource']).release_group
except (BaseException, Exception):
pass
else:
old_release_group = sql_result[0]['release_group']
try:
same_release_group = parse_result.release_group.lower() == old_release_group.lower()
except (BaseException, Exception):
@ -393,8 +413,6 @@ def _get_proper_list(aired_since_shows, recent_shows, recent_anime, proper_dict=
else:
found_msg = 'Found Proper [%s]' % cur_proper.name
# make sure the episode has been downloaded before
history_limit = datetime.datetime.today() - datetime.timedelta(days=30)
# noinspection SqlResolve
history_results = my_db.select(
'SELECT resource FROM history'
@ -489,8 +507,12 @@ def _download_propers(proper_list):
# scene release checking
scene_only = getattr(cur_proper.provider, 'scene_only', False)
non_scene_fallback = getattr(cur_proper.provider, 'scene_loose', False) \
or getattr(cur_proper.provider, 'scene_loose_active', False)
scene_rej_nuked = getattr(cur_proper.provider, 'scene_rej_nuked', False)
if any([scene_only, scene_rej_nuked]) and not cur_proper.parsed_show_obj.is_anime:
scene_nuked_active = getattr(cur_proper.provider, 'scene_nuked_active', False)
if any([scene_only, non_scene_fallback, scene_rej_nuked, scene_nuked_active]) \
and not cur_proper.parsed_show_obj.is_anime:
scene_or_contain = getattr(cur_proper.provider, 'scene_or_contain', '')
scene_contains = False
if scene_only and scene_or_contain:
@ -505,14 +527,14 @@ def _download_propers(proper_list):
reject, url = search.can_reject(cur_proper.name)
if reject:
if isinstance(reject, string_types):
if scene_rej_nuked:
if scene_rej_nuked and not scene_nuked_active:
logger.log('Rejecting nuked release. Nuke reason [%s] source [%s]' % (reject, url),
logger.DEBUG)
else:
logger.log('Considering nuked release. Nuke reason [%s] source [%s]' % (reject, url),
logger.DEBUG)
reject = False
elif scene_contains:
elif scene_contains or non_scene_fallback:
reject = False
else:
logger.log('Rejecting as not scene release listed at any [%s]' % url, logger.DEBUG)

10
sickbeard/search.py
View File

@ -249,15 +249,15 @@ def pick_best_result(
# find the best result for the current episode
best_result = None
best_fallback_result = None
scene_only = scene_or_contain = scene_loose = scene_loose_active = scene_rej_nuked = scene_nuked_active = False
scene_only = scene_or_contain = non_scene_fallback = scene_rej_nuked = scene_nuked_active = False
if filter_rls:
try:
provider = getattr(results[0], 'provider', None)
scene_only = getattr(provider, 'scene_only', False)
scene_or_contain = getattr(provider, 'scene_or_contain', '')
recent_task = 'RECENT' in filter_rls
scene_loose = getattr(provider, 'scene_loose', False) and recent_task
scene_loose_active = getattr(provider, 'scene_loose_active', False) and not recent_task
non_scene_fallback = (getattr(provider, 'scene_loose', False) and recent_task) \
or (getattr(provider, 'scene_loose_active', False) and not recent_task)
scene_rej_nuked = getattr(provider, 'scene_rej_nuked', False)
scene_nuked_active = getattr(provider, 'scene_nuked_active', False) and not recent_task
except (BaseException, Exception):
@ -283,7 +283,7 @@ def pick_best_result(
logger.log(u'Rejecting previously failed [%s]' % cur_result.name)
continue
if filter_rls and any([scene_only, scene_loose, scene_loose_active, scene_rej_nuked, scene_nuked_active]):
if filter_rls and any([scene_only, non_scene_fallback, scene_rej_nuked, scene_nuked_active]):
if show_obj.is_anime:
addendum = u'anime (skipping scene/nuke filter) '
else:
@ -310,7 +310,7 @@ def pick_best_result(
logger.log(u'Considering nuked release. Nuke reason [%s] source [%s]' % (reject, url),
logger.DEBUG)
reject = False
elif scene_contains or any([scene_loose, scene_loose_active]):
elif scene_contains or non_scene_fallback:
best_fallback_result = best_candidate(best_fallback_result, cur_result)
else:
logger.log(u'Rejecting as not scene release listed at any [%s]' % url, logger.DEBUG)

Write Preview
Loading…
Cancel
Save