TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-11 18:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup progress bar creation special cases

Browse Source
This commit is contained in:
Michael Eischer
2025-09-13 23:07:25 +02:00
parent b0eef4b965
commit 8b5dbc18ca
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/restic/cmd_recover.go
View File

@@ -87,7 +87,8 @@ func runRecover(ctx context.Context, gopts GlobalOptions, term *termstatus.Termi
} }
printer.P("load %d trees\n", len(trees)) printer.P("load %d trees\n", len(trees))
bar = newTerminalProgressMax(!gopts.Quiet, uint64(len(trees)), "trees loaded", term) bar = printer.NewCounter("trees loaded")
bar.SetMax(uint64(len(trees)))
for id := range trees { for id := range trees {
tree, err := restic.LoadTree(ctx, repo, id) tree, err := restic.LoadTree(ctx, repo, id)
if ctx.Err() != nil { if ctx.Err() != nil {

3
cmd/restic/cmd_restore.go
View File

@@ -10,7 +10,6 @@ import (
"github.com/restic/restic/internal/filter" "github.com/restic/restic/internal/filter"
"github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/restic"
"github.com/restic/restic/internal/restorer" "github.com/restic/restic/internal/restorer"
"github.com/restic/restic/internal/terminal"
restoreui "github.com/restic/restic/internal/ui/restore" restoreui "github.com/restic/restic/internal/ui/restore"
"github.com/restic/restic/internal/ui/termstatus" "github.com/restic/restic/internal/ui/termstatus"
@@ -260,7 +259,7 @@ func runRestore(ctx context.Context, opts RestoreOptions, gopts GlobalOptions,
} }
var count int var count int
t0 := time.Now() t0 := time.Now()
bar := newTerminalProgressMax(!gopts.Quiet && !gopts.JSON && terminal.StdoutIsTerminal(), 0, "files verified", term) bar := msg.NewCounterTerminalOnly("files verified")
count, err = res.VerifyFiles(ctx, opts.Target, countRestoredFiles, bar) count, err = res.VerifyFiles(ctx, opts.Target, countRestoredFiles, bar)
if err != nil { if err != nil {
return err return err

7
cmd/restic/progress.go
View File

@@ -62,11 +62,6 @@ func newTerminalProgressMax(show bool, max uint64, description string, term *ter
}) })
} }
// newProgressMax calls newTerminalProgress without a terminal (print to stdout)
func newProgressMax(show bool, max uint64, description string) *progress.Counter {
return newGenericProgressMax(show, max, description, printProgress)
}
func printProgress(status string, final bool) { func printProgress(status string, final bool) {
canUpdateStatus := terminal.StdoutCanUpdateStatus() canUpdateStatus := terminal.StdoutCanUpdateStatus()
@@ -103,7 +98,7 @@ func printProgress(status string, final bool) {
} }
func newIndexProgress(quiet bool, json bool) *progress.Counter { func newIndexProgress(quiet bool, json bool) *progress.Counter {
return newProgressMax(!quiet && !json && terminal.StdoutIsTerminal(), 0, "index files loaded") return newGenericProgressMax(!quiet && !json && terminal.StdoutIsTerminal(), 0, "index files loaded", printProgress)
} }
type terminalProgressPrinter struct { type terminalProgressPrinter struct {