stove/rougail-user-data-environment
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleaning

Browse source
This commit is contained in:
gwen 2024-09-10 09:57:53 +02:00
parent fe86a214de
commit 17b17d3e23
1 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/rougail/user-data-environment/data.py
View file

@ -49,33 +49,13 @@ class RougailUserDataEnvironment:
else: else:
self.errors = [] self.errors = []
self.warnings = [] self.warnings = []
# this variable will be used for generating warnings # this variable will be used for generating warnings
# about unused ROUGAIL_ environment variables # about unused ROUGAIL_ environment variables
self.unused_environment_var = get_rougail_environment_var() self.unused_environment_var = get_rougail_environment_var()
def run(self): def run(self):
self.config.property.read_write() self.config.property.read_write()
if self.rougailconfig['environment.mandatory']: self.parse(self.config)
current_titles = []
while True:
mandatories = self.config.value.mandatory()
if not mandatories:
break
mandatory = mandatories[0]
path = mandatory.path()
if '.' in path:
current_config = self.config
for idx, p in enumerate(path.split('.')[0:-1]):
current_config = current_config.option(p)
if idx < len(current_titles):
if current_titles[idx] == p:
continue
current_titles = current_titles[0:idx]
current_titles.append(p)
self.print(current_config.description(), idx)
self.display_environment(mandatory)
else:
self.parse(self.config)
self.config.property.read_only() self.config.property.read_only()
# if there are unused environment variables # if there are unused environment variables
if len(self.unused_environment_var): if len(self.unused_environment_var):
@ -96,14 +76,14 @@ class RougailUserDataEnvironment:
# here we retrieve the conversion func of the considered type # here we retrieve the conversion func of the considered type
# carefull, it could be None -> in this case, do nothing # carefull, it could be None -> in this case, do nothing
type_obj = CONVERT_OPTION.get(option_type, {}).get("func") type_obj = CONVERT_OPTION.get(option_type, {}).get("func")
# #
rougail_environment_var = get_rougail_environment_var() rougail_environment_var = get_rougail_environment_var()
option_name = option.path() option_name = option.path()
# this is used only for warning purposes # this is used only for warning purposes
self.unused_environment_var.remove(option_name) self.unused_environment_var.remove(option_name)
# let's parse the environment variables values # let's parse the environment variables values
if option_name in rougail_environment_var: if option_name in rougail_environment_var:
if ismulti: if ismulti:
option_bash_value = get_rougail_environment_dict()[option_name] option_bash_value = get_rougail_environment_dict()[option_name]
# here we expect the bash option value of a multi to be coma separated: # here we expect the bash option value of a multi to be coma separated:
option_value = option_bash_value.split(",") option_value = option_bash_value.split(",")