From 48cbbf9651ab5a7ebbaa0c9f6d13a74209ea756d Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sun, 7 Sep 2025 12:15:27 +0200 Subject: [PATCH] ui/termstatus: extract background handling code --- internal/{ui/termstatus => terminal}/background_unix.go | 2 +- .../{ui/termstatus => terminal}/background_unix_test.go | 2 +- .../{ui/termstatus => terminal}/background_windows.go | 2 +- internal/terminal/foreground_unix.go | 9 ++++----- internal/{ui/termstatus => terminal}/getpgrp_solaris.go | 2 +- internal/{ui/termstatus => terminal}/getpgrp_unix.go | 2 +- internal/{ui/termstatus => terminal}/tcgetpgrp_linux.go | 2 +- internal/{ui/termstatus => terminal}/tcgetpgrp_unix.go | 2 +- internal/{ui/termstatus => terminal}/tcsetpgrp_aix.go | 2 +- internal/{ui/termstatus => terminal}/tcsetpgrp_unix.go | 2 +- internal/ui/termstatus/status.go | 8 +++++--- 11 files changed, 18 insertions(+), 17 deletions(-) rename internal/{ui/termstatus => terminal}/background_unix.go (96%) rename internal/{ui/termstatus => terminal}/background_unix_test.go (94%) rename internal/{ui/termstatus => terminal}/background_windows.go (90%) rename internal/{ui/termstatus => terminal}/getpgrp_solaris.go (83%) rename internal/{ui/termstatus => terminal}/getpgrp_unix.go (84%) rename internal/{ui/termstatus => terminal}/tcgetpgrp_linux.go (95%) rename internal/{ui/termstatus => terminal}/tcgetpgrp_unix.go (88%) rename internal/{ui/termstatus => terminal}/tcsetpgrp_aix.go (93%) rename internal/{ui/termstatus => terminal}/tcsetpgrp_unix.go (89%) diff --git a/internal/ui/termstatus/background_unix.go b/internal/terminal/background_unix.go similarity index 96% rename from internal/ui/termstatus/background_unix.go rename to internal/terminal/background_unix.go index 666e42dd1..316466ce9 100644 --- a/internal/ui/termstatus/background_unix.go +++ b/internal/terminal/background_unix.go @@ -1,6 +1,6 @@ //go:build unix -package termstatus +package terminal import "github.com/restic/restic/internal/debug" diff --git a/internal/ui/termstatus/background_unix_test.go b/internal/terminal/background_unix_test.go similarity index 94% rename from internal/ui/termstatus/background_unix_test.go rename to internal/terminal/background_unix_test.go index 301e780de..189e8c7d4 100644 --- a/internal/ui/termstatus/background_unix_test.go +++ b/internal/terminal/background_unix_test.go @@ -1,6 +1,6 @@ //go:build unix -package termstatus +package terminal import ( "os" diff --git a/internal/ui/termstatus/background_windows.go b/internal/terminal/background_windows.go similarity index 90% rename from internal/ui/termstatus/background_windows.go rename to internal/terminal/background_windows.go index b210509e7..9b370d074 100644 --- a/internal/ui/termstatus/background_windows.go +++ b/internal/terminal/background_windows.go @@ -1,4 +1,4 @@ -package termstatus +package terminal // IsProcessBackground reports whether the current process is running in the // background. Not implemented for this platform. diff --git a/internal/terminal/foreground_unix.go b/internal/terminal/foreground_unix.go index 340f80791..a3fb4d086 100644 --- a/internal/terminal/foreground_unix.go +++ b/internal/terminal/foreground_unix.go @@ -9,7 +9,6 @@ import ( "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/errors" - "github.com/restic/restic/internal/ui/termstatus" "golang.org/x/sys/unix" ) @@ -29,13 +28,13 @@ func startForeground(cmd *exec.Cmd) (bg func() error, err error) { } // only move child process to foreground if restic is in the foreground - prev, err := termstatus.Tcgetpgrp(int(tty.Fd())) + prev, err := Tcgetpgrp(int(tty.Fd())) if err != nil { _ = tty.Close() return nil, err } - self := termstatus.Getpgrp() + self := Getpgrp() if prev != self { debug.Log("restic is not controlling the tty; err = %v", err) if err := tty.Close(); err != nil { @@ -56,7 +55,7 @@ func startForeground(cmd *exec.Cmd) (bg func() error, err error) { } // move the command's process group into the foreground - err = termstatus.Tcsetpgrp(int(tty.Fd()), cmd.Process.Pid) + err = Tcsetpgrp(int(tty.Fd()), cmd.Process.Pid) if err != nil { _ = tty.Close() return nil, err @@ -67,7 +66,7 @@ func startForeground(cmd *exec.Cmd) (bg func() error, err error) { signal.Reset(unix.SIGTTOU) // reset the foreground process group - err = termstatus.Tcsetpgrp(int(tty.Fd()), prev) + err = Tcsetpgrp(int(tty.Fd()), prev) if err != nil { _ = tty.Close() return err diff --git a/internal/ui/termstatus/getpgrp_solaris.go b/internal/terminal/getpgrp_solaris.go similarity index 83% rename from internal/ui/termstatus/getpgrp_solaris.go rename to internal/terminal/getpgrp_solaris.go index 1df46d93c..e326079c3 100644 --- a/internal/ui/termstatus/getpgrp_solaris.go +++ b/internal/terminal/getpgrp_solaris.go @@ -1,4 +1,4 @@ -package termstatus +package terminal import "golang.org/x/sys/unix" diff --git a/internal/ui/termstatus/getpgrp_unix.go b/internal/terminal/getpgrp_unix.go similarity index 84% rename from internal/ui/termstatus/getpgrp_unix.go rename to internal/terminal/getpgrp_unix.go index f5a7b213f..759c28513 100644 --- a/internal/ui/termstatus/getpgrp_unix.go +++ b/internal/terminal/getpgrp_unix.go @@ -1,6 +1,6 @@ //go:build unix && !solaris -package termstatus +package terminal import "golang.org/x/sys/unix" diff --git a/internal/ui/termstatus/tcgetpgrp_linux.go b/internal/terminal/tcgetpgrp_linux.go similarity index 95% rename from internal/ui/termstatus/tcgetpgrp_linux.go rename to internal/terminal/tcgetpgrp_linux.go index 51a9fd2da..bc7e18342 100644 --- a/internal/ui/termstatus/tcgetpgrp_linux.go +++ b/internal/terminal/tcgetpgrp_linux.go @@ -1,4 +1,4 @@ -package termstatus +package terminal import "golang.org/x/sys/unix" diff --git a/internal/ui/termstatus/tcgetpgrp_unix.go b/internal/terminal/tcgetpgrp_unix.go similarity index 88% rename from internal/ui/termstatus/tcgetpgrp_unix.go rename to internal/terminal/tcgetpgrp_unix.go index 1359b5e46..6fd7de0a5 100644 --- a/internal/ui/termstatus/tcgetpgrp_unix.go +++ b/internal/terminal/tcgetpgrp_unix.go @@ -1,6 +1,6 @@ //go:build unix && !linux -package termstatus +package terminal import "golang.org/x/sys/unix" diff --git a/internal/ui/termstatus/tcsetpgrp_aix.go b/internal/terminal/tcsetpgrp_aix.go similarity index 93% rename from internal/ui/termstatus/tcsetpgrp_aix.go rename to internal/terminal/tcsetpgrp_aix.go index 8f2a5cab1..671b03a7a 100644 --- a/internal/ui/termstatus/tcsetpgrp_aix.go +++ b/internal/terminal/tcsetpgrp_aix.go @@ -1,4 +1,4 @@ -package termstatus +package terminal import "golang.org/x/sys/unix" diff --git a/internal/ui/termstatus/tcsetpgrp_unix.go b/internal/terminal/tcsetpgrp_unix.go similarity index 89% rename from internal/ui/termstatus/tcsetpgrp_unix.go rename to internal/terminal/tcsetpgrp_unix.go index 7762ee448..524f5d05a 100644 --- a/internal/ui/termstatus/tcsetpgrp_unix.go +++ b/internal/terminal/tcsetpgrp_unix.go @@ -1,6 +1,6 @@ //go:build unix && !aix -package termstatus +package terminal import "golang.org/x/sys/unix" diff --git a/internal/ui/termstatus/status.go b/internal/ui/termstatus/status.go index d3674ac09..8d6413949 100644 --- a/internal/ui/termstatus/status.go +++ b/internal/ui/termstatus/status.go @@ -12,6 +12,8 @@ import ( "golang.org/x/term" "golang.org/x/text/width" + + "github.com/restic/restic/internal/terminal" ) // Terminal is used to write messages and display status lines which can be @@ -101,14 +103,14 @@ func (t *Terminal) run(ctx context.Context) { for { select { case <-ctx.Done(): - if !IsProcessBackground(t.fd) { + if !terminal.IsProcessBackground(t.fd) { t.writeStatus([]string{}) } return case msg := <-t.msg: - if IsProcessBackground(t.fd) { + if terminal.IsProcessBackground(t.fd) { // ignore all messages, do nothing, we are in the background process group continue } @@ -140,7 +142,7 @@ func (t *Terminal) run(ctx context.Context) { } case stat := <-t.status: - if IsProcessBackground(t.fd) { + if terminal.IsProcessBackground(t.fd) { // ignore all messages, do nothing, we are in the background process group continue }