netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-10-20 02:17:20 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add a dict for inheritance of merged lists

Browse source
This commit is contained in:
Orsiris de Jong 2024-02-10 11:21:41 +01:00
parent 26c084bdfe
commit 83d452d426
1 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
npbackup/configuration.py
View file

@ -466,6 +466,7 @@ def get_repo_config(
""" """
iter over group settings, update repo_config, and produce an identical version of repo_config iter over group settings, update repo_config, and produce an identical version of repo_config
called config_inheritance, where every value is replaced with a boolean which states inheritance status called config_inheritance, where every value is replaced with a boolean which states inheritance status
When lists are encountered, merge the lists, but product a dict in config_inheritance with list values: inheritance_bool
""" """
_repo_config = deepcopy(repo_config) _repo_config = deepcopy(repo_config)
_group_config = deepcopy(group_config) _group_config = deepcopy(group_config)
@ -489,17 +490,27 @@ def get_repo_config(
_repo_config.s(key, __repo_config) _repo_config.s(key, __repo_config)
_config_inheritance.s(key, __config_inheritance) _config_inheritance.s(key, __config_inheritance)
elif isinstance(value, list): elif isinstance(value, list):
# TODO: Lists containing dicts won't be updated in repo_config here
# we need to have
# for elt in list:
# recurse into elt if elt is dict
if isinstance(_repo_config.g(key), list): if isinstance(_repo_config.g(key), list):
merged_lists = _repo_config.g(key) + _group_config.g(key) merged_lists = _repo_config.g(key) + _group_config.g(key)
# Case where repo config already contains non list info but group config has list # Case where repo config already contains non list info but group config has list
elif _repo_config.g(key): elif _repo_config.g(key):
merged_lists = [_repo_config.g(key)] + _group_config.g(key) merged_lists = [_repo_config.g(key)] + _group_config.g(key)
else: else:
merged_lists = _group_config.g(key) merged_lists = _group_config.g(key)
# Special case when merged lists contain multiple dicts, we'll need to merge dicts
# unless lists have other object types than dicts
merged_items_dict = {}
can_replace_merged_list = True
for list_elt in merged_lists:
if isinstance(list_elt, dict):
merged_items_dict.update(list_elt)
else:
can_replace_merged_list = False
if can_replace_merged_list:
merged_lists = merged_items_dict
_repo_config.s(key, merged_lists) _repo_config.s(key, merged_lists)
_config_inheritance.s(key, {}) _config_inheritance.s(key, {})
for v in merged_lists: for v in merged_lists:
@ -518,7 +529,27 @@ def get_repo_config(
# Case where repo_config contains list but group info has single str # Case where repo_config contains list but group info has single str
elif isinstance(_repo_config.g(key), list) and value: elif isinstance(_repo_config.g(key), list) and value:
merged_lists = _repo_config.g(key) + [value] merged_lists = _repo_config.g(key) + [value]
# Special case when merged lists contain multiple dicts, we'll need to merge dicts
# unless lists have other object types than dicts
merged_items_dict = {}
can_replace_merged_list = True
for list_elt in merged_lists:
if isinstance(list_elt, dict):
merged_items_dict.update(list_elt)
else:
can_replace_merged_list = False
if can_replace_merged_list:
merged_lists = merged_items_dict
_repo_config.s(key, merged_lists) _repo_config.s(key, merged_lists)
_config_inheritance.s(key, {})
for v in merged_lists:
if v in _group_config.g(key):
_config_inheritance.s(f"{key}.{v}", True)
else:
_config_inheritance.s(f"{key}.{v}", False)
else: else:
# In other cases, just keep repo confg # In other cases, just keep repo confg
_config_inheritance.s(key, False) _config_inheritance.s(key, False)