fix: 🐛 (#23) fix issue with ctrl+c

AndreasAugustin · Aug 18, 2023 · f0b9566 · f0b9566
1 parent ed8d7ee
commit f0b9566
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/pkg/ui/list.go b/pkg/ui/list.go
@@ -1,9 +1,9 @@
 package ui
 
 import (
-	"fmt"
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
+	log "github.com/sirupsen/logrus"
 	"os"
 )
 
@@ -29,6 +29,8 @@ func (m *listModel[K]) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		switch keypress := msg.String(); keypress {
 		case "ctrl+c":
 			m.quitting = true
+			log.Warn("ctrl + c pressed -> quitting")
+			os.Exit(0)
 			return m, tea.Quit
 
 		case "enter":
@@ -68,7 +70,7 @@ func ListRun[K interface{ FilterValue() string }](settings ListSettings, input [
 	p := tea.NewProgram(&m, tea.WithAltScreen())
 
 	if _, err := p.Run(); err != nil {
-		fmt.Println("Error running program:", err)
+		log.Errorf("Error running program:", err)
 		os.Exit(1)
 	}
 	return m.choice

diff --git a/pkg/ui/spinner.go b/pkg/ui/spinner.go
@@ -1,22 +1,20 @@
 package ui
 
-// A simple program demonstrating the spinner component from the Bubbles
-// component library.
-
 import (
 	"fmt"
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	log "github.com/sirupsen/logrus"
 	"os"
 )
 
 type errMsgSpinner error
 
 type spinnerModel struct {
 	spinner  spinner.Model
-	quitting bool
 	err      error
+	quitting bool
 }
 
 func initialSpinnerModel() spinnerModel {
@@ -36,6 +34,8 @@ func (m *spinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		switch msg.String() {
 		case "q", "esc", "ctrl+c":
 			m.quitting = true
+			log.Warn("ctrl + c -> quitting")
+			os.Exit(0)
 			return m, tea.Quit
 		default:
 			return m, nil
@@ -78,7 +78,9 @@ func NewSpinner() Spinner {
 
 func (s *Spinner) Run() {
 	go func() {
-		if _, err := s.program.Run(); err != nil {
+		_, err := s.program.Run()
+
+		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}

diff --git a/pkg/ui/textinputs.go b/pkg/ui/textinputs.go
@@ -17,6 +17,7 @@ type textInputsModel struct {
 	title      string
 	inputs     []textinput.Model
 	cursorMode cursor.Mode
+	quitting   bool
 }
 
 func initialTextInputsModel(title string, textInputsData []pkg.TextInputData) textInputsModel {
@@ -58,6 +59,9 @@ func (m *textInputsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "ctrl+c", "esc":
+			m.quitting = true
+			log.Warn("ctrl + c -> quitting")
+			os.Exit(0)
 			return m, tea.Quit
 
 		// Change cursor mode
@@ -165,6 +169,11 @@ func TextInputsRun(title string, textInputsData []pkg.TextInputData) []pkg.TextI
 		log.Errorf("could not start program: %s\n", err)
 		os.Exit(1)
 	}
+
+	if model.quitting {
+		log.Warn("ctrl + c -> quitting")
+		os.Exit(0)
+	}
 	mapped := make([]pkg.TextInputRes, len(textInputsData))
 
 	for i, e := range textInputsData {