parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

config.py: config set: convert to correct type using click

Browse source
This commit is contained in:
InsanePrawn 2021-10-24 06:35:41 +02:00
parent 34a992b5a0
commit 482fa38954
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
config.py
View file

@ -334,6 +334,18 @@ class ConfigStateHolder:
self.invalidate_profile_cache() self.invalidate_profile_cache()
def list_to_comma_str(str_list: list[str], default='') -> str:
if str_list is None:
return default
return ','.join(str_list)
def comma_str_to_list(s: str, default=None) -> list[str]:
if not s:
return default
return [a for a in s.split(',') if a]
def prompt_config( def prompt_config(
text: str, text: str,
default: any, default: any,
@ -351,16 +363,6 @@ def prompt_config(
zero = 0 # compiler complains about 'is with literal' otherwise zero = 0 # compiler complains about 'is with literal' otherwise
return to_check or to_check is zero # can't do == due to boolean<->int casting return to_check or to_check is zero # can't do == due to boolean<->int casting
def list_to_comma_str(str_list: list[str], default='') -> str:
if str_list is None:
return default
return ','.join(str_list)
def comma_str_to_list(s: str, default=None) -> list[str]:
if not s:
return default
return [a for a in s.split(',') if a]
if type(None) == field_type: if type(None) == field_type:
field_type = str field_type = str
@ -504,13 +506,19 @@ def cmd_config_set(key_vals: list[str], non_interactive: bool = False, noop: boo
split_pair = pair.split('=') split_pair = pair.split('=')
if len(split_pair) == 2: if len(split_pair) == 2:
key, value = split_pair key, value = split_pair
value_type = type(config_dot_name_get(key, CONFIG_DEFAULTS))
if value_type != list:
value = click.types.convert_type(value_type)(value)
else:
value = comma_str_to_list(value, default=[])
elif len(split_pair) == 1 and not non_interactive: elif len(split_pair) == 1 and not non_interactive:
key = split_pair[0] key = split_pair[0]
value_type = type(config_dot_name_get(key, CONFIG_DEFAULTS)) value_type = type(config_dot_name_get(key, CONFIG_DEFAULTS))
current = config_dot_name_get(key, config.file) current = config_dot_name_get(key, config.file)
value, _ = prompt_config(text=key, default=current, field_type=value_type) value, _ = prompt_config(text=key, default=current, field_type=value_type, echo_changes=False)
else: else:
raise Exception(f'Invalid key=value pair "{pair}"') raise Exception(f'Invalid key=value pair "{pair}"')
print('%s = %s' % (key, value))
config_dot_name_set(key, value, config_copy) config_dot_name_set(key, value, config_copy)
if merge_configs(config_copy, warn_missing_defaultprofile=False) != config_copy: if merge_configs(config_copy, warn_missing_defaultprofile=False) != config_copy:
raise Exception('Config "{key}" = "{value}" failed to evaluate') raise Exception('Config "{key}" = "{value}" failed to evaluate')
@ -529,7 +537,7 @@ def cmd_config_get(keys: list[str]):
print(config_dot_name_get(keys[0], config.file)) print(config_dot_name_get(keys[0], config.file))
return return
for key in keys: for key in keys:
print('%s = %s', key, config_dot_name_get(key, config.file)) print('%s = %s' % (key, config_dot_name_get(key, config.file)))
@cmd_config.group(name='profile') @cmd_config.group(name='profile')