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

GUI: Preserve lists order when merging duplicates, fixes #127

Browse source
This commit is contained in:
deajan 2025-02-16 18:01:22 +01:00
parent 7fa1ea1322
commit 2fd8756924
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
npbackup/configuration.py
View file

@ -649,8 +649,8 @@ def get_repo_config(
if can_replace_merged_list: if can_replace_merged_list:
merged_lists = merged_items_dict merged_lists = merged_items_dict
# Make sure we avoid duplicates in lists # Make sure we avoid duplicates in lists while preserving order (do not use sets here)
merged_lists = list(set(merged_lists)) merged_lists = list(dict.fromkeys(merged_lists))
_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:
@ -698,8 +698,8 @@ def get_repo_config(
if can_replace_merged_list: if can_replace_merged_list:
merged_lists = merged_items_dict merged_lists = merged_items_dict
# Make sure we avoid duplicates in lists # Make sure we avoid duplicates in lists while preserving order (do not use sets here)
merged_lists = list(set(merged_lists)) merged_lists = list(dict.fromkeys(merged_lists))
_repo_config.s(key, merged_lists) _repo_config.s(key, merged_lists)
_config_inheritance.s(key, {}) _config_inheritance.s(key, {})
@ -766,12 +766,12 @@ def get_repo_config(
repo_group = full_config.g(f"repos.{repo_name}.repo_group") repo_group = full_config.g(f"repos.{repo_name}.repo_group")
group_config = full_config.g(f"groups.{repo_group}") group_config = full_config.g(f"groups.{repo_group}")
except KeyError: except KeyError:
logger.warning(f"Repo {repo_name} has no group") logger.error(f"Repo {repo_name} has no group, reset to default")
else: full_config.s(f"repos.{repo_name}.repo_group", "default_group")
repo_config.s("name", repo_name) group_config = full_config.g("groups.default_group")
repo_config, config_inheritance = inherit_group_settings(
repo_config, group_config repo_config.s("name", repo_name)
) repo_config, config_inheritance = inherit_group_settings(repo_config, group_config)
if eval_variables: if eval_variables:
repo_config = evaluate_variables(repo_config, full_config) repo_config = evaluate_variables(repo_config, full_config)