octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-26 06:46:34 +00:00
Code Issues Releases Wiki Activity

ui, termstatus: Move WrapStdio

Browse Source 
Saves some imports. ui still needs to import ui/termstatus from
message.go.
This commit is contained in:
greatroar 2024-05-21 10:51:05 +02:00
parent 0b56214473
commit 66d03c797e
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/restic/termstatus.go
View File

@ -4,7 +4,6 @@ import (
"context"
"sync"
"github.com/restic/restic/internal/ui"
"github.com/restic/restic/internal/ui/termstatus"
)
@ -31,7 +30,7 @@ func setupTermstatus() (*termstatus.Terminal, func()) {
// use the termstatus for stdout/stderr
prevStdout, prevStderr := globalOptions.stdout, globalOptions.stderr
globalOptions.stdout, globalOptions.stderr = ui.WrapStdio(term)
globalOptions.stdout, globalOptions.stderr = termstatus.WrapStdio(term)
return term, func() {
// shutdown termstatus

6
internal/ui/stdio_wrapper.go → internal/ui/termstatus/stdio_wrapper.go
View File

@ -1,15 +1,13 @@
package ui
package termstatus
import (
"bytes"
"io"
"github.com/restic/restic/internal/ui/termstatus"
)
// WrapStdio returns line-buffering replacements for os.Stdout and os.Stderr.
// On Close, the remaining bytes are written, followed by a line break.
func WrapStdio(term *termstatus.Terminal) (stdout, stderr io.WriteCloser) {
func WrapStdio(term *Terminal) (stdout, stderr io.WriteCloser) {
return newLineWriter(term.Print), newLineWriter(term.Error)
}

2
internal/ui/stdio_wrapper_test.go → internal/ui/termstatus/stdio_wrapper_test.go
View File

@ -1,4 +1,4 @@
package ui
package termstatus
import (
"strings"