Compare commits
No commits in common. "main" and "004-small-tweaks" have entirely different histories.
main
...
004-small-
2 changed files with 89 additions and 81 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -17,6 +17,3 @@ breakfast
|
||||||
|
|
||||||
# Go workspace file
|
# Go workspace file
|
||||||
go.work
|
go.work
|
||||||
|
|
||||||
# Logs
|
|
||||||
logs/
|
|
||||||
|
|
167
main.go
167
main.go
|
@ -1,7 +1,5 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
// Testing out tea; really, git and ssh
|
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
|
@ -9,105 +7,119 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
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
|
displayString string
|
||||||
command *exec.Cmd
|
command *exec.Cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
type choices []commandChoice
|
type Choices [][]sessionOrCommand
|
||||||
|
|
||||||
|
type SelectionSet map[int]struct{}
|
||||||
|
|
||||||
type model struct {
|
type model struct {
|
||||||
cursor int
|
activeSection int
|
||||||
choices choices
|
cursor []int
|
||||||
selected map[int]struct{}
|
choices Choices
|
||||||
status string
|
selected []SelectionSet
|
||||||
|
status string
|
||||||
}
|
}
|
||||||
|
|
||||||
type statusMsg 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()
|
userConfigDir, err := os.UserConfigDir()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Error finding user configuration directory: %v", err)
|
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)
|
fileSystem := os.DirFS(userConfigDir)
|
||||||
log.Printf("fileSystem: %+v", fileSystem)
|
log.Printf("INFO fileSystem: %+v", fileSystem)
|
||||||
fileList, err := fs.ReadDir(fileSystem, "local/share/qutebrowser/sessions")
|
fileList, err := fs.ReadDir(fileSystem, "local/share/qutebrowser/sessions")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Error reading browser sessions directory: %v", err)
|
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 {
|
for _, entry := range fileList {
|
||||||
if !entry.IsDir() && strings.HasSuffix(entry.Name(), ".yml") {
|
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: fmt.Sprintf("Qutebrowser session: %s", strings.TrimSuffix(entry.Name(), ".yml")),
|
displayString: strings.TrimSuffix(entry.Name(), ".yml"),
|
||||||
command: exec.Command("xterm", "-e", "qutebrowser", "--target", "window", "--restore", strings.TrimSuffix(entry.Name(), ".yml")),
|
command: exec.Command("qutebrowser", "--restore", strings.TrimSuffix(entry.Name(), ".yml")),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// log.Printf("result: %v", result)
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
func initialModel() model {
|
func initialModel() model {
|
||||||
|
browserSelection = make(SelectionSet)
|
||||||
|
commandSelection = make(SelectionSet)
|
||||||
return model{
|
return model{
|
||||||
cursor: 0,
|
activeSection: BrowserSessions,
|
||||||
choices: append(
|
cursor: []int{0, 0},
|
||||||
|
choices: Choices{
|
||||||
getBrowserSessions(),
|
getBrowserSessions(),
|
||||||
commandChoice{
|
[]sessionOrCommand{{
|
||||||
displayString: "bottom",
|
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",
|
displayString: "broot",
|
||||||
command: exec.Command("xterm", "-maximized", "-e", "broot"),
|
command: exec.Command("xterm", "-maximized", "-e", "broot"),
|
||||||
},
|
}, {
|
||||||
commandChoice{
|
|
||||||
displayString: "joplin",
|
displayString: "joplin",
|
||||||
command: exec.Command("xterm", "-maximized", "-e", "joplin"),
|
command: exec.Command("xterm", "-maximized", "-e", "joplin"),
|
||||||
},
|
}, {
|
||||||
commandChoice{
|
|
||||||
displayString: "neomutt",
|
displayString: "neomutt",
|
||||||
command: exec.Command("xterm", "-maximized", "-e", "neomutt"),
|
command: exec.Command("xterm", "-maximized", "-e", "neomutt"),
|
||||||
},
|
}, {
|
||||||
commandChoice{
|
|
||||||
displayString: "newsboat",
|
displayString: "newsboat",
|
||||||
command: exec.Command("xterm", "-maximized", "-e", "newsboat"),
|
command: exec.Command("xterm", "-maximized", "-e", "newsboat"),
|
||||||
},
|
}},
|
||||||
commandChoice{
|
},
|
||||||
displayString: "w3m",
|
// An array of maps which indicates which choices are selected.
|
||||||
command: exec.Command("xterm", "-maximized", "-e", "w3m", "https://languagehat.com/"),
|
// We're using the map like a mathematical set. The keys refer to
|
||||||
},
|
// the indexes of the `choices` slice, above.
|
||||||
),
|
selected: []SelectionSet{browserSelection, commandSelection},
|
||||||
selected: make(map[int]struct{}),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func launch(m model) tea.Cmd {
|
func launch(m model) tea.Cmd {
|
||||||
return func() tea.Msg {
|
return func() tea.Msg {
|
||||||
var result statusMsg
|
var result statusMsg
|
||||||
for q, item := range m.choices {
|
for p := 0; p < 2; p++ {
|
||||||
if _, ok := m.selected[q]; ok {
|
for q, item := range m.choices[p] {
|
||||||
log.Printf("Launching: %v\n", item.displayString)
|
if _, ok := m.selected[p][q]; ok {
|
||||||
result += statusMsg(fmt.Sprintf("Launching command: %v\n", item.displayString))
|
log.Printf("INFO launching: %v\n", item.displayString)
|
||||||
err := item.command.Start()
|
result += statusMsg(fmt.Sprintf("Launching command: %v\n", item.displayString))
|
||||||
if err != nil {
|
err := item.command.Start()
|
||||||
result += statusMsg(fmt.Sprintf("%v\n", err))
|
if err != nil {
|
||||||
log.Fatalf("Error launching: %v\n", err)
|
result += statusMsg(fmt.Sprintf("%v\n", err))
|
||||||
|
log.Fatalf("Error launching: %v\n", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
time.Sleep(2000 * time.Millisecond)
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -125,20 +137,26 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
switch msg.String() {
|
switch msg.String() {
|
||||||
case "ctrl+c", "q":
|
case "ctrl+c", "q":
|
||||||
return m, tea.Quit
|
return m, tea.Quit
|
||||||
|
case "tab":
|
||||||
|
if m.activeSection == BrowserSessions {
|
||||||
|
m.activeSection = Commands
|
||||||
|
} else {
|
||||||
|
m.activeSection = BrowserSessions
|
||||||
|
}
|
||||||
case "up", "k":
|
case "up", "k":
|
||||||
if m.cursor > 0 {
|
if m.cursor[m.activeSection] > 0 {
|
||||||
m.cursor--
|
m.cursor[m.activeSection]--
|
||||||
}
|
}
|
||||||
case "down", "j":
|
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 " ":
|
case " ":
|
||||||
_, ok := m.selected[m.cursor]
|
_, ok := m.selected[m.activeSection][m.cursor[m.activeSection]]
|
||||||
if ok {
|
if ok {
|
||||||
delete(m.selected, m.cursor)
|
delete(m.selected[m.activeSection], m.cursor[m.activeSection])
|
||||||
} else {
|
} else {
|
||||||
m.selected[m.cursor] = struct{}{}
|
m.selected[m.activeSection][m.cursor[m.activeSection]] = struct{}{}
|
||||||
}
|
}
|
||||||
case "enter":
|
case "enter":
|
||||||
return m, launch(m)
|
return m, launch(m)
|
||||||
|
@ -149,23 +167,26 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m model) View() string {
|
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++ {
|
||||||
cursor := " "
|
for i, choice := range m.choices[j] {
|
||||||
if m.cursor == i {
|
cursor := " "
|
||||||
cursor = ">"
|
if m.cursor[j] == i {
|
||||||
|
cursor = ">"
|
||||||
|
}
|
||||||
|
|
||||||
|
checked := " "
|
||||||
|
if _, ok := m.selected[j][i]; ok {
|
||||||
|
checked = "x"
|
||||||
|
}
|
||||||
|
|
||||||
|
s += fmt.Sprintf("%s [%s] %s\n", cursor, checked, choice.displayString)
|
||||||
}
|
}
|
||||||
|
s += "\n\n"
|
||||||
checked := " "
|
|
||||||
if _, ok := m.selected[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 += fmt.Sprintf("%s\n", m.status)
|
||||||
s += "Press enter to launch.\n"
|
s += "Press enter to launch.\n"
|
||||||
s += "Press q to quit.\n"
|
s += "Press q to quit.\n"
|
||||||
|
@ -174,16 +195,6 @@ func (m model) View() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
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())
|
p := tea.NewProgram(initialModel())
|
||||||
if err := p.Start(); err != nil {
|
if err := p.Start(); err != nil {
|
||||||
fmt.Printf("Alas, there's been an error: %v", err)
|
fmt.Printf("Alas, there's been an error: %v", err)
|
||||||
|
|
Loading…
Reference in a new issue