Code cleanup, small UI improvements

plesk · Mar 17, 2021 · bf98522 · bf98522
1 parent 1eed32c
commit bf98522
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/cmd/tui/main.go b/cmd/tui/main.go
diff --git a/lib/tui/templates.go b/lib/tui/templates.go
@@ -5,15 +5,20 @@ import (
 )
 
 var listTemplates = &promptui.SelectTemplates{
-	Label:    "{{ . }}",
+	Label:    "Select container to mount/unmount. {{ \"(use ^C to exit)\" | faint }}",
 	Active:   "\U0000261E {{ if .Mounted }}{{ .ShortId | blue | bold }} {{ .Name | blue | bold }} (mounted){{ else }}{{ .ShortId | bold }} {{ .Name | bold }}{{ end }}",
 	Inactive: "  {{ if .Mounted }}{{ .ShortId | blue }} {{ .Name | blue }} (mounted){{else}}{{ .ShortId }} {{ .Name }}{{ end }}",
-	Selected: "\U0000261E {{ .Id | red | cyan }} (selected)",
 	Details: `
 ------ Container ------
 Id: {{ .Id }}
 Name:  {{ .Names }}
 Image: {{ .Image }}
 Command: {{ .Command }}
-MountPoint: {{ .MountPoint }}`,
+{{ if .Mounted }}MountPoint: {{ .MountPoint }}{{ end }}`,
+}
+
+var confirmUnmountTemplates = &promptui.SelectTemplates{
+	Label:    "{{ \"Unmount\" | red }} container {{ .Id | bold}} from {{ .Mp | bold }}",
+	Active:   "\U0000261E {{ . | bold }}",
+	Inactive: "  {{ . }}",
 }
diff --git a/lib/tui/tui.go b/lib/tui/tui.go
@@ -44,7 +44,7 @@ func (t *Tui) list() error {
 	}
 
 	sel := promptui.Select{
-		Label:     "Select container to mount",
+		Label:     "Label",
 		Items:     cts,
 		Templates: listTemplates,
 	}
@@ -56,17 +56,25 @@ func (t *Tui) list() error {
 	if ct.Mounted {
 		// ask to unmount
 		sel := promptui.Select{
-			Label: fmt.Sprintf("Unmount container %v from %v?", ct.ShortId, ct.MountPoint),
+			Label: struct {
+				Id string
+				Mp string
+			}{
+				Id: ct.ShortId,
+				Mp: ct.MountPoint,
+			},
 			Items: []string{
 				"Yes",
 				"No",
 			},
+			Templates: confirmUnmountTemplates,
 		}
 		i, _, err := sel.Run()
 		if err != nil {
 			return err
 		}
 		if i == 1 {
+			// No
 			return nil
 		}
 		// unmounting