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

[mod] renaming, make method name match reality and had a method for code readability

Browse source
This commit is contained in:
Laurent Peuch 2017-07-23 04:16:12 +02:00
parent 79bb5b427f
commit 1caa172072
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
moulinette/actionsmap.py
View file

@ -603,9 +603,10 @@ class ActionsMap(object):
# Set the global configuration to use for the parser. # Set the global configuration to use for the parser.
top_parser.set_global_conf(_global['configuration']) top_parser.set_global_conf(_global['configuration'])
# GLOBAL_SECTION = '_global' if top_parser.has_global_parser():
_add_arguments(GLOBAL_SECTION, top_parser.add_global_parser(), # GLOBAL_SECTION = '_global'
_global['arguments']) _add_arguments(GLOBAL_SECTION, top_parser.get_global_parser(),
_global['arguments'])
# category_name is stuff like "user", "domain", "hooks"... # category_name is stuff like "user", "domain", "hooks"...
# category_values is the values of this category (like actions) # category_values is the values of this category (like actions)

3
moulinette/interfaces/__init__.py
View file

@ -72,6 +72,9 @@ class BaseActionsMapParser(object):
raise NotImplementedError("derived class '%s' must override this method" % raise NotImplementedError("derived class '%s' must override this method" %
self.__class__.__name__) self.__class__.__name__)
def has_global_parser(self):
return False
def add_global_parser(self, **kwargs): def add_global_parser(self, **kwargs):
"""Add a parser for global arguments """Add a parser for global arguments

2
moulinette/interfaces/api.py
View file

@ -548,7 +548,7 @@ class ActionsMapParser(BaseActionsMapParser):
return [name.replace('--', '@', 1)] return [name.replace('--', '@', 1)]
return [name.replace('-', '@', 1)] return [name.replace('-', '@', 1)]
def add_global_parser(self, **kwargs): def get_global_parser(self, **kwargs):
raise AttributeError("global arguments are not managed") raise AttributeError("global arguments are not managed")
def add_category_parser(self, name, **kwargs): def add_category_parser(self, name, **kwargs):

7
moulinette/interfaces/cli.py
View file

@ -235,7 +235,7 @@ class ActionsMapParser(BaseActionsMapParser):
if top_parser: if top_parser:
# Append each top parser action to the global group # Append each top parser action to the global group
glob = self.add_global_parser() glob = self.get_global_parser()
for action in top_parser._actions: for action in top_parser._actions:
action.dest = SUPPRESS action.dest = SUPPRESS
glob._add_action(action) glob._add_action(action)
@ -252,7 +252,10 @@ class ActionsMapParser(BaseActionsMapParser):
return [name, full] return [name, full]
return [name] return [name]
def add_global_parser(self, **kwargs): def has_global_parser(self):
return True
def get_global_parser(self, **kwargs):
if not self._global_parser: if not self._global_parser:
self._global_parser = self._parser.add_argument_group( self._global_parser = self._parser.add_argument_group(
"global arguments") "global arguments")