main.go

@@ -1,7 +1,5 @@
 package main
 
-// Testing out tea; really, git and ssh
-
 import (
 	"fmt"
 	"io/fs"
@@ -9,21 +7,26 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
 )
 
+// Enum for the different launch types (browsers and CLI's)
+const (
+	BrowserSessions int = iota
+	Commands
+)
+
 type commandChoice struct {
 	displayString string
 	command       *exec.Cmd
 }
 
-type choices []commandChoice
+type Choices []commandChoice
 
 type model struct {
 	cursor   int
-	choices  choices
+	choices  Choices
 	selected map[int]struct{}
 	status   string
 }
@@ -33,6 +36,8 @@ type statusMsg string
 var selection map[int]struct{}
 
 func getBrowserSessions() []commandChoice {
+	// 1. List files in $XDG_DATA_HOME/qutebrowser/sessions/ (N.B.:
+	//    UserConfigDir() in os)
 	userConfigDir, err := os.UserConfigDir()
 	if err != nil {
 		log.Printf("Error finding user configuration directory: %v", err)
@@ -46,6 +51,8 @@ func getBrowserSessions() []commandChoice {
 		log.Printf("Error reading browser sessions directory: %v", err)
 		return []commandChoice{}
 	}
+	// 2. Exclude non-YAML files
+	// 3. Wrangle them into this struct array
 	result := make([]commandChoice, 0)
 	for _, entry := range fileList {
 		if !entry.IsDir() && strings.HasSuffix(entry.Name(), ".yml") {
@@ -56,6 +63,7 @@ func getBrowserSessions() []commandChoice {
 			})
 		}
 	}
+	// log.Printf("result: %v", result)
 	return result
 }
 
@@ -66,7 +74,7 @@ func initialModel() model {
 			getBrowserSessions(),
 			commandChoice{
 				displayString: "bottom",
-				command:       exec.Command("xterm", "-maximized", "-e", "btm", "--battery", "--color", "gruvbox-light"),
+				command:       exec.Command("xterm", "-maximized", "-e", "btm", "--group", "--battery", "--color", "gruvbox-light"),
 			},
 			commandChoice{
 				displayString: "broot",
@@ -84,10 +92,6 @@ func initialModel() model {
 				displayString: "newsboat",
 				command:       exec.Command("xterm", "-maximized", "-e", "newsboat"),
 			},
-			commandChoice{
-				displayString: "w3m",
-				command:       exec.Command("xterm", "-maximized", "-e", "w3m", "https://languagehat.com/"),
-			},
 		),
 		selected: make(map[int]struct{}),
 	}
@@ -98,7 +102,7 @@ func launch(m model) tea.Cmd {
 		var result statusMsg
 		for q, item := range m.choices {
 			if _, ok := m.selected[q]; ok {
-				log.Printf("Launching: %v\n", item.displayString)
+				log.Printf("launching: %v\n", item.displayString)
 				result += statusMsg(fmt.Sprintf("Launching command: %v\n", item.displayString))
 				err := item.command.Start()
 				if err != nil {
@@ -107,7 +111,17 @@ func launch(m model) tea.Cmd {
 				}
 			}
 		}
-		time.Sleep(2000 * time.Millisecond)
+
+		for r, item := range m.choices {
+			if _, ok := m.selected[r]; ok {
+				err := item.command.Wait()
+				if err != nil {
+					result += statusMsg(fmt.Sprintf("%v\n", err))
+					log.Fatalf("Error during Wait(): %v\n", err)
+				}
+			}
+		}
+
 		return result
 	}
 }
@@ -166,6 +180,7 @@ func (m model) View() string {
 	}
 	s += "\n\n"
 
+	// s += fmt.Sprintf("\n%+v", m.selected) // debug
 	s += fmt.Sprintf("%s\n", m.status)
 	s += "Press enter to launch.\n"
 	s += "Press q to quit.\n"
@@ -174,15 +189,14 @@ func (m model) View() string {
 }
 
 func main() {
-	logfilePath := os.Getenv("BREAKFAST_LOG")
+	// Logging example from the Bubbletea "simple" example. For some
-	if logfilePath == "" {
+	// reason there's no file variable, and hence no file to `.Close()`.
-		logfilePath = fmt.Sprintf("/tmp/%s_breakfast.log", time.Now().Local().Format("20060102150405-0700"))
+	logfilePath := os.Getenv("BUBBLETEA_LOG")
-	}
+	if logfilePath != "" {
-	f, err := tea.LogToFile(logfilePath, "DEBUG")
+		if _, err := tea.LogToFile(logfilePath, "DEBUG"); err != nil {
-	if err != nil {
 			log.Fatal(err)
 		}
-	defer f.Close()
+	}
 
 	p := tea.NewProgram(initialModel())
 	if err := p.Start(); err != nil {