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

Better argument input handling

Browse source
This commit is contained in:
kload 2013-12-06 18:52:26 +00:00
parent 346f9afb5b
commit 8656487cc3
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
yunohost_hook.py
View file

@ -100,14 +100,19 @@ def hook_exec(file, args=None):
arg_list = [] arg_list = []
for arg in required_args: for arg in required_args:
if arg['name'] in args: if arg['name'] in args:
if 'choices' in arg and args[arg['name']] not in arg['choices'].split('|'): if 'choices' in arg and args[arg['name']] not in arg['choices']:
raise YunoHostError(22, _("Invalid choice") + ': ' + args[arg['name']]) raise YunoHostError(22, _("Invalid choice") + ': ' + args[arg['name']])
arg_list.append(args[arg['name']]) arg_list.append(args[arg['name']])
else: else:
if os.isatty(1) and 'ask' in arg:
ask_string = arg['ask']['en'] #TODO: I18n
if 'choices' in arg:
ask_string = ask_string +' ('+ '|'.join(arg['choices']) +')'
if 'default' in arg: if 'default' in arg:
ask_string = ask_string +' (default: '+ arg['default'] +')'
arg_list.append(raw_input(colorize(ask_string + ': ', 'cyan')))
elif 'default' in arg:
arg_list.append(arg['default']) arg_list.append(arg['default'])
elif os.isatty(1) and 'ask' in arg:
arg_list.append(raw_input(colorize(arg['ask']['en'] + ': ', 'cyan'))) #TODO: I18n
else: else:
raise YunoHostError(22, _("Missing arguments") + ': ' + arg['name']) raise YunoHostError(22, _("Missing arguments") + ': ' + arg['name'])