github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-22 14:13:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract param only when not a fork_obj

Browse source 
* Directly return process_result from api_call()
This commit is contained in:
p0psicles 2021-02-15 17:08:54 +01:00
commit b5c7723020
1 changed files with 54 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

105
core/auto_process/tv.py
View file

@ -196,66 +196,69 @@ def process(section, dir_name, input_name=None, failed=False, client_agent='manu
init_sickbeard.fork_obj.initialize(dir_name, input_name, failed, client_agent='manual') init_sickbeard.fork_obj.initialize(dir_name, input_name, failed, client_agent='manual')
# configure SB params to pass # configure SB params to pass
fork_params['quiet'] = 1 # We don't want to remove params, for the Forks that have been refactored.
fork_params['proc_type'] = 'manual' # As we don't want to duplicate this part of the code.
if input_name is not None: if not init_sickbeard.fork_obj:
fork_params['nzbName'] = input_name fork_params['quiet'] = 1
fork_params['proc_type'] = 'manual'
if input_name is not None:
fork_params['nzbName'] = input_name
for param in copy.copy(fork_params): for param in copy.copy(fork_params):
if param == 'failed': if param == 'failed':
if failed > 1: if failed > 1:
failed = 1 failed = 1
fork_params[param] = failed fork_params[param] = failed
if 'proc_type' in fork_params: if 'proc_type' in fork_params:
del fork_params['proc_type'] del fork_params['proc_type']
if 'type' in fork_params: if 'type' in fork_params:
del fork_params['type'] del fork_params['type']
if param == 'return_data': if param == 'return_data':
fork_params[param] = 0 fork_params[param] = 0
if 'quiet' in fork_params: if 'quiet' in fork_params:
del fork_params['quiet'] del fork_params['quiet']
if param == 'type': if param == 'type':
if 'type' in fork_params: # only set if we haven't already deleted for 'failed' above. if 'type' in fork_params: # only set if we haven't already deleted for 'failed' above.
fork_params[param] = 'manual' fork_params[param] = 'manual'
if 'proc_type' in fork_params: if 'proc_type' in fork_params:
del fork_params['proc_type'] del fork_params['proc_type']
if param in ['dir_name', 'dir', 'proc_dir', 'process_directory', 'path']: if param in ['dir_name', 'dir', 'proc_dir', 'process_directory', 'path']:
fork_params[param] = dir_name fork_params[param] = dir_name
if remote_path: if remote_path:
fork_params[param] = remote_dir(dir_name) fork_params[param] = remote_dir(dir_name)
if param == 'process_method': if param == 'process_method':
if process_method: if process_method:
fork_params[param] = process_method fork_params[param] = process_method
else: else:
del fork_params[param] del fork_params[param]
if param in ['force', 'force_replace']: if param in ['force', 'force_replace']:
if force: if force:
fork_params[param] = force fork_params[param] = force
else: else:
del fork_params[param] del fork_params[param]
if param in ['delete_on', 'delete']: if param in ['delete_on', 'delete']:
if delete_on: if delete_on:
fork_params[param] = delete_on fork_params[param] = delete_on
else: else:
del fork_params[param] del fork_params[param]
if param == 'ignore_subs': if param == 'ignore_subs':
if ignore_subs: if ignore_subs:
fork_params[param] = ignore_subs fork_params[param] = ignore_subs
else: else:
del fork_params[param] del fork_params[param]
if param == 'force_next': if param == 'force_next':
fork_params[param] = 1 fork_params[param] = 1
# delete any unused params so we don't pass them to SB by mistake # delete any unused params so we don't pass them to SB by mistake
[fork_params.pop(k) for k, v in list(fork_params.items()) if v is None] [fork_params.pop(k) for k, v in list(fork_params.items()) if v is None]
if status == 0: if status == 0:
if section == 'NzbDrone' and not apikey: if section == 'NzbDrone' and not apikey:
@ -323,7 +326,7 @@ def process(section, dir_name, input_name=None, failed=False, client_agent='manu
try: try:
if section == 'SickBeard': if section == 'SickBeard':
if init_sickbeard.fork_obj: if init_sickbeard.fork_obj:
r = init_sickbeard.fork_obj.api_call() return init_sickbeard.fork_obj.api_call()
else: else:
s = requests.Session() s = requests.Session()