feat: add E to edit config in nom

README.md

@@ -40,6 +40,8 @@ You can also add feeds with the `add` command:
 ```sh
 $ nom add <url>
 ```
+Feeds are editable within `nom` by pressing `E` to open the config in your `$EDITOR` or `$NOMEDITOR`. After editing feeds, you will need to then refresh with `r`.
+
 #### Youtube feeds
 To add youtube feeds you can go to a channel and run the following in the browser console to get the rss feed link:
 ```js

internal/commands/commands.go

@@ -22,11 +22,11 @@ import (
 )
 
 type Commands struct {
-	config config.Config
+	config *config.Config
 	store  store.Store
 }
 
-func New(config config.Config, store store.Store) Commands {
+func New(config *config.Config, store store.Store) Commands {
 	return Commands{config, store}
 }
 
@@ -152,11 +152,6 @@ func (c Commands) TUI() error {
 		defer f.Close()
 	}
 
-	err := c.CleanFeeds()
-	if err != nil {
-		return fmt.Errorf("commands List: %w", err)
-	}
-
 	its, err := c.GetAllFeeds()
 	if err != nil {
 		return fmt.Errorf("commands List: %w", err)
@@ -197,10 +192,6 @@ func (c Commands) TUI() error {
 }
 
 func (c Commands) List(numResults int) error {
-	err := c.CleanFeeds()
-	if err != nil {
-		return fmt.Errorf("commands List: %w", err)
-	}
 	its, err := c.GetAllFeeds()
 	if err != nil {
 		return fmt.Errorf("commands List: %w", err)
@@ -309,6 +300,11 @@ func includes[T comparable](arr []T, item T) bool {
 }
 
 func (c Commands) GetAllFeeds() ([]store.Item, error) {
+	err := c.CleanFeeds()
+	if err != nil {
+		return []store.Item{}, fmt.Errorf("[commands.go] GetAllFeeds: %w", err)
+	}
+
 	is, err := c.store.GetAllItems()
 	if err != nil {
 		return []store.Item{}, fmt.Errorf("commands.go: GetAllFeeds %w", err)
@@ -372,47 +368,8 @@ func fetchFeed(ch chan FetchResultError, wg *sync.WaitGroup, feed config.Feed, v
 	ch <- FetchResultError{res: r, err: nil, url: feed.URL}
 }
 
-func (c Commands) GetArticleByID(ID int) (store.Item, error) {
-	items, err := c.GetAllFeeds()
-	if err != nil {
-		return store.Item{}, fmt.Errorf("commands.FindArticle: %w", err)
-	}
-
-	var item store.Item
-	for _, it := range items {
-		if it.ID == ID {
-			item = it
-			break
-		}
-	}
-
-	return item, nil
-}
-
-func (c Commands) FindArticle(substr string) (item store.Item, err error) {
-	items, err := c.GetAllFeeds()
-	if err != nil {
-		return store.Item{}, fmt.Errorf("commands.FindArticle: %w", err)
-	}
-
-	regex, err := regexp.Compile(strings.ToLower(substr))
-	if err != nil {
-		return store.Item{}, fmt.Errorf("commands.FindArticle: regexp: %w", err)
-	}
-
-	for _, it := range items {
-		// very basic string matching on title to read an article
-		if regex.MatchString(strings.ToLower(it.Title)) {
-			item = it
-			break
-		}
-	}
-
-	return item, nil
-}
-
 func (c Commands) GetGlamourisedArticle(ID int) (string, error) {
-	article, err := c.GetArticleByID(ID)
+	article, err := c.store.GetItemByID(ID)
 	if err != nil {
 		return "", fmt.Errorf("commands.FindGlamourisedArticle: %w", err)
 	}

internal/commands/key.go

@@ -22,6 +22,7 @@ type ListKeyMapT struct {
 	oCancelWhileFiltering key.Binding
 	oNextPage             key.Binding
 	oPrevPage             key.Binding
+	EditConfig            key.Binding
 }
 
 // ViewportKeyMapT shows *all* keybinds, pulling from viewport.DefaultKeyMap()
@@ -71,6 +72,10 @@ var ListKeyMap = ListKeyMapT{
 		key.WithKeys("o"),
 		key.WithHelp("o", "open in browser"),
 	),
+	EditConfig: key.NewBinding(
+		key.WithKeys("E"),
+		key.WithHelp("E", "edit config in $EDITOR"),
+	),
 	// o for override
 	oQuit: key.NewBinding(
 		key.WithKeys("q", "esc"),
@@ -162,7 +167,7 @@ func (k ListKeyMapT) FullHelp() []key.Binding {
 	return []key.Binding{
 		k.Open, k.Read, k.Favourite, k.Refresh,
 		k.OpenInBrowser, k.ToggleFavourites, k.ToggleReads,
-		k.MarkAllRead,
+		k.MarkAllRead, k.EditConfig,
 	}
 }
 

internal/commands/tui.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"regexp"
 	"sort"
 	"strings"
@@ -106,7 +107,7 @@ type model struct {
 	selectedArticle *int
 	viewport        viewport.Model
 	errors          []string
-	cfg             config.Config
+	cfg             *config.Config
 }
 
 func (m model) Init() tea.Cmd {
@@ -294,6 +295,29 @@ func updateList(msg tea.Msg, m model) (tea.Model, tea.Cmd) {
 				cmd = m.UpdateList()
 				cmds = append(cmds, cmd)
 			}
+		case key.Matches(msg, ListKeyMap.EditConfig):
+			// open editor with config file
+			// take output of editor and put into file
+			//
+			filePath := m.cfg.ConfigPath
+
+			cmd := strings.Split(getEditor("NOMEDITOR", "EDITOR"), " ")
+			cmd = append(cmd, filePath)
+
+			execCmd := exec.Command(cmd[0], cmd[1:]...)
+			return m, tea.ExecProcess(execCmd, func(err error) tea.Msg {
+				if err != nil {
+					m.list.NewStatusMessage(err.Error())
+					return nil
+				}
+
+				err = m.cfg.Load()
+				if err != nil {
+					m.list.NewStatusMessage(err.Error())
+					return nil
+				}
+				return nil
+			})
 		}
 	}
 
@@ -567,7 +591,7 @@ func CustomFilter(term string, targets []string) []list.Rank {
 
 const defaultTitle = "nom"
 
-func Render(items []list.Item, cmds Commands, errors []string, cfg config.Config) error {
+func Render(items []list.Item, cmds Commands, errors []string, cfg *config.Config) error {
 	const defaultWidth = 20
 	_, ts, _ := term.GetSize(int(os.Stdout.Fd()))
 	_, y := appStyle.GetFrameSize()
@@ -604,3 +628,14 @@ func Render(items []list.Item, cmds Commands, errors []string, cfg config.Config
 
 	return nil
 }
+
+func getEditor(vars ...string) string {
+	for _, e := range vars {
+		val := os.Getenv(e)
+		if val != "" {
+			return val
+		}
+	}
+
+	return "nano"
+}

internal/config/config.go

@@ -49,7 +49,7 @@ type Theme struct {
 
 // need to add to Load() below if loading from config file
 type Config struct {
-	configPath     string
+	ConfigPath     string
 	ShowFavourites bool
 	Version        string
 	ConfigDir      string `yaml:"-"`
@@ -72,13 +72,13 @@ func (c *Config) ToggleShowFavourites() {
 	c.ShowFavourites = !c.ShowFavourites
 }
 
-func New(configPath string, pager string, previewFeeds []string, version string) (Config, error) {
+func New(configPath string, pager string, previewFeeds []string, version string) (*Config, error) {
 	var configDir string
 
 	if configPath == "" {
 		userConfigDir, err := os.UserConfigDir()
 		if err != nil {
-			return Config{}, fmt.Errorf("config.New: %w", err)
+			return nil, fmt.Errorf("config.New: %w", err)
 		}
 
 		configDir = filepath.Join(userConfigDir, "nom")
@@ -95,8 +95,8 @@ func New(configPath string, pager string, previewFeeds []string, version string)
 		f = append(f, Feed{URL: feedURL})
 	}
 
-	return Config{
-		configPath:   configPath,
+	return &Config{
+		ConfigPath:   configPath,
 		ConfigDir:    configDir,
 		Pager:        pager,
 		Feeds:        []Feed{},
@@ -120,7 +120,7 @@ func (c *Config) Load() error {
 		return fmt.Errorf("config Load: %w", err)
 	}
 
-	rawData, err := os.ReadFile(c.configPath)
+	rawData, err := os.ReadFile(c.ConfigPath)
 	if err != nil {
 		return fmt.Errorf("config.Load: %w", err)
 	}
@@ -189,7 +189,7 @@ func (c *Config) Write() error {
 		return fmt.Errorf("config.Write: %w", err)
 	}
 
-	err = os.WriteFile(c.configPath, []byte(str), 0655)
+	err = os.WriteFile(c.ConfigPath, []byte(str), 0655)
 	if err != nil {
 		return fmt.Errorf("config.Write: %w", err)
 	}

internal/config/config_test.go

@@ -24,14 +24,14 @@ func TestNewDefault(t *testing.T) {
 	c, _ := New("", "", []string{}, "")
 	ucd, _ := os.UserConfigDir()
 
-	test.Equal(t, fmt.Sprintf("%s/nom/config.yml", ucd), c.configPath, "Wrong defaults set")
+	test.Equal(t, fmt.Sprintf("%s/nom/config.yml", ucd), c.ConfigPath, "Wrong defaults set")
 	test.Equal(t, fmt.Sprintf("%s/nom", ucd), c.ConfigDir, "Wrong default ConfigDir set")
 }
 
 func TestConfigCustomPath(t *testing.T) {
 	c, _ := New("foo/bar.yml", "", []string{}, "")
 
-	test.Equal(t, "foo/bar.yml", c.configPath, "Config path override not set")
+	test.Equal(t, "foo/bar.yml", c.ConfigPath, "Config path override not set")
 }
 
 func TestConfigDir(t *testing.T) {
@@ -43,7 +43,7 @@ func TestConfigDir(t *testing.T) {
 func TestNewOverride(t *testing.T) {
 	c, _ := New("foobar", "", []string{}, "")
 
-	test.Equal(t, "foobar", c.configPath, "Override not respected")
+	test.Equal(t, "foobar", c.ConfigPath, "Override not respected")
 }
 
 func TestPreviewFeedsOverrideFeedsFromConfigFile(t *testing.T) {
@@ -99,7 +99,7 @@ func TestConfigAddFeed(t *testing.T) {
 	c.AddFeed(Feed{URL: "foo"})
 
 	var actual Config
-	rawData, _ := os.ReadFile(c.configPath)
+	rawData, _ := os.ReadFile(c.ConfigPath)
 	_ = yaml.Unmarshal(rawData, &actual)
 
 	hasAdded := false

internal/store/store.go

@@ -33,6 +33,7 @@ func (i Item) Read() bool {
 type Store interface {
 	UpsertItem(item Item) error
 	GetAllItems() ([]Item, error)
+	GetItemByID(ID int) (Item, error)
 	GetAllFeedURLs() ([]string, error)
 	ToggleRead(ID int) error
 	MarkAllRead() error
@@ -289,3 +290,26 @@ func (sls SQLiteStore) DeleteByFeedURL(feedurl string, incFavourites bool) error
 
 	return nil
 }
+
+func (sls SQLiteStore) GetItemByID(ID int) (Item, error) {
+	var stmt *sql.Stmt
+	stmt, _ = sls.db.Prepare(`select id, feedurl, link, title, content, author, readat, favourite, publishedat, createdat, updatedat from items where id = ?;`)
+
+	var i Item
+	var readAtNull sql.NullTime
+	var publishedAtNull sql.NullTime
+	var linkNull sql.NullString
+
+	r := stmt.QueryRow(ID)
+
+	err := r.Scan(&i.ID, &i.FeedURL, &linkNull, &i.Title, &i.Content, &i.Author, &readAtNull, &i.Favourite, &publishedAtNull, &i.CreatedAt, &i.UpdatedAt)
+	if err != nil {
+		return Item{}, fmt.Errorf("[store.go] GetItemByID: %w", err)
+	}
+
+	i.Link = linkNull.String
+	i.ReadAt = readAtNull.Time
+	i.PublishedAt = publishedAtNull.Time
+
+	return i, nil
+}