Merge branch 'master' into feat/favorite-within-post

internal/commands/feeds.go

@@ -46,7 +46,7 @@ func (c Commands) GetAllFeeds() ([]store.Item, error) {
 		return []store.Item{}, fmt.Errorf("[commands.go] GetAllFeeds: %w", err)
 	}
 
-	is, err := c.store.GetAllItems()
+	is, err := c.store.GetAllItems(c.config.Ordering)
 	if err != nil {
 		return []store.Item{}, fmt.Errorf("commands.go: GetAllFeeds %w", err)
 	}

internal/commands/key.go

@@ -16,6 +16,7 @@ type ListKeyMapT struct {
 	ToggleFavourites      key.Binding
 	Refresh               key.Binding
 	OpenInBrowser         key.Binding
+	Sort                  key.Binding
 	oQuit                 key.Binding
 	oForceQuit            key.Binding
 	oClearFilter          key.Binding
@@ -73,6 +74,10 @@ var ListKeyMap = ListKeyMapT{
 		key.WithKeys("o"),
 		key.WithHelp("o", "open in browser"),
 	),
+	Sort: key.NewBinding(
+		key.WithKeys("s"),
+		key.WithHelp("s", "sort"),
+	),
 	EditConfig: key.NewBinding(
 		key.WithKeys("E"),
 		key.WithHelp("E", "edit config in $EDITOR"),
@@ -171,7 +176,7 @@ func (k ViewportKeyMapT) ShortHelp() []key.Binding {
 func (k ListKeyMapT) FullHelp() []key.Binding {
 	return []key.Binding{
 		k.Open, k.Read, k.Favourite, k.Refresh,
-		k.OpenInBrowser, k.ToggleFavourites, k.ToggleReads,
+		k.OpenInBrowser, k.Sort, k.ToggleFavourites, k.ToggleReads,
 		k.MarkAllRead, k.EditConfig,
 	}
 }

internal/commands/list.go

@@ -13,6 +13,7 @@ import (
 	"github.com/charmbracelet/lipgloss"
 
 	"github.com/guyfedwards/nom/v2/internal/config"
+	"github.com/guyfedwards/nom/v2/internal/constants"
 	"github.com/guyfedwards/nom/v2/internal/store"
 )
 
@@ -91,6 +92,25 @@ func (m *model) UpdateList() tea.Cmd {
 	return cmd
 }
 
+func sortList(m model) func() tea.Msg {
+	return func() tea.Msg {
+		// reverse sorting order
+		if m.commands.config.Ordering == constants.AscendingOrdering {
+			m.commands.config.Ordering = constants.DescendingOrdering
+		} else {
+			m.commands.config.Ordering = constants.AscendingOrdering
+		}
+
+		items, err := m.commands.GetAllFeeds()
+		if err != nil {
+			m.errors = []string{err.Error()}
+		}
+		return listUpdate{
+			items: convertItems(items),
+		}
+	}
+}
+
 func refreshList(m model) func() tea.Msg {
 	return func() tea.Msg {
 		var errorItems []ErrorItem
@@ -232,6 +252,17 @@ func updateList(msg tea.Msg, m model) (tea.Model, tea.Cmd) {
 			cmd = m.commands.OpenLink(current.URL)
 			cmds = append(cmds, cmd)
 
+		case key.Matches(msg, ListKeyMap.Sort):
+			if m.list.SettingFilter() || m.list.IsFiltered() {
+				break
+			}
+
+			if len(m.list.Items()) == 0 {
+				return m, m.list.NewStatusMessage("No items to sort.")
+			}
+
+			cmds = append(cmds, sortList(m))
+
 		case key.Matches(msg, ListKeyMap.Open):
 			if m.list.SettingFilter() {
 				m.list.FilterInput.Blur()

internal/config/config.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/guyfedwards/nom/v2/internal/constants"
 	"gopkg.in/yaml.v3"
 )
 
@@ -57,6 +58,7 @@ type Config struct {
 	ConfigDir      string `yaml:"-"`
 	Pager          string `yaml:"pager,omitempty"`
 	Feeds          []Feed `yaml:"feeds"`
+	Ordering       string `yaml:"ordering"`
 	// Preview feeds are distinguished from Feeds because we don't want to inadvertenly write those into the config file.
 	PreviewFeeds []Feed       `yaml:"previewfeeds,omitempty"`
 	Backends     *Backends    `yaml:"backends,omitempty"`
@@ -110,6 +112,7 @@ func New(configPath string, pager string, previewFeeds []string, version string)
 			TitleColor:        "62",
 			FilterColor:       "62",
 		},
+		Ordering: constants.DefaultOrdering,
 		HTTPOptions: &HTTPOptions{
 			MinTLSVersion: tls.VersionName(tls.VersionTLS12),
 		},
@@ -150,6 +153,10 @@ func (c *Config) Load() error {
 		c.HTTPOptions = fileConfig.HTTPOptions
 	}
 
+	if len(fileConfig.Ordering) > 0 {
+		c.Ordering = fileConfig.Ordering
+	}
+
 	if fileConfig.Theme.Glamour != "" {
 		c.Theme.Glamour = fileConfig.Theme.Glamour
 	}

internal/config/config_test.go

@@ -73,6 +73,10 @@ func TestConfigLoad(t *testing.T) {
 	if len(c.Feeds) != 3 || c.Feeds[0].URL != "cattle" {
 		t.Fatalf("Parsing failed")
 	}
+
+	if len(c.Ordering) == 0 || c.Ordering != "desc" {
+		t.Fatalf("Parsing failed")
+	}
 }
 
 func TestConfigLoadPrecidence(t *testing.T) {

internal/constants/store.go

@@ -0,0 +1,8 @@
+package constants
+
+// Store constants
+const (
+	AscendingOrdering  = "asc"
+	DescendingOrdering = "desc"
+	DefaultOrdering    = AscendingOrdering
+)

internal/store/store.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/guyfedwards/nom/v2/internal/constants"
 	_ "github.com/mattn/go-sqlite3"
 )
 
@@ -32,7 +33,7 @@ func (i Item) Read() bool {
 
 type Store interface {
 	UpsertItem(item Item) error
-	GetAllItems() ([]Item, error)
+	GetAllItems(ordering string) ([]Item, error)
 	GetItemByID(ID int) (Item, error)
 	GetAllFeedURLs() ([]string, error)
 	ToggleRead(ID int) error
@@ -184,11 +185,19 @@ func (sls SQLiteStore) UpsertItem(item Item) error {
 }
 
 // TODO: pagination
-func (sls SQLiteStore) GetAllItems() ([]Item, error) {
-	stmt := `
-		select id, feedurl, link, title, content, author, readat, favourite, publishedat, createdat, updatedat from items order by coalesce(publishedat, createdat);
+func (sls SQLiteStore) GetAllItems(ordering string) ([]Item, error) {
+	itemStmt := `
+		select id, feedurl, link, title, content, author, readat, favourite, publishedat, createdat, updatedat from items order by coalesce(publishedat, createdat) %s;
 	`
 
+	var stmt string
+	switch ordering {
+	case constants.DescendingOrdering:
+		stmt = fmt.Sprintf(itemStmt, constants.DescendingOrdering)
+	default:
+		stmt = fmt.Sprintf(itemStmt, constants.DefaultOrdering)
+	}
+
 	rows, err := sls.db.Query(stmt)
 	if err != nil {
 		return []Item{}, fmt.Errorf("store.go: GetAllItems: %w", err)

internal/test/data/config_fixture.yml

@@ -2,3 +2,4 @@ feeds:
   - url: cattle
   - url: bird
   - url: dog
+ordering: desc