clitools/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-07-01 08:30:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4829 from greatroar/termstatus

Browse Source 
termstatus: Do formatting in Message, not Terminal
This commit is contained in:
Michael Eischer 2024-05-30 11:57:44 +00:00 committed by GitHub
commit 7b4f81d964
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/ui/message.go
View File

@ -1,6 +1,10 @@
package ui
import "github.com/restic/restic/internal/ui/termstatus"
import (
"fmt"
"github.com/restic/restic/internal/ui/termstatus"
)
// Message reports progress with messages of different verbosity.
type Message struct {
@ -19,27 +23,27 @@ func NewMessage(term *termstatus.Terminal, verbosity uint) *Message {
// E reports an error
func (m *Message) E(msg string, args ...interface{}) {
m.term.Errorf(msg, args...)
m.term.Error(fmt.Sprintf(msg, args...))
}
// P prints a message if verbosity >= 1, this is used for normal messages which
// are not errors.
func (m *Message) P(msg string, args ...interface{}) {
if m.v >= 1 {
m.term.Printf(msg, args...)
m.term.Print(fmt.Sprintf(msg, args...))
}
}
// V prints a message if verbosity >= 2, this is used for verbose messages.
func (m *Message) V(msg string, args ...interface{}) {
if m.v >= 2 {
m.term.Printf(msg, args...)
m.term.Print(fmt.Sprintf(msg, args...))
}
}
// VV prints a message if verbosity >= 3, this is used for debug messages.
func (m *Message) VV(msg string, args ...interface{}) {
if m.v >= 3 {
m.term.Printf(msg, args...)
m.term.Print(fmt.Sprintf(msg, args...))
}
}

12
internal/ui/termstatus/status.go
View File

@ -252,23 +252,11 @@ func (t *Terminal) Print(line string) {
t.print(line, false)
}
// Printf uses fmt.Sprintf to write a line to the terminal.
func (t *Terminal) Printf(msg string, args ...interface{}) {
s := fmt.Sprintf(msg, args...)
t.Print(s)
}
// Error writes an error to the terminal.
func (t *Terminal) Error(line string) {
t.print(line, true)
}
// Errorf uses fmt.Sprintf to write an error line to the terminal.
func (t *Terminal) Errorf(msg string, args ...interface{}) {
s := fmt.Sprintf(msg, args...)
t.Error(s)
}
// Truncate s to fit in width (number of terminal cells) w.
// If w is negative, returns the empty string.
func Truncate(s string, w int) string {