Stowage/restic
2
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-08 06:09:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

ui: only redraw status bar if it has not changed

Browse source
This commit is contained in:
Michael Eischer 2025-11-28 23:20:39 +01:00
parent b9afdf795e
commit ae6d6bd9a6
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog/unreleased/issue-5383
View file

@ -7,3 +7,4 @@ anything in the terminal with certain terminal emulators.
https://github.com/restic/restic/issues/5383
https://github.com/restic/restic/pull/5551
https://github.com/restic/restic/pull/5626

22
internal/ui/termstatus/status.go
View file

@ -5,6 +5,7 @@ import (
"context"
"fmt"
"io"
"slices"
"strings"
"sync"
@ -204,6 +205,7 @@ func (t *Terminal) Run(ctx context.Context) {
// run listens on the channels and updates the terminal screen.
func (t *Terminal) run(ctx context.Context) {
var status []string
var lastWrittenStatus []string
for {
select {
case <-ctx.Done():
@ -240,6 +242,7 @@ func (t *Terminal) run(ctx context.Context) {
}
t.writeStatus(status)
lastWrittenStatus = append([]string{}, status...)
case stat := <-t.status:
status = append(status[:0], stat.lines...)
@ -248,7 +251,11 @@ func (t *Terminal) run(ctx context.Context) {
continue
}
t.writeStatus(status)
if !slices.Equal(status, lastWrittenStatus) {
t.writeStatus(status)
// Copy the status slice to avoid aliasing
lastWrittenStatus = append([]string{}, status...)
}
}
}
}
@ -287,6 +294,7 @@ func (t *Terminal) writeStatus(status []string) {
// runWithoutStatus listens on the channels and just prints out the messages,
// without status lines.
func (t *Terminal) runWithoutStatus(ctx context.Context) {
var lastStatus []string
for {
select {
case <-ctx.Done():
@ -309,11 +317,15 @@ func (t *Terminal) runWithoutStatus(ctx context.Context) {
}
case stat := <-t.status:
for _, line := range stat.lines {
// Ensure that each message ends with exactly one newline.
if _, err := fmt.Fprintln(t.wr, strings.TrimRight(line, "\n")); err != nil {
_, _ = fmt.Fprintf(t.errWriter, "write failed: %v\n", err)
if !slices.Equal(stat.lines, lastStatus) {
for _, line := range stat.lines {
// Ensure that each message ends with exactly one newline.
if _, err := fmt.Fprintln(t.wr, strings.TrimRight(line, "\n")); err != nil {
_, _ = fmt.Fprintf(t.errWriter, "write failed: %v\n", err)
}
}
// Copy the status slice to avoid aliasing
lastStatus = append([]string{}, stat.lines...)
}
}
}