Add paging links to web feed

README.md

@@ -98,7 +98,7 @@ Parity features
 
 * [x] web feed supports item TTS
 * [x] item punt
-* [ ] web feed paging
+* [x] web feed paging
 * [ ] web fetch
 * [ ] set a working directory for item actions
 * [ ] crontab integration

cmd/feed.go

@@ -53,20 +53,27 @@ func feed(
 		}
 
 		if showInactive {
-			items, err = core.GetAllItemsForSource(db, source)
+			items, err = core.GetAllItemsForSource(db, source, 0, core.DefaultFeedLimit)
 		} else {
-			items, err = core.GetActiveItemsForSource(db, source)
+			items, err = core.GetActiveItemsForSource(db, source, 0, core.DefaultFeedLimit)
 		}
 		if err != nil {
 			log.Fatalf("error: failed to fetch items from %s:, %v", source, err)
 		}
 	} else if channel != "" {
-		log.Fatal("error: unimplemented")
+		if showInactive {
+			items, err = core.GetAllItemsForChannel(db, channel, 0, core.DefaultFeedLimit)
+		} else {
+			items, err = core.GetActiveItemsForChannel(db, channel, 0, core.DefaultFeedLimit)
+		}
+		if err != nil {
+			log.Fatalf("error: failed to fetch items from %s:, %v", channel, err)
+		}
 	} else {
 		if showInactive {
-			items, err = core.GetAllItems(db)
+			items, err = core.GetAllItems(db, 0, core.DefaultFeedLimit)
 		} else {
-			items, err = core.GetAllActiveItems(db)
+			items, err = core.GetAllActiveItems(db, 0, core.DefaultFeedLimit)
 		}
 		if err != nil {
 			log.Fatalf("error: failed to fetch items: %v", err)

core/channel_test.go

@@ -61,14 +61,14 @@ func TestChannel(t *testing.T) {
 		t.Fatalf("expected 1 active items in channel, got %d: %v", counts["channel"], err)
 	}
 
-	items, err := GetAllItemsForChannel(db, "channel")
+	items, err := GetAllItemsForChannel(db, "channel", 0, -1)
 	if err != nil {
 		t.Fatalf("failed to get all items in channel: %v", err)
 	}
 	if len(items) != 2 || items[0].Id != "a" || items[1].Id != "b" {
 		t.Fatalf("expected two items, got %d: %v", len(items), items)
 	}
-	items, err = GetActiveItemsForChannel(db, "channel")
+	items, err = GetActiveItemsForChannel(db, "channel", 0, -1)
 	if err != nil {
 		t.Fatalf("failed to get all items in channel: %v", err)
 	}

core/db_test.go

@@ -99,7 +99,7 @@ func TestDeleteSourceCascade(t *testing.T) {
 		t.Fatalf("failed to add items: %v", err)
 	}
 
-	items, err := GetAllActiveItems(db)
+	items, err := GetAllActiveItems(db, 0, -1)
 	if err != nil {
 		t.Fatalf("failed to get active items: %v", err)
 	}
@@ -110,7 +110,7 @@ func TestDeleteSourceCascade(t *testing.T) {
 	if err := DeleteSource(db, "source1"); err != nil {
 		t.Fatal(err)
 	}
-	items, err = GetAllActiveItems(db)
+	items, err = GetAllActiveItems(db, 0, -1)
 	if err != nil {
 		t.Fatal(err)
 	}

core/items.go

@@ -192,26 +192,32 @@ func GetItem(db DB, source string, id string) (Item, error) {
 	return items[0], nil
 }
 
-func GetAllActiveItems(db DB) ([]Item, error) {
+var DefaultFeedLimit = 100
+
+func GetAllActiveItems(db DB, offset int, limit int) ([]Item, error) {
+	now := int(time.Now().Unix()) // TODO pass this value in
 	return getItems(db, `
 		select
 			source, id, created, active, title, author, body, link, time, ttl, ttd, tts, json(action)
 		from items
 		where active <> 0
+		and (tts = 0 or created + tts < ?)
 		order by case when time = 0 then created else time end, id
-	`)
+		limit ? offset ?
+	`, now, limit, offset)
 }
 
-func GetAllItems(db DB) ([]Item, error) {
+func GetAllItems(db DB, offset int, limit int) ([]Item, error) {
 	return getItems(db, `
 		select
 			source, id, created, active, title, author, body, link, time, ttl, ttd, tts, json(action)
 		from items
 		order by case when time = 0 then created else time end, id
-	`)
+		limit ? offset ?
+	`, limit, offset)
 }
 
-func GetActiveItemsForSource(db DB, source string) ([]Item, error) {
+func GetActiveItemsForSource(db DB, source string, offset int, limit int) ([]Item, error) {
 	now := int(time.Now().Unix()) // TODO pass this value in
 	return getItems(db, `
 		select
@@ -220,12 +226,13 @@ func GetActiveItemsForSource(db DB, source string) ([]Item, error) {
 		where
 			source = ?
 		and active <> 0
-		and created + tts < ?
+		and (tts = 0 or created + tts < ?)
 		order by case when time = 0 then created else time end, id
-	`, source, now)
+		limit ? offset ?
+	`, source, now, limit, offset)
 }
 
-func GetAllItemsForSource(db DB, source string) ([]Item, error) {
+func GetAllItemsForSource(db DB, source string, offset int, limit int) ([]Item, error) {
 	return getItems(db, `
 		select
 			source, id, created, active, title, author, body, link, time, ttl, ttd, tts, json(action)
@@ -233,10 +240,11 @@ func GetAllItemsForSource(db DB, source string) ([]Item, error) {
 		where
 			source = ?
 		order by case when time = 0 then created else time end, id
-	`, source)
+		limit ? offset ?
+	`, source, limit, offset)
 }
 
-func GetActiveItemsForChannel(db DB, channel string) ([]Item, error) {
+func GetActiveItemsForChannel(db DB, channel string, offset int, limit int) ([]Item, error) {
 	now := int(time.Now().Unix()) // TODO pass this value in
 	return getItems(db, `
 		select
@@ -246,12 +254,13 @@ func GetActiveItemsForChannel(db DB, channel string) ([]Item, error) {
 		where
 			c.name = ?
 		and i.active <> 0
-		and i.created + i.tts < ?
+		and (i.tts = 0 or i.created + i.tts < ?)
 		order by case when i.time = 0 then i.created else i.time end, i.id
-	`, channel, now)
+		limit ? offset ?
+	`, channel, now, limit, offset)
 }
 
-func GetAllItemsForChannel(db DB, channel string) ([]Item, error) {
+func GetAllItemsForChannel(db DB, channel string, offset int, limit int) ([]Item, error) {
 	return getItems(db, `
 		select
 			i.source, i.id, i.created, i.active, i.title, i.author, i.body, i.link, i.time, i.ttl, i.ttd, i.tts, json(i.action)
@@ -260,5 +269,6 @@ func GetAllItemsForChannel(db DB, channel string) ([]Item, error) {
 		where
 			c.name = ?
 		order by case when i.time = 0 then i.created else i.time end, i.id
-	`, channel)
+		limit ? offset ?
+	`, channel, limit, offset)
 }

core/items_test.go

@@ -33,11 +33,11 @@ func TestAddItem(t *testing.T) {
 
 	if err := AddItems(db, []Item{
 		{Source: "test", Id: "one", Active: true},
-		{"test", "two", 0, true, "title", "author", "body", "link", 123456, 1, 2, 3, nil},
+		{"test", "two", 0, true, "title", "author", "body", "link", 123456, 1, 2, -3, nil},
 	}); err != nil {
 		t.Fatalf("failed to add items: %v", err)
 	}
-	items, err := GetActiveItemsForSource(db, "test")
+	items, err := GetActiveItemsForSource(db, "test", 0, -1)
 	if err != nil {
 		t.Fatalf("failed to get active items: %v", err)
 	}
@@ -51,7 +51,7 @@ func TestAddItem(t *testing.T) {
 	if _, err = DeactivateItem(db, "test", "one"); err != nil {
 		t.Fatal(err)
 	}
-	items, err = GetActiveItemsForSource(db, "test")
+	items, err = GetActiveItemsForSource(db, "test", 0, -1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -59,7 +59,7 @@ func TestAddItem(t *testing.T) {
 		t.Fatal("should get one item")
 	}
 
-	items, err = GetAllItemsForSource(db, "test")
+	items, err = GetAllItemsForSource(db, "test", 0, -1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -83,7 +83,7 @@ func TestAddItem(t *testing.T) {
 		t.Fatal("expected no deletion")
 	}
 
-	items, err = GetAllItemsForSource(db, "test")
+	items, err = GetAllItemsForSource(db, "test", 0, -1)
 	if err != nil {
 		t.Fatal(err)
 	}

core/source.go

@@ -142,8 +142,8 @@ func updateWithFetchedItemsTx(
 	items []Item,
 	now time.Time,
 ) (int, int, error) {
-	// Get the existing items
-	existingItems, err := GetAllItemsForSource(db, source)
+	// Get all existing items
+	existingItems, err := GetAllItemsForSource(db, source, 0, -1)
 	if err != nil {
 		return 0, 0, err
 	}

core/source_test.go

@@ -124,7 +124,7 @@ func TestUpdateSourceTransaction(t *testing.T) {
 	}
 
 	// Failure should not add b
-	items, err := GetAllItemsForSource(db, "s")
+	items, err := GetAllItemsForSource(db, "s", 0, -1)
 	if err != nil {
 		t.Fatal(err)
 	}

test/test_items.sh

@@ -37,5 +37,12 @@ tmp/intake channel add -c all -s spook
 
 tmp/intake channel add -c none -s nothing
 
+tmp/intake source add -s page
+tmp/intake item add -s page --id 1 --title "Item 1" --body "This is the body of item 1"
+for i in $(seq 2 211); do
+    tmp/intake item add -s page --id $i --title "Item $i" --body "This is the body of item $i" 2>/dev/null
+done
+tmp/intake item add -s page --id 212 --title "Item 212" --body "This is the body of item 212"
+
 echo "hello" | tmp/intake passwd --stdin
 echo "hello" | tmp/intake passwd --stdin --verify

web/channel.go

@@ -10,13 +10,16 @@ import (
 func (env *Env) getChannel(writer http.ResponseWriter, req *http.Request) {
 	channel := req.PathValue("channel")
 
+	page := getQueryInt(req, "page", 1)
+	count := getQueryInt(req, "count", core.DefaultFeedLimit)
+	showHidden := getQueryInt(req, "hidden", 0)
+
 	var items []core.Item
 	var err error
-	inactive := req.URL.Query().Get("inactive") == "1"
-	if inactive {
-		items, err = core.GetAllItemsForChannel(env.db, channel)
+	if showHidden != 0 {
+		items, err = core.GetAllItemsForChannel(env.db, channel, (page-1)*count, count)
 	} else {
-		items, err = core.GetActiveItemsForChannel(env.db, channel)
+		items, err = core.GetActiveItemsForChannel(env.db, channel, (page-1)*count, count)
 	}
 	if err != nil {
 		http.Error(writer, err.Error(), 500)
@@ -24,7 +27,10 @@ func (env *Env) getChannel(writer http.ResponseWriter, req *http.Request) {
 	}
 
 	data := html.FeedData{
-		Items: items,
+		Items:      items,
+		ShowHidden: showHidden,
+		Page:       page,
+		Count:      count,
 	}
 	html.Feed(writer, data)
 }

web/html/feed.html

@@ -2,9 +2,17 @@
 
 {{ define "content" -}}
 <article class="center">
-<span class="feed-controls">
+<span class="feed-controls" style="display: flex; justify-content: space-between;">
+<a href="?hidden={{ .ShowHidden }}&page={{ page .Page -1 }}&count={{ .Count }}">&lt;--</a>
 <a href="/">Home</a>
-[<a href="?inactive=0">Active</a> | <a href="?inactive=1">All</a>]
+<span>
+    {{ if .ShowHidden -}}
+    [ <a href="?hidden=0&page={{ .Page }}&count={{ .Count }}">Active</a> | All ]
+    {{- else -}}
+    [ Active | <a href="?hidden=1&page={{ .Page }}&count={{ .Count }}">All</a> ]
+    {{- end }}
+</span>
+<a href="?hidden={{ .ShowHidden }}&page={{ page .Page 1 }}&count={{ .Count }}">--&gt;</a>
 </span>
 </article>
 

web/html/html.go

@@ -61,12 +61,21 @@ func massDeactivateVals(items []core.Item) string {
 	return string(vals)
 }
 
+func page(i int, delta int) int {
+	i = i + delta
+	if i < 1 {
+		return 1
+	}
+	return i
+}
+
 var funcs = template.FuncMap{
 	"raw":          rawHtml,
 	"dateFormat":   dateFormat,
 	"tsToDate":     tsToDate,
 	"until":        until,
 	"massDeacVars": massDeactivateVals,
+	"page":         page,
 }
 
 //go:embed intake.css
@@ -108,7 +117,10 @@ func Home(writer io.Writer, data HomeData) {
 var feed = load("feed.html", "item.html")
 
 type FeedData struct {
-	Items []core.Item
+	Items      []core.Item
+	ShowHidden int
+	Page       int
+	Count      int
 }
 
 func Feed(writer io.Writer, data FeedData) {

web/main.go

@@ -4,6 +4,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"strconv"
 
 	"github.com/Jaculabilis/intake/core"
 )
@@ -48,3 +49,13 @@ func RunServer(db core.DB, addr string, port string) {
 
 	log.Fatal(http.ListenAndServe(bind, nil))
 }
+
+func getQueryInt(req *http.Request, name string, def int) int {
+	s := req.URL.Query().Get(name)
+	i, err := strconv.Atoi(s)
+	if err != nil {
+		return def
+	} else {
+		return i
+	}
+}

web/source.go

@@ -14,13 +14,16 @@ func (env *Env) getSource(writer http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	page := getQueryInt(req, "page", 1)
+	count := getQueryInt(req, "count", core.DefaultFeedLimit)
+	showHidden := getQueryInt(req, "hidden", 0)
+
 	var items []core.Item
 	var err error
-	inactive := req.URL.Query().Get("inactive") == "1"
-	if inactive {
-		items, err = core.GetAllItemsForSource(env.db, source)
+	if showHidden != 0 {
+		items, err = core.GetAllItemsForSource(env.db, source, (page-1)*count, count)
 	} else {
-		items, err = core.GetActiveItemsForSource(env.db, source)
+		items, err = core.GetActiveItemsForSource(env.db, source, (page-1)*count, count)
 	}
 	if err != nil {
 		http.Error(writer, err.Error(), 500)
@@ -28,7 +31,10 @@ func (env *Env) getSource(writer http.ResponseWriter, req *http.Request) {
 	}
 
 	data := html.FeedData{
-		Items: items,
+		Items:      items,
+		ShowHidden: showHidden,
+		Page:       page,
+		Count:      count,
 	}
 	html.Feed(writer, data)
 }