YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Change _parse_action_args to also return the arg type :/

Browse source
This commit is contained in:
Alexandre Aubin 2019-06-19 22:03:52 +02:00
parent 37274a9e54
commit b01bf43475
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/yunohost/app.py
View file

@ -490,7 +490,7 @@ def app_change_url(operation_logger, app, domain, path):
# Retrieve arguments list for change_url script # Retrieve arguments list for change_url script
# TODO: Allow to specify arguments # TODO: Allow to specify arguments
args_odict = _parse_args_from_manifest(manifest, 'change_url') args_odict = _parse_args_from_manifest(manifest, 'change_url')
args_list = args_odict.values() args_list = [ value[0] for value in args_odict.values() ]
args_list.append(app) args_list.append(app)
# Prepare env. var. to pass to script # Prepare env. var. to pass to script
@ -639,7 +639,7 @@ def app_upgrade(app=[], url=None, file=None):
# Retrieve arguments list for upgrade script # Retrieve arguments list for upgrade script
# TODO: Allow to specify arguments # TODO: Allow to specify arguments
args_odict = _parse_args_from_manifest(manifest, 'upgrade') args_odict = _parse_args_from_manifest(manifest, 'upgrade')
args_list = args_odict.values() args_list = [ value[0] for value in args_odict.values() ]
args_list.append(app_instance_name) args_list.append(app_instance_name)
# Prepare env. var. to pass to script # Prepare env. var. to pass to script
@ -797,7 +797,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
args_dict = {} if not args else \ args_dict = {} if not args else \
dict(urlparse.parse_qsl(args, keep_blank_values=True)) dict(urlparse.parse_qsl(args, keep_blank_values=True))
args_odict = _parse_args_from_manifest(manifest, 'install', args=args_dict) args_odict = _parse_args_from_manifest(manifest, 'install', args=args_dict)
args_list = args_odict.values() args_list = [ value[0] for value in args_odict.values() ]
args_list.append(app_instance_name) args_list.append(app_instance_name)
# Prepare env. var. to pass to script # Prepare env. var. to pass to script
@ -1537,7 +1537,7 @@ def app_action_run(app, action, args=None):
# Retrieve arguments list for install script # Retrieve arguments list for install script
args_dict = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {} args_dict = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {}
args_odict = _parse_args_for_action(actions[action], args=args_dict) args_odict = _parse_args_for_action(actions[action], args=args_dict)
args_list = args_odict.values() args_list = [ value[0] for value in args_odict.values() ]
app_id, app_instance_nb = _parse_app_instance_name(app) app_id, app_instance_nb = _parse_app_instance_name(app)
@ -2272,7 +2272,7 @@ def _parse_action_args_in_yunohost_format(args, action_args):
if arg.get("optional", False): if arg.get("optional", False):
# Argument is optional, keep an empty value # Argument is optional, keep an empty value
# and that's all for this arg ! # and that's all for this arg !
args_dict[arg_name] = '' args_dict[arg_name] = ('', arg_type)
continue continue
else: else:
# The argument is required ! # The argument is required !
@ -2310,22 +2310,20 @@ def _parse_action_args_in_yunohost_format(args, action_args):
raise YunohostError('pattern_password_app', forbidden_chars=forbidden_chars) raise YunohostError('pattern_password_app', forbidden_chars=forbidden_chars)
from yunohost.utils.password import assert_password_is_strong_enough from yunohost.utils.password import assert_password_is_strong_enough
assert_password_is_strong_enough('user', arg_value) assert_password_is_strong_enough('user', arg_value)
args_dict[arg_name] = arg_value args_dict[arg_name] = (arg_value, arg_type)
# END loop over action_args... # END loop over action_args...
# If there's only one "domain" and "path", validate that domain/path # If there's only one "domain" and "path", validate that domain/path
# is an available url and normalize the path. # is an available url and normalize the path.
domain_args = [arg["name"] for arg in action_args domain_args = [ (name, value[0]) for name, value in args_dict.items() if value[1] == "domain" ]
if arg.get("type", "string") == "domain"] path_args = [ (name, value[0]) for name, value in args_dict.items() if value[1] == "path" ]
path_args = [arg["name"] for arg in action_args
if arg.get("type", "string") == "path"]
if len(domain_args) == 1 and len(path_args) == 1: if len(domain_args) == 1 and len(path_args) == 1:
domain = args_dict[domain_args[0]] domain = domain_args[0][1]
path = args_dict[path_args[0]] path = path_args[0][1]
domain, path = _normalize_domain_path(domain, path) domain, path = _normalize_domain_path(domain, path)
# Check the url is available # Check the url is available
@ -2344,7 +2342,7 @@ def _parse_action_args_in_yunohost_format(args, action_args):
# (We save this normalized path so that the install script have a # (We save this normalized path so that the install script have a
# standard path format to deal with no matter what the user inputted) # standard path format to deal with no matter what the user inputted)
args_dict[path_args[0]] = path args_dict[path_args[0][0]] = (path, "path")
return args_dict return args_dict
@ -2359,8 +2357,8 @@ def _make_environment_dict(args_dict, prefix="APP_ARG_"):
""" """
env_dict = {} env_dict = {}
for arg_name, arg_value in args_dict.items(): for arg_name, arg_value_and_type in args_dict.items():
env_dict["YNH_%s%s" % (prefix, arg_name.upper())] = arg_value env_dict["YNH_%s%s" % (prefix, arg_name.upper())] = arg_value_and_type[0]
return env_dict return env_dict