.gitignore

@@ -17,6 +17,3 @@ breakfast
 
 # Go workspace file
 go.work
-
-# Logs
-logs/

main.go

@@ -1,7 +1,5 @@
 package main
 
-// Testing out tea; really, git and ssh
-
 import (
 	"fmt"
 	"io/fs"
@@ -9,105 +7,116 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
 )
 
-type commandChoice struct {
+// Enum for the different launch types (browsers and CLI's)
+const (
+	BrowserSessions int = iota
+	Commands
+)
+
+type sessionOrCommand struct {
 	displayString string
 	command       *exec.Cmd
 }
 
-type choices []commandChoice
+type Choices [][]sessionOrCommand
+
+type SelectionSet map[int]struct{}
 
 type model struct {
-	cursor   int
+	activeSection int
-	choices  choices
+	cursor        []int
-	selected map[int]struct{}
+	choices       Choices
+	selected      []SelectionSet
 	status        string
 }
 
 type statusMsg string
 
-var selection map[int]struct{}
+var browserSelection SelectionSet
+var commandSelection SelectionSet
 
-func getBrowserSessions() []commandChoice {
+func getBrowserSessions() []sessionOrCommand {
+	// 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)
-		return []commandChoice{}
+		return []sessionOrCommand{}
 	}
-	log.Printf("userConfigDir: %+v", userConfigDir)
+	log.Printf("INFO userConfigDir: %+v", userConfigDir)
 	fileSystem := os.DirFS(userConfigDir)
-	log.Printf("fileSystem: %+v", fileSystem)
+	log.Printf("INFO fileSystem: %+v", fileSystem)
 	fileList, err := fs.ReadDir(fileSystem, "local/share/qutebrowser/sessions")
 	if err != nil {
 		log.Printf("Error reading browser sessions directory: %v", err)
-		return []commandChoice{}
+		return []sessionOrCommand{}
 	}
-	result := make([]commandChoice, 0)
+	// 2. Exclude non-YAML files
+	// 3. Wrangle them into this struct array
+	result := make([]sessionOrCommand, 0)
 	for _, entry := range fileList {
 		if !entry.IsDir() && strings.HasSuffix(entry.Name(), ".yml") {
-			log.Printf("%s", entry.Name())
+			log.Printf("INFO %s", entry.Name())
-			result = append(result, commandChoice{
+			result = append(result, sessionOrCommand{displayString: strings.TrimSuffix(entry.Name(), ".yml"), command: nil})
-				displayString: fmt.Sprintf("Qutebrowser session: %s", strings.TrimSuffix(entry.Name(), ".yml")),
-				command:       exec.Command("xterm", "-e", "qutebrowser", "--target", "window", "--restore", strings.TrimSuffix(entry.Name(), ".yml")),
-			})
 		}
 	}
+	// log.Printf("result: %v", result)
 	return result
 }
 
 func initialModel() model {
+	browserSelection = make(SelectionSet)
+	commandSelection = make(SelectionSet)
 	return model{
-		cursor: 0,
+		activeSection: BrowserSessions,
-		choices: append(
+		cursor:        []int{0, 0},
+		choices: Choices{
 			getBrowserSessions(),
-			commandChoice{
+			[]sessionOrCommand{{
-				displayString: "bottom",
-				command:       exec.Command("xterm", "-maximized", "-e", "btm", "--battery", "--color", "gruvbox-light"),
-			},
-			commandChoice{
-				displayString: "broot",
-				command:       exec.Command("xterm", "-maximized", "-e", "broot"),
-			},
-			commandChoice{
-				displayString: "joplin",
-				command:       exec.Command("xterm", "-maximized", "-e", "joplin"),
-			},
-			commandChoice{
-				displayString: "neomutt",
-				command:       exec.Command("xterm", "-maximized", "-e", "neomutt"),
-			},
-			commandChoice{
 				displayString: "newsboat",
 				command:       exec.Command("xterm", "-maximized", "-e", "newsboat"),
+			}, {
+				displayString: "bottom",
+				command:       exec.Command("xterm", "-maximized", "-e", "btm", "--group", "--battery", "--color", "gruvbox-light"),
+			}},
 		},
-			commandChoice{
+		// An array of maps which indicates which choices are selected.
-				displayString: "w3m",
+		// We're using the map like a mathematical set. The keys refer to
-				command:       exec.Command("xterm", "-maximized", "-e", "w3m", "https://languagehat.com/"),
+		// the indexes of the `choices` slice, above.
-			},
+		selected: []SelectionSet{browserSelection, commandSelection},
-		),
-		selected: make(map[int]struct{}),
 	}
 }
 
 func launch(m model) tea.Cmd {
 	return func() tea.Msg {
 		var result statusMsg
-		for q, item := range m.choices {
+		for j, item := range m.choices[BrowserSessions] {
-			if _, ok := m.selected[q]; ok {
+			if _, ok := m.selected[BrowserSessions][j]; ok {
-				log.Printf("Launching: %v\n", item.displayString)
+				cmd := exec.Command("qutebrowser", "--restore", item.displayString)
-				result += statusMsg(fmt.Sprintf("Launching command: %v\n", item.displayString))
+				err := cmd.Start()
-				err := item.command.Start()
+				result += statusMsg(fmt.Sprintf("Launching Qutebrowser session: %v\n", item.displayString))
 				if err != nil {
 					result += statusMsg(fmt.Sprintf("%v\n", err))
-					log.Fatalf("Error launching: %v\n", err)
+					log.Fatalf("Error starting browser session: %v\n", err)
+				}
+			}
+		}
+
+		for k, item := range m.choices[Commands] {
+			if _, ok := m.selected[Commands][k]; ok {
+				cmd := item.command
+				err := cmd.Start()
+				result += statusMsg(fmt.Sprintf("Launching command: %v\n", item.displayString))
+				if err != nil {
+					result += statusMsg(fmt.Sprintf("%v\n", err))
+					log.Fatalf("Error starting command: %v\n", err)
 				}
 			}
 		}
-		time.Sleep(2000 * time.Millisecond)
 		return result
 	}
 }
@@ -125,20 +134,26 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		switch msg.String() {
 		case "ctrl+c", "q":
 			return m, tea.Quit
+		case "tab":
+			if m.activeSection == BrowserSessions {
+				m.activeSection = Commands
+			} else {
+				m.activeSection = BrowserSessions
+			}
 		case "up", "k":
-			if m.cursor > 0 {
+			if m.cursor[m.activeSection] > 0 {
-				m.cursor--
+				m.cursor[m.activeSection]--
 			}
 		case "down", "j":
-			if m.cursor < len(m.choices)-1 {
+			if m.cursor[m.activeSection] < len(m.choices[m.activeSection])-1 {
-				m.cursor++
+				m.cursor[m.activeSection]++
 			}
 		case " ":
-			_, ok := m.selected[m.cursor]
+			_, ok := m.selected[m.activeSection][m.cursor[m.activeSection]]
 			if ok {
-				delete(m.selected, m.cursor)
+				delete(m.selected[m.activeSection], m.cursor[m.activeSection])
 			} else {
-				m.selected[m.cursor] = struct{}{}
+				m.selected[m.activeSection][m.cursor[m.activeSection]] = struct{}{}
 			}
 		case "enter":
 			return m, launch(m)
@@ -149,41 +164,33 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m model) View() string {
-	s := "\nLet's get started!\n\n"
+	s := "Let's get started!\n\n"
 
-	for i, choice := range m.choices {
+	for j := 0; j < 2; j++ {
+		for i, choice := range m.choices[j] {
 			cursor := " "
-		if m.cursor == i {
+			if m.cursor[j] == i {
 				cursor = ">"
 			}
 
 			checked := " "
-		if _, ok := m.selected[i]; ok {
+			if _, ok := m.selected[j][i]; ok {
 				checked = "x"
 			}
 
 			s += fmt.Sprintf("%s [%s] %s\n", cursor, checked, choice.displayString)
 		}
 		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 += "\nPress q to quit.\n"
-	s += "Press q to quit.\n"
 
 	return s
 }
 
 func main() {
-	logfilePath := os.Getenv("BREAKFAST_LOG")
-	if logfilePath == "" {
-		logfilePath = fmt.Sprintf("/tmp/%s_breakfast.log", time.Now().Local().Format("20060102150405-0700"))
-	}
-	f, err := tea.LogToFile(logfilePath, "DEBUG")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f.Close()
-
 	p := tea.NewProgram(initialModel())
 	if err := p.Start(); err != nil {
 		fmt.Printf("Alas, there's been an error: %v", err)