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

Split words with '-' in action name

Browse source
This commit is contained in:
Jerome Lebleu 2013-12-14 15:53:06 +01:00
parent bb027cd421
commit 2f0a08bc98
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
action_map.yml
View file

@ -538,9 +538,9 @@ monitor:
action: store_true action: store_true
### monitor_updatestats() ### monitor_updatestats()
updatestats: update-stats:
action_help: Update monitoring statistics action_help: Update monitoring statistics
api: POST /monitor/updatestats api: POST /monitor/update-stats
arguments: arguments:
period: period:
help: Time period to update help: Time period to update
@ -550,9 +550,9 @@ monitor:
- month - month
### monitor_showstats() ### monitor_showstats()
showstats: show-stats:
action_help: Show monitoring statistics action_help: Show monitoring statistics
api: GET /monitor/showstats api: GET /monitor/show-stats
arguments: arguments:
period: period:
help: Time period to show help: Time period to show

2
yunohost.py
View file

@ -490,7 +490,7 @@ def parse_dict(action_map):
# Set the action s related function # Set the action s related function
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.replace('-', '_')))
# Add arguments # Add arguments
if 'arguments' in action_params: if 'arguments' in action_params:
for arg_name, arg_params in action_params['arguments'].items(): for arg_name, arg_params in action_params['arguments'].items():

2
yunohost.tac
View file

@ -244,7 +244,7 @@ def main():
api.register(method, path, http_exec) api.register(method, path, http_exec)
api.register('OPTIONS', path, http_exec) api.register('OPTIONS', path, http_exec)
action_dict[action_params['api']] = { action_dict[action_params['api']] = {
'function': 'yunohost_'+ category +'.'+ category +'_'+ action, 'function': 'yunohost_'+ category +'.'+ category +'_'+ action.replace('-', '_'),
'help' : action_params['action_help'] 'help' : action_params['action_help']
} }
if 'arguments' in action_params: if 'arguments' in action_params:

4
yunohost_monitor.py
View file

@ -234,7 +234,7 @@ def monitor_system(units=None, human_readable=False):
return result return result
def monitor_updatestats(period): def monitor_update_stats(period):
""" """
Update monitoring statistics Update monitoring statistics
@ -317,7 +317,7 @@ def monitor_updatestats(period):
_save_stats(stats, period) _save_stats(stats, period)
def monitor_showstats(period, date=None): def monitor_show_stats(period, date=None):
""" """
Show monitoring statistics Show monitoring statistics