Launch: Commit before refactor
This commit is contained in:
parent
a69342c27e
commit
96b5d98da2
1 changed files with 32 additions and 5 deletions
37
main.go
37
main.go
|
@ -5,6 +5,7 @@ import (
|
|||
"io/fs"
|
||||
"log"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
|
@ -76,8 +77,8 @@ func initialModel() model {
|
|||
choices: Choices{
|
||||
getBrowserSessions(),
|
||||
[]sessionOrCommand{{
|
||||
displayString: "neomutt",
|
||||
commandString: "neomutt",
|
||||
displayString: "newsboat",
|
||||
commandString: "newsboat",
|
||||
}, {
|
||||
displayString: "bottom",
|
||||
commandString: "btm --group --battery --color gruvbox-light",
|
||||
|
@ -90,8 +91,34 @@ func initialModel() model {
|
|||
}
|
||||
}
|
||||
|
||||
func launch() tea.Msg {
|
||||
return statusMsg("This is a test launch message.")
|
||||
func launch(m model) tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
var result statusMsg
|
||||
for j, item := range m.choices[0] {
|
||||
if _, ok := m.selected[0][j]; ok {
|
||||
cmd := exec.Command("qutebrowser", "--restore", item.displayString)
|
||||
err := cmd.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 starting browser session: %v\n", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for k, item := range m.choices[1] {
|
||||
if _, ok := m.selected[1][k]; ok {
|
||||
cmd := exec.Command("xterm", "-e", item.commandString)
|
||||
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)
|
||||
}
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
func (m model) Init() tea.Cmd {
|
||||
|
@ -129,7 +156,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||
m.selected[m.activeSection][m.cursor[m.activeSection]] = struct{}{}
|
||||
}
|
||||
case "enter":
|
||||
return m, launch
|
||||
return m, launch(m)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue