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

WIP: Make tree object inheritance visible

Browse source
This commit is contained in:
Orsiris de Jong 2024-02-02 19:34:52 +01:00
parent e1f06464b8
commit 8c00ef919d
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
npbackup/configuration.py
View file

@ -26,7 +26,7 @@ import re
import platform import platform
from cryptidy import symmetric_encryption as enc from cryptidy import symmetric_encryption as enc
from ofunctions.random import random_string from ofunctions.random import random_string
from ofunctions.misc import replace_in_iterable, BytesConverter from ofunctions.misc import replace_in_iterable, BytesConverter, iter_over_keys
from npbackup.customization import ID_STRING from npbackup.customization import ID_STRING
@ -501,7 +501,12 @@ def get_repo_config(
else: else:
merged_lists = _group_config.g(key) merged_lists = _group_config.g(key)
_repo_config.s(key, merged_lists) _repo_config.s(key, merged_lists)
_config_inheritance.s(key, True) _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:
# repo_config may or may not already contain data # repo_config may or may not already contain data
if not _repo_config: if not _repo_config:
@ -600,6 +605,16 @@ def load_config(config_file: Path) -> Optional[dict]:
return None return None
config_file_is_updated = False config_file_is_updated = False
# Make sure we expand every key that should be a list into a list
# We'll use iter_over_keys instead of replace_in_iterable to avoid chaning list contents by lists
def _make_list(key: str, value: Union[str, int, float, dict, list]) -> Any:
if key in ("paths", "tags", "env_variables", "encrypted_env_variables"):
if not isinstance(value, list):
value = [value]
pass
return value
iter_over_keys(full_config, _make_list)
# Check if we need to encrypt some variables # Check if we need to encrypt some variables
if not is_encrypted(full_config): if not is_encrypted(full_config):
logger.info("Encrypting non encrypted data in configuration file") logger.info("Encrypting non encrypted data in configuration file")