psw/norgbackup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some command line fixes

Browse source
This commit is contained in:
Paul Wilde 2024-08-27 20:36:43 +01:00
parent 708f452e9b
commit 874b4362c8
3 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
norg/borg/prune.nim
View file

@ -1,7 +1,11 @@
import strformat
import ../model/config_type import ../model/config_type
import execute import execute
proc addPruneOptions*(cmd: var string, maintenance: Maintenance) =
cmd = fmt"""{cmd} --keep-hourly {maintenance.keep_hourly} --keep-daily {maintenance.keep_daily} --keep-weekly {maintenance.keep_weekly} --keep-monthly {maintenance.keep_monthly} --keep-yearly {maintenance.keep_yearly} """
proc pruneRepo*(nc: NorgConfig, repo: Repository): int = proc pruneRepo*(nc: NorgConfig, repo: Repository): int =
var cmd = genCommand(cmd = "prune", repo = repo.path, further_args = nc.args.further_args) var cmd = genCommand(cmd = "prune", repo = repo.path, further_args = nc.args.further_args)
cmd.addPruneOptions(nc.maintenance) cmd.addPruneOptions(nc.maintenance)

9
norg/restic/execute.nim
View file

@ -31,12 +31,5 @@ proc genForgetCommand*(repo: string, archive: string, further_args: seq[string])
proc genPruneCommand*(repo: string, further_args: seq[string], maintenance: Maintenance): string = proc genPruneCommand*(repo: string, further_args: seq[string], maintenance: Maintenance): string =
let args = further_args.join(" ") let args = further_args.join(" ")
let cmd = fmt"""{RESTIC_BIN} forget --prune \ let cmd = fmt"""{RESTIC_BIN} forget --prune --keep-hourly {maintenance.keep_hourly} --keep-daily {maintenance.keep_daily} --keep-weekly {maintenance.keep_weekly} --keep-monthly {maintenance.keep_monthly} --keep-yearly {maintenance.keep_yearly} -r {repo} {args}"""
--keep-hourly {maintenance.keep_hourly} \
--keep-daily {maintenance.keep_daily} \
--keep-weekly {maintenance.keep_weekly} \
--keep-monthly {maintenance.keep_monthly} \
--keep-yearly {maintenance.keep_yearly} \
-r {repo} {args}
"""
return cmd return cmd

8
norg/utils/run.nim
View file

@ -21,11 +21,3 @@ proc runDiscard*(cmd: string): int =
echo getCurrentExceptionMsg() echo getCurrentExceptionMsg()
return 1 return 1
proc addPruneOptions*(cmd: var string, maintenance: Maintenance) =
cmd = fmt"""{cmd} \
--keep-hourly {maintenance.keep_hourly} \
--keep-daily {maintenance.keep_daily} \
--keep-weekly {maintenance.keep_weekly} \
--keep-monthly {maintenance.keep_monthly} \
--keep-yearly {maintenance.keep_yearly} \
"""