From b0a01ae68acbb5297037c28fa429d0d05f1dabac Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Thu, 18 May 2023 19:29:50 +0200 Subject: [PATCH] ui/backup: remove unused parameter from ProgressPrinter interface --- internal/ui/backup/json.go | 4 ++-- internal/ui/backup/progress.go | 18 +++++++++--------- internal/ui/backup/progress_test.go | 16 ++++++++-------- internal/ui/backup/text.go | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/internal/ui/backup/json.go b/internal/ui/backup/json.go index e736d0118..e7c9274a4 100644 --- a/internal/ui/backup/json.go +++ b/internal/ui/backup/json.go @@ -99,7 +99,7 @@ func (b *JSONProgress) Error(item string, err error) error { // CompleteItem is the status callback function for the archiver when a // file/dir has been saved successfully. -func (b *JSONProgress) CompleteItem(messageType, item string, previous, current *restic.Node, s archiver.ItemStats, d time.Duration) { +func (b *JSONProgress) CompleteItem(messageType, item string, s archiver.ItemStats, d time.Duration) { if b.v < 2 { return } @@ -161,7 +161,7 @@ func (b *JSONProgress) CompleteItem(messageType, item string, previous, current } // ReportTotal sets the total stats up to now -func (b *JSONProgress) ReportTotal(item string, start time.Time, s archiver.ScanStats) { +func (b *JSONProgress) ReportTotal(start time.Time, s archiver.ScanStats) { if b.v >= 2 { b.print(verboseUpdate{ MessageType: "verbose_status", diff --git a/internal/ui/backup/progress.go b/internal/ui/backup/progress.go index 720a2a58f..8e15662a6 100644 --- a/internal/ui/backup/progress.go +++ b/internal/ui/backup/progress.go @@ -15,8 +15,8 @@ type ProgressPrinter interface { Update(total, processed Counter, errors uint, currentFiles map[string]struct{}, start time.Time, secs uint64) Error(item string, err error) error ScannerError(item string, err error) error - CompleteItem(messageType string, item string, previous, current *restic.Node, s archiver.ItemStats, d time.Duration) - ReportTotal(item string, start time.Time, s archiver.ScanStats) + CompleteItem(messageType string, item string, s archiver.ItemStats, d time.Duration) + ReportTotal(start time.Time, s archiver.ScanStats) Finish(snapshotID restic.ID, start time.Time, summary *Summary, dryRun bool) Reset() @@ -144,19 +144,19 @@ func (p *Progress) CompleteItem(item string, previous, current *restic.Node, s a switch { case previous == nil: - p.printer.CompleteItem("dir new", item, previous, current, s, d) + p.printer.CompleteItem("dir new", item, s, d) p.mu.Lock() p.summary.Dirs.New++ p.mu.Unlock() case previous.Equals(*current): - p.printer.CompleteItem("dir unchanged", item, previous, current, s, d) + p.printer.CompleteItem("dir unchanged", item, s, d) p.mu.Lock() p.summary.Dirs.Unchanged++ p.mu.Unlock() default: - p.printer.CompleteItem("dir modified", item, previous, current, s, d) + p.printer.CompleteItem("dir modified", item, s, d) p.mu.Lock() p.summary.Dirs.Changed++ p.mu.Unlock() @@ -170,19 +170,19 @@ func (p *Progress) CompleteItem(item string, previous, current *restic.Node, s a switch { case previous == nil: - p.printer.CompleteItem("file new", item, previous, current, s, d) + p.printer.CompleteItem("file new", item, s, d) p.mu.Lock() p.summary.Files.New++ p.mu.Unlock() case previous.Equals(*current): - p.printer.CompleteItem("file unchanged", item, previous, current, s, d) + p.printer.CompleteItem("file unchanged", item, s, d) p.mu.Lock() p.summary.Files.Unchanged++ p.mu.Unlock() default: - p.printer.CompleteItem("file modified", item, previous, current, s, d) + p.printer.CompleteItem("file modified", item, s, d) p.mu.Lock() p.summary.Files.Changed++ p.mu.Unlock() @@ -200,7 +200,7 @@ func (p *Progress) ReportTotal(item string, s archiver.ScanStats) { if item == "" { p.scanFinished = true - p.printer.ReportTotal(item, p.start, s) + p.printer.ReportTotal(p.start, s) } } diff --git a/internal/ui/backup/progress_test.go b/internal/ui/backup/progress_test.go index a7282c7da..79a56c91e 100644 --- a/internal/ui/backup/progress_test.go +++ b/internal/ui/backup/progress_test.go @@ -15,12 +15,12 @@ type mockPrinter struct { id restic.ID } -func (p *mockPrinter) Update(total, processed Counter, errors uint, currentFiles map[string]struct{}, start time.Time, secs uint64) { +func (p *mockPrinter) Update(_, _ Counter, _ uint, _ map[string]struct{}, _ time.Time, _ uint64) { } -func (p *mockPrinter) Error(item string, err error) error { return err } -func (p *mockPrinter) ScannerError(item string, err error) error { return err } +func (p *mockPrinter) Error(_ string, err error) error { return err } +func (p *mockPrinter) ScannerError(_ string, err error) error { return err } -func (p *mockPrinter) CompleteItem(messageType string, item string, previous, current *restic.Node, s archiver.ItemStats, d time.Duration) { +func (p *mockPrinter) CompleteItem(messageType string, _ string, _ archiver.ItemStats, _ time.Duration) { p.Lock() defer p.Unlock() @@ -32,8 +32,8 @@ func (p *mockPrinter) CompleteItem(messageType string, item string, previous, cu } } -func (p *mockPrinter) ReportTotal(_ string, _ time.Time, _ archiver.ScanStats) {} -func (p *mockPrinter) Finish(id restic.ID, _ time.Time, summary *Summary, dryRun bool) { +func (p *mockPrinter) ReportTotal(_ time.Time, _ archiver.ScanStats) {} +func (p *mockPrinter) Finish(id restic.ID, _ time.Time, summary *Summary, _ bool) { p.Lock() defer p.Unlock() @@ -43,8 +43,8 @@ func (p *mockPrinter) Finish(id restic.ID, _ time.Time, summary *Summary, dryRun func (p *mockPrinter) Reset() {} -func (p *mockPrinter) P(msg string, args ...interface{}) {} -func (p *mockPrinter) V(msg string, args ...interface{}) {} +func (p *mockPrinter) P(_ string, _ ...interface{}) {} +func (p *mockPrinter) V(_ string, _ ...interface{}) {} func TestProgress(t *testing.T) { t.Parallel() diff --git a/internal/ui/backup/text.go b/internal/ui/backup/text.go index 553f559d4..215982cd4 100644 --- a/internal/ui/backup/text.go +++ b/internal/ui/backup/text.go @@ -85,7 +85,7 @@ func (b *TextProgress) Error(_ string, err error) error { // CompleteItem is the status callback function for the archiver when a // file/dir has been saved successfully. -func (b *TextProgress) CompleteItem(messageType, item string, previous, current *restic.Node, s archiver.ItemStats, d time.Duration) { +func (b *TextProgress) CompleteItem(messageType, item string, s archiver.ItemStats, d time.Duration) { item = termstatus.Quote(item) switch messageType { @@ -111,7 +111,7 @@ func (b *TextProgress) CompleteItem(messageType, item string, previous, current } // ReportTotal sets the total stats up to now -func (b *TextProgress) ReportTotal(item string, start time.Time, s archiver.ScanStats) { +func (b *TextProgress) ReportTotal(start time.Time, s archiver.ScanStats) { b.V("scan finished in %.3fs: %v files, %s", time.Since(start).Seconds(), s.Files, ui.FormatBytes(s.Bytes),