update

Author: cnlubo

confirmation/model_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	tea "github.com/charmbracelet/bubbletea"
-	_ "github.com/cnlubo/myssh/common"
 	"github.com/cnlubo/myssh/confirmation"
 	"github.com/cnlubo/myssh/test"
 	"github.com/muesli/termenv"

confirmation/templates.go

@@ -4,41 +4,39 @@ package confirmation
 // arrow.
 
 const TemplateArrow = `
-{{- Bold .Prompt -}}
+{{- .Prompt | bold | cyan -}}
 {{ if .YesSelected -}}
-	{{- print (Bold " ▸Yes ") " No" -}}
+	{{- print (bold (yellow " ▸Yes ")) (cyan " No") -}}
 {{- else if .NoSelected -}}
-	{{- print "  Yes " (Bold "▸No") -}}
+	{{- print (cyan "  Yes ") (bold (yellow "▸No")) -}}
 {{- else -}}
 	{{- "  Yes  No" -}}
 {{- end -}}
 `
-
-// ResultTemplateArrow is the ResultTemplate that matches TemplateArrow.
 const ResultTemplateArrow = `
 {{- print .Prompt " " -}}
 {{- if .FinalValue -}}
-	{{- Foreground "32" "Yes" -}}
+	{{- print | cyan (bold "Yes") -}}
 {{- else -}}
-	{{- Foreground "32" "No" -}}
+	{{- print | cyan (bold "No") -}}
 {{- end }}
 `
 
 const TemplateYN = `
-{{- .Prompt | bold | red -}}
+{{- .Prompt | bold | cyan  -}}
 {{ if .YesSelected  -}}
-	{{- print | red (bold " [Y/") red ("n") red (bold "]") -}}
+	{{- print (cyan " [") (bold (yellow "Y")) (cyan "/n]") -}}
 {{- else if .NoSelected -}}
-	{{- print | red (bold " [y/N]") -}}
+    {{- print (cyan " [y/") (bold (yellow "N")) (cyan "]") -}}
 {{- else -}}
 	{{- " [y/n]" -}}
 {{- end -}}
 `
 const ResultTemplateYN = `
-{{- .Prompt | bold | green -}}
+{{- .Prompt | bold | cyan -}}
 {{ if .FinalValue -}}
-    {{- print | green (bold " [Y/n]") -}}
+    {{- print | cyan (bold " [Y/n]") -}}
 {{- else -}}
-	{{- print | green (bold " [y/N]") -}}
+	{{- print | cyan (bold " [y/N]") -}}
 {{- end }}
 `

myssh/keymg.go

@@ -105,18 +105,13 @@ func createDefaultSSHKey(env *Environment) error {
 
 		input := confirmation.New("Do you want to create default SSHKey",
 			confirmation.NewValue(true))
-		input.Template = confirmation.TemplateYN
-		input.ResultTemplate = confirmation.ResultTemplateYN
-		input.KeyMap.SelectYes = append(input.KeyMap.SelectYes, "+")
-		input.KeyMap.SelectNo = append(input.KeyMap.SelectNo, "-")
-		//input.ExtendedTemplateFuncs = common.ClorFuncMap
+		//input.Template = confirmation.TemplateYN
+		//input.ResultTemplate = confirmation.ResultTemplateYN
+		//input.KeyMap.SelectYes = append(input.KeyMap.SelectYes, "+")
+		//input.KeyMap.SelectNo = append(input.KeyMap.SelectNo, "-")
 
 		confirm, err = input.RunPrompt()
-		if err != nil {
-			fmt.Printf("Error: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println(confirm)
+		utils.CheckAndExit(err)
 		if confirm {
 			// Create default alias directory
 			err := os.Mkdir(filepath.Join(keyStorePath, DefaultKey), 0755)
@@ -171,6 +166,8 @@ func createDefaultSSHKey(env *Environment) error {
 			runHook(ag.Alias, env)
 			utils.PrintN(utils.Info, fmt.Sprintf("Now using SSH key: [%s]", ag.Alias))
 
+		} else {
+			return errors.New("Exit...")
 		}
 	}
 	return nil

selection/choice.go

@@ -0,0 +1,60 @@
+package selection
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// Choice represents a single choice. This type used as an input
+// for the selection prompt, for filtering and as a result value.
+// The index is populated by the prompt itself and is exported
+// to be accessed when filtering.
+type Choice struct {
+	Index  int
+	String string
+	Value  interface{}
+}
+
+// NewChoice creates a new choice for a given input and chooses
+// a suitable string representation. The index is left at 0 to
+// be populated by the selection prompt later on.
+func NewChoice(item interface{}) *Choice {
+	choice := &Choice{Index: 0, Value: item}
+
+	switch i := item.(type) {
+	case Choice:
+		choice.String = i.String
+		choice.Value = i.Value
+	case *Choice:
+		choice.String = i.String
+		choice.Value = i.Value
+	case string:
+		choice.String = i
+	case fmt.Stringer:
+		choice.String = i.String()
+	default:
+		choice.String = fmt.Sprintf("%+v", i)
+	}
+
+	return choice
+}
+
+// Choices converts a slice of anything to a slice of choices.
+// Choices panics if the input is not a slice.
+func Choices(sliceChoices interface{}) []*Choice {
+	switch reflect.TypeOf(sliceChoices).Kind() {
+	case reflect.Slice:
+		slice := reflect.ValueOf(sliceChoices)
+
+		choices := make([]*Choice, 0, slice.Len())
+
+		for i := 0; i < slice.Len(); i++ {
+			value := slice.Index(i).Interface()
+			choices = append(choices, NewChoice(value))
+		}
+
+		return choices
+	default:
+		panic("SliceChoices argument is not a slice")
+	}
+}

selection/keymap.go

@@ -0,0 +1,65 @@
+package selection
+
+import (
+	"fmt"
+
+	tea "github.com/charmbracelet/bubbletea"
+)
+
+// NewDefaultKeyMap returns a KeyMap with sensible default key mappings that can
+// also be used as a starting point for customization.
+func NewDefaultKeyMap() *KeyMap {
+	return &KeyMap{
+		Down:        []string{"down"},
+		Up:          []string{"up"},
+		Select:      []string{"enter"},
+		Abort:       []string{"ctrl+c"},
+		ClearFilter: []string{"esc"},
+		ScrollDown:  []string{"pgdown"},
+		ScrollUp:    []string{"pgup"},
+	}
+}
+
+// KeyMap defines the keys that trigger certain actions.
+type KeyMap struct {
+	Down        []string
+	Up          []string
+	Select      []string
+	Abort       []string
+	ClearFilter []string
+	ScrollDown  []string
+	ScrollUp    []string
+}
+
+func keyMatches(key tea.KeyMsg, mapping []string) bool {
+	for _, m := range mapping {
+		if m == key.String() {
+			return true
+		}
+	}
+
+	return false
+}
+
+// validateKeyMap returns true if the given key map contains at
+// least the bare minimum set of key bindings for the functional
+// prompt and false otherwise.
+func validateKeyMap(km *KeyMap) error {
+	if len(km.Up) == 0 {
+		return fmt.Errorf("no up key")
+	}
+
+	if len(km.Down) == 0 {
+		return fmt.Errorf("no down key")
+	}
+
+	if len(km.Select) == 0 {
+		return fmt.Errorf("no select key")
+	}
+
+	if len(km.Abort) == 0 {
+		return fmt.Errorf("no abort key")
+	}
+
+	return nil
+}