From 739d11c2eba4f85e66254e0daadde9c9300a22c7 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sat, 6 Apr 2024 00:11:27 +0200 Subject: [PATCH] forget: replace usage of DeleteFilesChecked This simplifies refactoring prune into the repository package. --- cmd/restic/cmd_forget.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cmd/restic/cmd_forget.go b/cmd/restic/cmd_forget.go index d634576c0..080b17472 100644 --- a/cmd/restic/cmd_forget.go +++ b/cmd/restic/cmd_forget.go @@ -267,7 +267,17 @@ func runForget(ctx context.Context, opts ForgetOptions, pruneOptions PruneOption if len(removeSnIDs) > 0 { if !opts.DryRun { - err := DeleteFilesChecked(ctx, gopts, repo, removeSnIDs, restic.SnapshotFile) + bar := newProgressMax(!gopts.JSON && !gopts.Quiet, 0, "files deleted") + err := restic.ParallelRemove(ctx, repo, removeSnIDs, restic.SnapshotFile, func(id restic.ID, err error) error { + if err != nil { + Warnf("unable to remove %v/%v from the repository\n", restic.SnapshotFile, id) + } + if !gopts.JSON && gopts.verbosity > 2 { + Verbosef("removed %v/%v\n", restic.SnapshotFile, id) + } + return nil + }, bar) + bar.Done() if err != nil { return err }