Merge pull request #383 from jochil/jochil/cleanup-after-cancelation

interactive_multiselect_printer.go

@@ -2,13 +2,13 @@ package pterm
 
 import (
 	"fmt"
-	"os"
 	"sort"
 
 	"atomicgo.dev/cursor"
 	"atomicgo.dev/keyboard"
 	"atomicgo.dev/keyboard/keys"
 	"github.com/lithammer/fuzzysearch/fuzzy"
+	"github.com/pterm/pterm/internal"
 )
 
 var (
@@ -72,6 +72,11 @@ func (p InteractiveMultiselectPrinter) WithMaxHeight(maxHeight int) *Interactive
 
 // Show shows the interactive multiselect menu and returns the selected entry.
 func (p *InteractiveMultiselectPrinter) Show(text ...string) ([]string, error) {
+	// should be the first defer statement to make sure it is executed last
+	// and all the needed cleanup can be done before
+	cancel, exit := internal.NewCancelationSignal()
+	defer exit()
+
 	if len(text) == 0 || Sprint(text[0]) == "" {
 		text = []string{p.DefaultText}
 	}
@@ -219,7 +224,8 @@ func (p *InteractiveMultiselectPrinter) Show(text ...string) ([]string, error) {
 
 			area.Update(p.renderSelectMenu())
 		case keys.CtrlC:
-			os.Exit(1)
+			cancel()
+			return true, nil
 		case keys.Enter:
 			// Select option if not already selected
 			p.selectOption(p.fuzzySearchMatches[p.selectedOption])

interactive_select_printer.go

@@ -2,13 +2,13 @@ package pterm
 
 import (
 	"fmt"
-	"os"
 	"sort"
 
 	"atomicgo.dev/cursor"
 	"atomicgo.dev/keyboard"
 	"atomicgo.dev/keyboard/keys"
 	"github.com/lithammer/fuzzysearch/fuzzy"
+	"github.com/pterm/pterm/internal"
 )
 
 var (
@@ -72,6 +72,11 @@ func (p InteractiveSelectPrinter) WithMaxHeight(maxHeight int) *InteractiveSelec
 
 // Show shows the interactive select menu and returns the selected entry.
 func (p *InteractiveSelectPrinter) Show(text ...string) (string, error) {
+	// should be the first defer statement to make sure it is executed last
+	// and all the needed cleanup can be done before
+	cancel, exit := internal.NewCancelationSignal()
+	defer exit()
+
 	if len(text) == 0 || Sprint(text[0]) == "" {
 		text = []string{p.DefaultText}
 	}
@@ -124,6 +129,7 @@ func (p *InteractiveSelectPrinter) Show(text ...string) (string, error) {
 
 	cursor.Hide()
 	defer cursor.Show()
+
 	err = keyboard.Listen(func(keyInfo keys.Key) (stop bool, err error) {
 		key := keyInfo.Code
 
@@ -216,7 +222,8 @@ func (p *InteractiveSelectPrinter) Show(text ...string) (string, error) {
 
 			area.Update(p.renderSelectMenu())
 		case keys.CtrlC:
-			os.Exit(1)
+			cancel()
+			return true, nil
 		case keys.Enter:
 			if len(p.fuzzySearchMatches) == 0 {
 				return false, nil

interactive_textinput_printer.go

@@ -1,7 +1,6 @@
 package pterm
 
 import (
-	"os"
 	"strings"
 
 	"atomicgo.dev/cursor"
@@ -51,6 +50,11 @@ func (p *InteractiveTextInputPrinter) WithMultiLine(multiLine ...bool) *Interact
 
 // Show shows the interactive select menu and returns the selected entry.
 func (p *InteractiveTextInputPrinter) Show(text ...string) (string, error) {
+	// should be the first defer statement to make sure it is executed last
+	// and all the needed cleanup can be done before
+	cancel, exit := internal.NewCancelationSignal()
+	defer exit()
+
 	var areaText string
 
 	if len(text) == 0 || Sprint(text[0]) == "" {
@@ -130,7 +134,8 @@ func (p *InteractiveTextInputPrinter) Show(text ...string) (string, error) {
 				p.cursorXPos = 0
 			}
 		case keys.CtrlC:
-			os.Exit(0)
+			cancel()
+			return true, nil
 		case keys.Down:
 			if p.cursorYPos+1 < len(p.input) {
 				p.cursorXPos = (internal.GetStringMaxWidth(p.input[p.cursorYPos]) + p.cursorXPos) - internal.GetStringMaxWidth(p.input[p.cursorYPos+1])

internal/cancelation_signal.go

@@ -0,0 +1,21 @@
+package internal
+
+import (
+	"os"
+)
+
+// NewCancelationSignal for keeping track of a cancelation
+func NewCancelationSignal() (func(), func()) {
+	canceled := false
+
+	cancel := func() {
+		canceled = true
+	}
+	exit := func() {
+		if canceled {
+			os.Exit(1)
+		}
+	}
+
+	return cancel, exit
+}