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

Simplify inheritance parser

Browse source
This commit is contained in:
Orsiris de Jong 2024-02-25 18:23:38 +01:00
parent 466b3cca8b
commit a65e4d6a6d
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
npbackup/configuration.py
View file

@ -487,7 +487,7 @@ def get_repo_config(
if isinstance(value, dict):
__repo_config, __config_inheritance = _inherit_group_settings(
_repo_config.g(key),
_group_config.g(key),
value,
_config_inheritance.g(key),
)
_repo_config.s(key, __repo_config)
@ -495,12 +495,12 @@ def get_repo_config(
elif isinstance(value, list):
if isinstance(_repo_config.g(key), list):
merged_lists = _repo_config.g(key) + _group_config.g(key)
merged_lists = _repo_config.g(key) + value
# Case where repo config already contains non list info but group config has list
elif _repo_config.g(key):
merged_lists = [_repo_config.g(key)] + _group_config.g(key)
merged_lists = [_repo_config.g(key)] + value
else:
merged_lists = _group_config.g(key)
merged_lists = value
# Special case when merged lists contain multiple dicts, we'll need to merge dicts
# unless lists have other object types than dicts
@ -517,7 +517,7 @@ def get_repo_config(
_repo_config.s(key, merged_lists)
_config_inheritance.s(key, {})
for v in merged_lists:
_grp_conf = _group_config.g(key)
_grp_conf = value
# Make sure we test inheritance against possible lists
if not isinstance(_grp_conf, list):
_grp_conf = [_grp_conf]
@ -554,7 +554,7 @@ def get_repo_config(
_config_inheritance.s(key, {})
for v in merged_lists:
_grp_conf = _group_config.g(key)
_grp_conf = value
# Make sure we test inheritance against possible lists
if not isinstance(_grp_conf, list):
_grp_conf = [_grp_conf]
@ -594,6 +594,7 @@ def get_repo_config(
if eval_variables:
repo_config = evaluate_variables(repo_config, full_config)
repo_config = expand_units(repo_config, unexpand=True)
return repo_config, config_inheritance