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

Merge dictionnaries

Browse source
This commit is contained in:
Kload 2012-10-10 11:10:57 +02:00
parent d30ef19b80
commit ae60fd1709
1 changed files with 54 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
yunohost
View file

@ -51,37 +51,56 @@ Example:
""" """
action_dict = { action_dict = {
'user' : { #############################
# User #
#############################
'user' : {
'help' : 'Manage users', 'help' : 'Manage users',
'actions' : { 'actions' : {
'list' : 'List users', ### user_list()
'add' : 'Create user', 'list' : {
#'update' : 'Update user informations', 'help' : 'List users',
#'delete' : 'Delete user', 'arguments' : {
#'info' : 'Show user informations' '-a' : {
} 'full' : '--all',
'help' : 'Display all users',
'action' : 'store_true'
},
}
},
### user_add()
'add' : {
'help' : 'Create user',
'arguments' : {
'-u' : {
'full' : '--username',
},
'-f' : {
'full' : '--firstname',
},
'-l' : {
'full' : '--lastname',
},
'-m' : {
'full' : '--mail',
},
'-p' : {
'full' : '--password',
},
}
},
}, },
'domain' : { 'domain' : {
'help' : 'Manage domains', 'help' : 'Manage domains',
'actions' : {
#'list' : 'List domains',
#'add' : 'Add domain',
#'remove' : 'Remove domain',
#'info' : 'Show domain informations',
#'renewcert' : 'Renew certificate for a domain'
}
}, },
'app' : { 'app' : {
'help' : 'Manage apps', 'help' : 'Manage apps',
'actions' : {}
}, },
'monitor' : { 'monitor' : {
'help' : 'Monitoring functions', 'help' : 'Monitoring functions',
'actions' : {}
}, },
'tools' : { 'tools' : {
'help' : 'Specific tools', 'help' : 'Specific tools',
'actions' : {}
} }
} }
@ -138,15 +157,15 @@ def parse_args(parsers):
return args return args
def dict_to_parsers(action_dict): def dict_to_args(action_dict):
""" """
Turn action dictionnary to parser and subparsers (2 level) Turn action dictionnary to parser, subparsers and arguments
Keyword arguments: Keyword arguments:
action_dict -- Multi-level dictionnary of categories/actions list action_dict -- Multi-level dictionnary of categories/actions/arguments list
Returns: Returns:
Dictionnrary of parsers Namespace of args
""" """
# Intialize parsers # Intialize parsers
@ -158,20 +177,28 @@ def dict_to_parsers(action_dict):
for category, info in action_dict.items(): for category, info in action_dict.items():
subparsers_category[category] = subparsers.add_parser(category, help=info['help']) subparsers_category[category] = subparsers.add_parser(category, help=info['help'])
subparsers_action[category] = subparsers_category[category].add_subparsers() subparsers_action[category] = subparsers_category[category].add_subparsers()
for action, helper in info['actions'].items(): for action, action_params in info['actions'].items():
parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help=helper) parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help=action_params['help'])
parsers[category + '_' + action].set_defaults( parsers[category + '_' + action].set_defaults(
func=str_to_func('yunohost_' + category + '.' func=str_to_func('yunohost_' + category + '.'
+ category + '_' + action)) + category + '_' + action))
# Argument parsing
for arg_name, arg_params in action_params['arguments'].items():
if arg_params['full']:
arg_fullname = arg_params['full']
del arg_params['full']
parsers[category + '_' + action].add_argument(arg_name, arg_fullname, **arg_params)
else:
parsers[category + '_' + action].add_argument(arg_name, **arg_params)
return parsers args = parsers['general'].parse_args()
return args
def main(): def main():
""" Main instructions """ """ Main instructions """
try: try:
parsers = dict_to_parsers(action_dict) args = dict_to_args(action_dict)
args = parse_args(parsers) #args = parse_args(parsers)
result = args.func(vars(args)) result = args.func(vars(args))
except YunoHostError, error: except YunoHostError, error:
if not __debug__ : if not __debug__ :