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

[enh] Add support for app argument 'type' defined in the manifest

Browse source
This commit is contained in:
Jérôme Lebleu 2015-12-28 19:58:21 +01:00
parent 5fd2cf6667
commit 096c4d0246
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/en.json
View file

@ -29,6 +29,7 @@
"app_extraction_failed" : "Unable to extract installation files", "app_extraction_failed" : "Unable to extract installation files",
"app_install_files_invalid" : "Invalid installation files", "app_install_files_invalid" : "Invalid installation files",
"app_manifest_invalid" : "Invalid app manifest", "app_manifest_invalid" : "Invalid app manifest",
"app_argument_invalid" : "Invalid value for argument '{name:s}': {error:s}",
"app_sources_fetch_failed" : "Unable to fetch sources files", "app_sources_fetch_failed" : "Unable to fetch sources files",
"ssowat_conf_updated" : "SSOwat persistent configuration successfully updated", "ssowat_conf_updated" : "SSOwat persistent configuration successfully updated",
"ssowat_conf_generated" : "SSOwat configuration successfully generated", "ssowat_conf_generated" : "SSOwat configuration successfully generated",

44
src/yunohost/app.py
View file

@ -359,7 +359,7 @@ def app_upgrade(auth, 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_list = _parse_args_from_manifest(manifest, 'upgrade') args_list = _parse_args_from_manifest(manifest, 'upgrade', auth=auth)
args_list.append(app_id) args_list.append(app_id)
# Execute App upgrade script # Execute App upgrade script
@ -474,7 +474,7 @@ def app_install(auth, app, label=None, args=None):
# Retrieve arguments list for install script # Retrieve arguments list for install script
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_list = _parse_args_from_manifest(manifest, 'install', args_dict) args_list = _parse_args_from_manifest(manifest, 'install', args_dict, auth)
args_list.append(app_id) args_list.append(app_id)
# Execute App install script # Execute App install script
@ -1295,7 +1295,7 @@ def _encode_string(value):
return value return value
def _parse_args_from_manifest(manifest, action, args={}): def _parse_args_from_manifest(manifest, action, args={}, auth=None):
"""Parse arguments needed for an action from the manifest """Parse arguments needed for an action from the manifest
Retrieve specified arguments for the action from the manifest, and parse Retrieve specified arguments for the action from the manifest, and parse
@ -1310,6 +1310,9 @@ def _parse_args_from_manifest(manifest, action, args={}):
args -- A dictionnary of arguments to parse args -- A dictionnary of arguments to parse
""" """
from yunohost.domain import domain_list
from yunohost.user import user_info
args_list = [] args_list = []
try: try:
action_args = manifest['arguments'][action] action_args = manifest['arguments'][action]
@ -1317,11 +1320,14 @@ def _parse_args_from_manifest(manifest, action, args={}):
logger.debug("no arguments found for '%s' in '%s'", action, path) logger.debug("no arguments found for '%s' in '%s'", action, path)
else: else:
for arg in action_args: for arg in action_args:
arg_value = None
# Attempt to retrieve argument value
if arg['name'] in args: if arg['name'] in args:
if 'choices' in arg and args[arg['name']] not in arg['choices']: if 'choices' in arg and args[arg['name']] not in arg['choices']:
raise MoulinetteError(errno.EINVAL, raise MoulinetteError(errno.EINVAL,
m18n.n('hook_choice_invalid', args[arg['name']])) m18n.n('hook_choice_invalid', args[arg['name']]))
args_list.append(args[arg['name']]) arg_value = args[arg['name']]
else: else:
if os.isatty(1) and 'ask' in arg: if os.isatty(1) and 'ask' in arg:
# Retrieve proper ask string # Retrieve proper ask string
@ -1335,14 +1341,36 @@ def _parse_args_from_manifest(manifest, action, args={}):
input_string = msignals.prompt(ask_string) input_string = msignals.prompt(ask_string)
if not input_string and 'default' in arg: if not input_string and 'default' in arg:
input_string = arg['default'] arg_value = arg['default']
else:
args_list.append(input_string) arg_value = input_string
elif 'default' in arg: elif 'default' in arg:
args_list.append(arg['default']) arg_value = arg['default']
else: else:
raise MoulinetteError(errno.EINVAL, raise MoulinetteError(errno.EINVAL,
m18n.n('hook_argument_missing', arg['name'])) m18n.n('hook_argument_missing', arg['name']))
# Validate argument value
# TODO: Add more type, e.g. boolean
arg_type = arg.get('type', 'string')
if arg_type == 'domain':
if arg_value not in domain_list(auth)['domains']:
raise MoulinetteError(errno.EINVAL,
m18n.n('app_argument_invalid',
name=arg['name'], error=m18n.n('domain_unknown')))
elif arg_type == 'user':
try:
user_info(auth, arg_value)
except MoulinetteError as e:
raise MoulinetteError(errno.EINVAL,
m18n.n('app_argument_invalid',
name=arg['name'], error=e.strerror))
elif arg_type == 'app':
if not _is_installed(arg_value):
raise MoulinetteError(errno.EINVAL,
m18n.n('app_argument_invalid',
name=arg['name'], error=m18n.n('app_unknown')))
args_list.append(arg_value)
return args_list return args_list