adam/breakfast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FIX #9 Clean up

Browse source 
- Remove comments
- Set default log file
- Remove unused enums
- Remove --group flag from bottom command
This commit is contained in:
Adam Cooper 2022-05-20 01:50:43 -04:00
parent f3e6d604c2
commit bd9cbc99b9
1 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
main.go
View file

@ -12,22 +12,16 @@ import (
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
) )
// Enum for the different launch types (browsers and CLI's)
const (
BrowserSessions int = iota
Commands
)
type commandChoice struct { type commandChoice struct {
displayString string displayString string
command *exec.Cmd command *exec.Cmd
} }
type Choices []commandChoice type choices []commandChoice
type model struct { type model struct {
cursor int cursor int
choices Choices choices choices
selected map[int]struct{} selected map[int]struct{}
status string status string
} }
@ -37,8 +31,6 @@ type statusMsg string
var selection map[int]struct{} var selection map[int]struct{}
func getBrowserSessions() []commandChoice { func getBrowserSessions() []commandChoice {
// 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)
@ -52,8 +44,6 @@ func getBrowserSessions() []commandChoice {
log.Printf("Error reading browser sessions directory: %v", err) log.Printf("Error reading browser sessions directory: %v", err)
return []commandChoice{} return []commandChoice{}
} }
// 2. Exclude non-YAML files
// 3. Wrangle them into this struct array
result := make([]commandChoice, 0) result := make([]commandChoice, 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") {
@ -64,7 +54,6 @@ func getBrowserSessions() []commandChoice {
}) })
} }
} }
// log.Printf("result: %v", result)
return result return result
} }
@ -75,7 +64,7 @@ func initialModel() model {
getBrowserSessions(), getBrowserSessions(),
commandChoice{ commandChoice{
displayString: "bottom", displayString: "bottom",
command: exec.Command("xterm", "-maximized", "-e", "btm", "--group", "--battery", "--color", "gruvbox-light"), command: exec.Command("xterm", "-maximized", "-e", "btm", "--battery", "--color", "gruvbox-light"),
}, },
commandChoice{ commandChoice{
displayString: "broot", displayString: "broot",
@ -103,7 +92,7 @@ func launch(m model) tea.Cmd {
var result statusMsg var result statusMsg
for q, item := range m.choices { for q, item := range m.choices {
if _, ok := m.selected[q]; ok { 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)) result += statusMsg(fmt.Sprintf("Launching command: %v\n", item.displayString))
err := item.command.Start() err := item.command.Start()
if err != nil { if err != nil {
@ -112,9 +101,7 @@ func launch(m model) tea.Cmd {
} }
} }
} }
time.Sleep(2000 * time.Millisecond) time.Sleep(2000 * time.Millisecond)
return result return result
} }
} }
@ -173,7 +160,6 @@ func (m model) View() string {
} }
s += "\n\n" 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"
@ -182,13 +168,12 @@ func (m model) View() string {
} }
func main() { func main() {
// Logging example from the Bubbletea "simple" example. For some logfilePath := os.Getenv("BREAKFAST_LOG")
// reason there's no file variable, and hence no file to `.Close()`. if logfilePath == "" {
logfilePath := os.Getenv("BUBBLETEA_LOG") logfilePath = fmt.Sprintf("/tmp/%s_breakfast.log", time.Now().Local().Format("20060102150405-0700"))
if logfilePath != "" { }
if _, err := tea.LogToFile(logfilePath, "DEBUG"); err != nil { if _, err := tea.LogToFile(logfilePath, "DEBUG"); err != nil {
log.Fatal(err) log.Fatal(err)
}
} }
p := tea.NewProgram(initialModel()) p := tea.NewProgram(initialModel())