Cutieguwu/qmk_cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync milc with qmk_firmware

Browse Source
This commit is contained in:
skullY
2020-01-26 11:40:00 -08:00
parent ebea7f7ea0
commit bf502d26fa
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
milc.py
+22 -6
View File
@@ -178,8 +178,9 @@ class ConfigurationSection(Configuration):
def __getitem__(self, key):
"""Returns a config value, pulling from the `user` section as a fallback.
This is called when the attribute is accessed either via the get method or through [ ] index.
"""
if key in self._config:
if key in self._config and self._config.get(key) is not None:
return self._config[key]
elif key in self.parent.user:
@@ -187,6 +188,15 @@ class ConfigurationSection(Configuration):
return None
def __getattr__(self, key):
"""Returns the config value from the `user` section.
This is called when the attribute is accessed via dot notation but does not exists.
"""
if key in self.parent.user:
return self.parent.user[key]
return None
def handle_store_boolean(self, *args, **kwargs):
"""Does the add_argument for action='store_boolean'.
@@ -501,7 +511,10 @@ class MILC(object):
if argument not in self.arg_only:
# Find the argument's section
if self._entrypoint.__name__ in self.default_arguments and argument in self.default_arguments[self._entrypoint.__name__]:
# Underscores in command's names are converted to dashes during initialization.
# TODO(Erovia) Find a better solution
entrypoint_name = self._entrypoint.__name__.replace("_", "-")
if entrypoint_name in self.default_arguments and argument in self.default_arguments[entrypoint_name]:
argument_found = True
section = self._entrypoint.__name__
if argument in self.default_arguments['general']:
@@ -513,13 +526,16 @@ class MILC(object):
exit(1)
# Merge this argument into self.config
if argument in self.default_arguments:
if argument in self.default_arguments['general'] or argument in self.default_arguments[entrypoint_name]:
arg_value = getattr(self.args, argument)
if arg_value:
if arg_value is not None:
self.config[section][argument] = arg_value
else:
if argument not in self.config[section]:
self.config[section][argument] = getattr(self.args, argument)
if argument not in self.config[entrypoint_name]:
# Check if the argument exist for this section
arg = getattr(self.args, argument)
if arg is not None:
self.config[section][argument] = arg
self.release_lock()