🐛 Program should still halt even with spinner

This commit is contained in:
Dan Jones 2024-10-29 11:28:47 -05:00
commit fd68ffbbf8
3 changed files with 31 additions and 2 deletions

21
cli/context/signal.go Normal file
View file

@ -0,0 +1,21 @@
package context
import (
"context"
"os"
"os/signal"
"syscall"
)
func SelfCancelingCotext(ctx context.Context) (context.Context, context.CancelFunc) {
c, done := context.WithCancel(ctx)
ch := make(chan os.Signal, 1)
signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
go func() {
for range ch {
done()
}
}()
return c, done
}

View file

@ -94,7 +94,12 @@ func (s *spin) Err() error {
}
func Spin(ctx context.Context, message string) Spinner {
p := tea.NewProgram(newModel(message), tea.WithContext(ctx))
p := tea.NewProgram(
newModel(message),
tea.WithContext(ctx),
tea.WithoutSignalHandler(),
tea.WithInput(nil),
)
s := &spin{p: p, finished: make(chan struct{}, 1)}
go func() {
_, err := s.p.Run()

View file

@ -4,12 +4,15 @@ import (
"context"
"codeberg.org/danjones000/utils/chill"
c "codeberg.org/danjones000/utils/cli/context"
e "codeberg.org/danjones000/utils/cli/err"
"codeberg.org/danjones000/utils/cli/spin"
)
func main() {
ctx := chill.Chill(context.Background())
ctx, done := c.SelfCancelingCotext(context.Background())
defer done()
ctx = chill.Chill(ctx)
s := spin.Spin(ctx, "Waiting for CPU to cool...")
err := s.Wait()
e.HandleErr(err)