From 850ba6dcea52df4d6027491545bb5a05ed00a002 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Thu, 23 Apr 2020 10:07:16 +1200 Subject: [PATCH] Fix auto detection of forks. #1738 --- core/__init__.py | 8 ++++---- core/auto_process/tv.py | 3 ++- core/forks.py | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 3cdc3c9b..67e4e52e 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -113,12 +113,12 @@ FORKS = { FORK_FAILED_TORRENT: {'dir': None, 'failed': None, 'process_method': None}, FORK_SICKRAGE: {'proc_dir': None, 'failed': None, 'process_method': None, 'force': None, 'delete_on': None}, FORK_SICKCHILL: {'proc_dir': None, 'failed': None, 'process_method': None, 'force': None, 'delete_on': None, 'force_next': None}, - FORK_SICKCHILL_API: {'path': None, 'failed': None, 'process_method': None, 'force_replace': None, 'return_data': None, 'type': None, 'delete': None, 'force_next': None, 'is_priority': None}, - FORK_SICKBEARD_API: {'path': None, 'failed': None, 'process_method': None, 'force_replace': None, 'return_data': None, 'type': None, 'delete': None, 'force_next': None}, + FORK_SICKCHILL_API: {'path': None, 'failed': None, 'process_method': None, 'force_replace': None, 'return_data': None, 'type': None, 'delete': None, 'force_next': None, 'is_priority': None, 'cmd': 'postprocess'}, + FORK_SICKBEARD_API: {'path': None, 'failed': None, 'process_method': None, 'force_replace': None, 'return_data': None, 'type': None, 'delete': None, 'force_next': None, 'cmd': 'postprocess'}, FORK_MEDUSA: {'proc_dir': None, 'failed': None, 'process_method': None, 'force': None, 'delete_on': None, 'ignore_subs': None}, - FORK_MEDUSA_API: {'path': None, 'failed': None, 'process_method': None, 'force_replace': None, 'return_data': None, 'type': None, 'delete_files': None, 'is_priority': None}, + FORK_MEDUSA_API: {'path': None, 'failed': None, 'process_method': None, 'force_replace': None, 'return_data': None, 'type': None, 'delete_files': None, 'is_priority': None, 'cmd': 'postprocess'}, FORK_SICKGEAR: {'dir': None, 'failed': None, 'process_method': None, 'force': None}, - FORK_SICKGEAR_API: {'path': None, 'process_method': None, 'force_replace': None, 'return_data': None, 'type': None, 'is priority': None}, + FORK_SICKGEAR_API: {'path': None, 'process_method': None, 'force_replace': None, 'return_data': None, 'type': None, 'is priority': None, 'cmd': 'sg.postprocess'}, FORK_STHENO: {'proc_dir': None, 'failed': None, 'process_method': None, 'force': None, 'delete_on': None, 'ignore_subs': None}, } ALL_FORKS = {k: None for k in set(list(itertools.chain.from_iterable([FORKS[x].keys() for x in FORKS.keys()])))} diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py index b6c4f21d..a06a1985 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -200,7 +200,8 @@ def process(section, dir_name, input_name=None, failed=False, client_agent='manu del fork_params['quiet'] if param == 'type': - fork_params[param] = 'manual' + if 'type' in fork_params: # only set if we haven't already deleted for 'failed' above. + fork_params[param] = 'manual' if 'proc_type' in fork_params: del fork_params['proc_type'] diff --git a/core/forks.py b/core/forks.py index b9fe4edd..a6f0512c 100644 --- a/core/forks.py +++ b/core/forks.py @@ -41,6 +41,7 @@ def api_check(r, params, rem_params): optional_parameters = json_data['optionalParameters'].keys() # Find excess parameters excess_parameters = set(params).difference(optional_parameters) + excess_parameters.remove('cmd') # Don't remove cmd from api params logger.debug('Removing excess parameters: {}'.format(sorted(excess_parameters))) rem_params.extend(excess_parameters) return rem_params, True