Merge branch 'main' of https://github.com/knipferrc/fm

README.md

@@ -54,6 +54,7 @@ go install github.com/knipferrc/fm@latest
 - Themes (default, gruvbox, spooky)
 - Render PNG, JPG and JPEG as strings
 - Colors adapt to terminal background
+- Open selected file in editor set in EDITOR environment variable (currently only supports GUI editors)
 
 ## Themes
 
@@ -103,6 +104,7 @@ go install github.com/knipferrc/fm@latest
 | n          | Create a new file in the current directory                                                                                                                                                                                                                       |
 | N          | Create a new directory in the current directory                                                                                                                                                                                                                  |
 | r          | Rename the currently selected file or directory                                                                                                                                                                                                                  |
+| E          | Open in editor set in EDITOR environment variable                                                                                                                                                                                                                |
 
 ## Configuration
 

internal/ui/keys.go

@@ -26,6 +26,7 @@ type keyMap struct {
 	CreateFile            key.Binding
 	CreateDirectory       key.Binding
 	Rename                key.Binding
+	EditFile              key.Binding
 }
 
 // ShortHelp returns keybindings to be shown in the mini help view. It's part
@@ -54,6 +55,7 @@ func (k keyMap) ShortHelp() []key.Binding {
 		k.CreateFile,
 		k.CreateDirectory,
 		k.Rename,
+		k.EditFile,
 	}
 }
 
@@ -84,6 +86,7 @@ func (k keyMap) FullHelp() [][]key.Binding {
 			k.CreateFile,
 			k.CreateDirectory,
 			k.Rename,
+			k.EditFile,
 		},
 	}
 }
@@ -179,5 +182,9 @@ func getDefaultKeyMap() keyMap {
 			key.WithKeys("r"),
 			key.WithHelp("r", "rename the currently selected file or directory"),
 		),
+		EditFile: key.NewBinding(
+			key.WithKeys("E"),
+			key.WithHelp("E", "edit the currently selected file"),
+		),
 	}
 }

internal/ui/update.go

@@ -1,8 +1,10 @@
 package ui
 
 import (
+	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 
 	"github.com/knipferrc/fm/dirfs"
 
@@ -517,6 +519,31 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				)
 			}
 
+		// Edit the currently selected file.
+		case key.Matches(msg, m.keys.EditFile):
+			if !m.showCommandBar && m.primaryPane.GetIsActive() && !m.dirTree.GetSelectedFile().IsDir() {
+				editorPath := os.Getenv("EDITOR")
+				if editorPath == "" {
+					return m, m.handleErrorCmd(errors.New("$EDITOR not set"))
+				}
+
+				editorCmd := exec.Command(editorPath, m.dirTree.GetSelectedFile().Name())
+				editorCmd.Stdin = os.Stdin
+				editorCmd.Stdout = os.Stdout
+				editorCmd.Stderr = os.Stderr
+				err := editorCmd.Start()
+				if err != nil {
+					return m, m.handleErrorCmd(err)
+				}
+
+				err = editorCmd.Wait()
+				if err != nil {
+					return m, m.handleErrorCmd(err)
+				}
+			}
+
+			return m, m.updateDirectoryListingCmd(dirfs.CurrentDirectory)
+
 		// Reset FM to its initial state.
 		case key.Matches(msg, m.keys.Escape):
 			m.showCommandBar = false