update

Author: moqsien

internal/cui/help/help.go

@@ -44,7 +44,7 @@ func (h *Help) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		if k := msg.String(); k == "ctrl+c" || k == "q" || k == "esc" {
-			return h, tea.Quit
+			return h, types.QuitPrompt
 		}
 	case tea.WindowSizeMsg:
 		if !h.ready {

internal/cui/progress/progress.go

@@ -109,7 +109,7 @@ func (p *Progress) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					p.err = err
 				}
 			}
-			return p, tea.Quit
+			return p, types.QuitPrompt
 		default:
 			return p, nil
 		}
@@ -119,7 +119,7 @@ func (p *Progress) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return p, nil
 	case ErrorMsg:
 		p.err = msg.err
-		return p, tea.Quit
+		return p, types.QuitPrompt
 	case ProgressMsg:
 		var cmds []tea.Cmd
 		if msg >= 1.0 {
@@ -128,7 +128,7 @@ func (p *Progress) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					p.err = err
 				}
 			}
-			cmds = append(cmds, tea.Sequence(finalPauseCmd(), tea.Quit))
+			cmds = append(cmds, tea.Sequence(finalPauseCmd(), types.QuitPrompt))
 		}
 		cmds = append(cmds, p.pm.SetPercent(float64(msg)))
 		return p, tea.Batch(cmds...)

internal/cui/spinner/spinner.go

@@ -82,9 +82,9 @@ func (s *Spinner) quit(tc tea.Cmd) (tea.Model, tea.Cmd) {
 	}
 
 	if tc == nil {
-		return s, tea.Quit
+		return s, types.QuitPrompt
 	} else {
-		return s, tea.Batch(tc, tea.Quit)
+		return s, tea.Batch(tc, types.QuitPrompt)
 	}
 }
 

internal/cui/types/types.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 )
 
@@ -41,3 +42,9 @@ func (c CommonKeyMap) GetHelpInfo() string {
 	s = HelpStyle.Render(s)
 	return s
 }
+
+type QuitP struct{}
+
+func QuitPrompt() tea.Msg {
+	return QuitP{}
+}