Keep cmd take 2 #1738

This commit is contained in:
Clinton Hall 2020-04-21 13:00:24 +12:00 committed by GitHub
commit 4c775ce432
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -39,6 +39,7 @@ def api_check(r, params, rem_params):
try:
optional_parameters = json_data['optionalParameters'].keys()
optional_parameters.add('cmd') # Don't remove cmd from api params
# Find excess parameters
excess_parameters = set(params).difference(optional_parameters)
logger.debug('Removing excess parameters: {}'.format(sorted(excess_parameters)))
@ -139,8 +140,6 @@ def auto_fork(section, input_category):
if apikey:
rem_params, found = api_check(r, params, rem_params)
if found:
if 'cmd' in rem_params:
rem_params.pop('cmd') # Don't remove this param.
params['cmd'] = 'sg.postprocess'
else: # try different api set for non-SickGear forks.
url = '{protocol}{host}:{port}{root}/api/{apikey}/?cmd=help&subject=postprocess'.format(
@ -152,8 +151,6 @@ def auto_fork(section, input_category):
logger.info('Could not connect to {section}:{category} to perform auto-fork detection!'.format
(section=section, category=input_category))
rem_params, found = api_check(r, params, rem_params)
if 'cmd' in rem_params:
rem_params.pop('cmd') # Don't remove this param.
params['cmd'] = 'postprocess'
else:
# Find excess parameters