Merge branch 'main' into 008-quit-after-launch
This commit is contained in:
commit
7b55a29cea
2 changed files with 16 additions and 4 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -17,3 +17,6 @@ breakfast
|
||||||
|
|
||||||
# Go workspace file
|
# Go workspace file
|
||||||
go.work
|
go.work
|
||||||
|
|
||||||
|
# Logs
|
||||||
|
logs/
|
||||||
|
|
17
main.go
17
main.go
|
@ -43,9 +43,9 @@ func getBrowserSessions() []commandChoice {
|
||||||
log.Printf("Error finding user configuration directory: %v", err)
|
log.Printf("Error finding user configuration directory: %v", err)
|
||||||
return []commandChoice{}
|
return []commandChoice{}
|
||||||
}
|
}
|
||||||
log.Printf("INFO userConfigDir: %+v", userConfigDir)
|
log.Printf("userConfigDir: %+v", userConfigDir)
|
||||||
fileSystem := os.DirFS(userConfigDir)
|
fileSystem := os.DirFS(userConfigDir)
|
||||||
log.Printf("INFO fileSystem: %+v", fileSystem)
|
log.Printf("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)
|
||||||
|
@ -56,7 +56,7 @@ func getBrowserSessions() []commandChoice {
|
||||||
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") {
|
||||||
log.Printf("INFO %s", entry.Name())
|
log.Printf("%s", entry.Name())
|
||||||
result = append(result, commandChoice{
|
result = append(result, commandChoice{
|
||||||
displayString: fmt.Sprintf("Qutebrowser session: %s", strings.TrimSuffix(entry.Name(), ".yml")),
|
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")),
|
command: exec.Command("xterm", "-e", "qutebrowser", "--target", "window", "--restore", strings.TrimSuffix(entry.Name(), ".yml")),
|
||||||
|
@ -102,7 +102,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("INFO 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 {
|
||||||
|
@ -191,6 +191,15 @@ func (m model) View() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
// Logging example from the Bubbletea "simple" example. For some
|
||||||
|
// reason there's no file variable, and hence no file to `.Close()`.
|
||||||
|
logfilePath := os.Getenv("BUBBLETEA_LOG")
|
||||||
|
if logfilePath != "" {
|
||||||
|
if _, err := tea.LogToFile(logfilePath, "DEBUG"); err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
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