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

Moved additional parameters to repo_opts

Browse source
This commit is contained in:
deajan 2025-02-12 11:42:32 +01:00
parent 08b09932a4
commit c814a90394
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
npbackup/configuration.py
View file

@ -179,7 +179,6 @@ empty_config_dict = {
], ],
"exclude_patterns": None, "exclude_patterns": None,
"exclude_files_larger_than": None, "exclude_files_larger_than": None,
"additional_parameters": None,
"additional_backup_only_parameters": None, "additional_backup_only_parameters": None,
"minimum_backup_size_error": "10 MiB", # allows BytesConverter units "minimum_backup_size_error": "10 MiB", # allows BytesConverter units
"pre_exec_commands": [], "pre_exec_commands": [],
@ -215,6 +214,7 @@ empty_config_dict = {
}, },
# "prune_max_unused": None, # TODO # "prune_max_unused": None, # TODO
# "prune_max_repack_size": None, # TODO # "prune_max_repack_size": None, # TODO
"additional_parameters": None,
}, },
"prometheus": { "prometheus": {
"backup_job": "${MACHINE_ID}", "backup_job": "${MACHINE_ID}",

30
npbackup/core/runner.py
View file

@ -823,15 +823,22 @@ class NPBackupRunner:
self.write_logs("Bogus ignore_cloud_files value given", level="warning") self.write_logs("Bogus ignore_cloud_files value given", level="warning")
try: try:
if self.repo_config.g("backup_opts.additional_parameters"): if self.repo_config.g("repo_opts.additional_parameters"):
self.restic_runner.additional_parameters = self.repo_config.g( self.restic_runner.additional_parameters = self.repo_config.g(
"backup_opts.additional_parameters" "repo_opts.additional_parameters"
) )
try: try:
self.restic_runner.additional_parameters = os.path.expanduser(self.restic_runner.additional_parameters) self.restic_runner.additional_parameters = os.path.expanduser(
self.restic_runner.additional_parameters = os.path.expandvars(self.restic_runner.additional_parameters) self.restic_runner.additional_parameters
)
self.restic_runner.additional_parameters = os.path.expandvars(
self.restic_runner.additional_parameters
)
except OSError: except OSError:
self.write_logs(f"Failed expansion for additional parameters: {self.restic_runner.additional_parameters}", level="error") self.write_logs(
f"Failed expansion for additional parameters: {self.restic_runner.additional_parameters}",
level="error",
)
except KeyError: except KeyError:
pass pass
except ValueError: except ValueError:
@ -1201,10 +1208,17 @@ class NPBackupRunner:
"backup_opts.additional_backup_only_parameters" "backup_opts.additional_backup_only_parameters"
) )
try: try:
additional_backup_only_parameters = os.path.expanduser(additional_backup_only_parameters) additional_backup_only_parameters = os.path.expanduser(
additional_backup_only_parameters = os.path.expandvars(additional_backup_only_parameters) additional_backup_only_parameters
)
additional_backup_only_parameters = os.path.expandvars(
additional_backup_only_parameters
)
except OSError: except OSError:
self.write_logs(f"Failed expansion for additional backup parameters: {additional_backup_only_parameters}", level="error") self.write_logs(
f"Failed expansion for additional backup parameters: {additional_backup_only_parameters}",
level="error",
)
except KeyError: except KeyError:
pass pass
except ValueError: except ValueError:

4
npbackup/gui/config.py
View file

@ -1803,11 +1803,11 @@ Google Cloud storage: GOOGLE_PROJECT_ID GOOGLE_APPLICATION_CREDENTIALS\n\
[ [
sg.Image( sg.Image(
NON_INHERITED_ICON, NON_INHERITED_ICON,
key="inherited.backup_opts.additional_parameters", key="inherited.repo_opts.additional_parameters",
tooltip=_t("config_gui.group_inherited"), tooltip=_t("config_gui.group_inherited"),
pad=1, pad=1,
), ),
sg.Input(key="backup_opts.additional_parameters", size=(100, 1)), sg.Input(key="repo_opts.additional_parameters", size=(100, 1)),
], ],
] ]