diff --git a/cmd/restic/cmd_forget.go b/cmd/restic/cmd_forget.go index 2075f3b61..7ad1aeb5f 100644 --- a/cmd/restic/cmd_forget.go +++ b/cmd/restic/cmd_forget.go @@ -188,14 +188,13 @@ func runForget(ctx context.Context, opts ForgetOptions, pruneOptions PruneOption return errors.Fatal("--no-lock is only applicable in combination with --dry-run for forget command") } + printer := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, opts.DryRun && gopts.NoLock) if err != nil { return err } defer unlock() - printer := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) - var snapshots restic.Snapshots removeSnIDs := restic.NewIDSet() diff --git a/cmd/restic/cmd_recover.go b/cmd/restic/cmd_recover.go index 7155f8618..8fdb157f8 100644 --- a/cmd/restic/cmd_recover.go +++ b/cmd/restic/cmd_recover.go @@ -49,14 +49,13 @@ func runRecover(ctx context.Context, gopts GlobalOptions, term *termstatus.Termi return err } + printer := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, false) if err != nil { return err } defer unlock() - printer := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) - snapshotLister, err := restic.MemorizeList(ctx, repo, restic.SnapshotFile) if err != nil { return err diff --git a/cmd/restic/cmd_repair_index.go b/cmd/restic/cmd_repair_index.go index 8d9da36fb..a4f230e05 100644 --- a/cmd/restic/cmd_repair_index.go +++ b/cmd/restic/cmd_repair_index.go @@ -73,14 +73,13 @@ func newRebuildIndexCommand() *cobra.Command { } func runRebuildIndex(ctx context.Context, opts RepairIndexOptions, gopts GlobalOptions, term *termstatus.Terminal) error { + printer := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, false) if err != nil { return err } defer unlock() - printer := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) - err = repository.RepairIndex(ctx, repo, repository.RepairIndexOptions{ ReadAllPacks: opts.ReadAllPacks, }, printer) diff --git a/cmd/restic/cmd_repair_packs.go b/cmd/restic/cmd_repair_packs.go index babe6789c..d6d57012f 100644 --- a/cmd/restic/cmd_repair_packs.go +++ b/cmd/restic/cmd_repair_packs.go @@ -53,14 +53,13 @@ func runRepairPacks(ctx context.Context, gopts GlobalOptions, term *termstatus.T return errors.Fatal("no ids specified") } + printer := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, false) if err != nil { return err } defer unlock() - printer := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) - bar := newIndexTerminalProgress(printer) err = repo.LoadIndex(ctx, bar) if err != nil { diff --git a/cmd/restic/cmd_restore.go b/cmd/restic/cmd_restore.go index 7a65602a6..2183bd874 100644 --- a/cmd/restic/cmd_restore.go +++ b/cmd/restic/cmd_restore.go @@ -91,6 +91,7 @@ func (opts *RestoreOptions) AddFlags(f *pflag.FlagSet) { func runRestore(ctx context.Context, opts RestoreOptions, gopts GlobalOptions, term *termstatus.Terminal, args []string) error { + msg := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) excludePatternFns, err := opts.ExcludePatternOptions.CollectPatterns(Warnf) if err != nil { return err @@ -146,7 +147,6 @@ func runRestore(ctx context.Context, opts RestoreOptions, gopts GlobalOptions, return errors.Fatalf("failed to find snapshot: %v", err) } - msg := newTerminalProgressPrinter(gopts.JSON, gopts.verbosity, term) bar := newIndexTerminalProgress(msg) err = repo.LoadIndex(ctx, bar) if err != nil {