Update todo list

README.md

@@ -24,8 +24,8 @@ Parity with existing Python version
   * [x] delete
   * [x] execute
   * [x] require items to declare action support
-  * [ ] state files
+  * [x] state files
-  * [ ] source environment
+  * [x] source environment
   * [ ] working directory set
 * [ ] update web UI credentials
 * [ ] automatic crontab integration
@@ -34,10 +34,10 @@ Parity with existing Python version
 * [ ] source-level tt{s,d,l}
 * [ ] source batching
 * channels
-  * [ ] create
+  * [x] create
-  * [ ] edit
+  * [x] edit
   * [ ] rename
-  * [ ] delete
+  * [x] delete
 * feeds
   * [x] show items
   * [x] deactivate items
@@ -45,7 +45,7 @@ Parity with existing Python version
   * [ ] punt
   * [x] trigger actions
   * [x] add ad-hoc items
-  * [ ] show/hide deactivated items
+  * [x] show/hide deactivated items
   * [ ] show/hide tts items
   * [x] sort by time ?? created
   * [ ] paging

cmd/channel.go

@@ -7,7 +7,10 @@ import (
 var channelCmd = &cobra.Command{
 	Use:   "channel",
 	Short: "Manage channels",
-	Long: `
+	Long: `Manage channels.
+
+A channel is a group of sources that can be viewed together. Adding a source
+to a channel creates it and removing all sources from a channel deletes it.
 `,
 }
 

cmd/channelAdd.go

@@ -3,19 +3,43 @@ package cmd
 import (
 	"log"
 
+	"github.com/Jaculabilis/intake/core"
 	"github.com/spf13/cobra"
 )
 
 var channelAddCmd = &cobra.Command{
 	Use:   "add",
-	Short: "Create a channel",
+	Short: "Add a source to a channel",
-	Long: `
+	Long: `Add a source to a channel.
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		log.Fatal("not implemented")
+		channelAdd(stringArg(cmd, "channel"), stringArg(cmd, "source"))
 	},
 }
 
 func init() {
 	channelCmd.AddCommand(channelAddCmd)
+
+	channelAddCmd.Flags().StringP("channel", "c", "", "Channel name")
+	channelAddCmd.MarkFlagRequired("channel")
+
+	channelAddCmd.Flags().StringP("source", "s", "", "Source to add")
+	channelAddCmd.MarkFlagRequired("source")
+}
+
+func channelAdd(channel string, source string) {
+	if channel == "" {
+		log.Fatal("error: --channel is empty")
+	}
+	if source == "" {
+		log.Fatal("error: --source is empty")
+	}
+
+	db := openAndMigrateDb()
+
+	if err := core.AddSourceToChannel(db, channel, source); err != nil {
+		log.Fatalf("error: failed to add source to channel: %v", err)
+	}
+
+	log.Printf("Added source %s to channel %s", source, channel)
 }

cmd/channelDelete.go

@@ -3,19 +3,44 @@ package cmd
 import (
 	"log"
 
+	"github.com/Jaculabilis/intake/core"
 	"github.com/spf13/cobra"
 )
 
 var channelDeleteCmd = &cobra.Command{
-	Use:   "delete",
+	Use:     "remove",
-	Short: "Delete a channel",
+	Aliases: []string{"rm"},
-	Long: `
+	Short:   "Remove a source from a channel",
+	Long: `Remove a source from a channel.
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		log.Fatal("not implemented")
+		channelRemove(stringArg(cmd, "channel"), stringArg(cmd, "source"))
 	},
 }
 
 func init() {
 	channelCmd.AddCommand(channelDeleteCmd)
+
+	channelDeleteCmd.Flags().StringP("channel", "c", "", "Channel name")
+	channelDeleteCmd.MarkFlagRequired("channel")
+
+	channelDeleteCmd.Flags().StringP("source", "s", "", "Source to add")
+	channelDeleteCmd.MarkFlagRequired("source")
+}
+
+func channelRemove(channel string, source string) {
+	if channel == "" {
+		log.Fatal("error: --channel is empty")
+	}
+	if source == "" {
+		log.Fatal("error: --source is empty")
+	}
+
+	db := openAndMigrateDb()
+
+	if err := core.DeleteSourceFromChannel(db, channel, source); err != nil {
+		log.Fatalf("error: failed to remove source from channel: %v", err)
+	}
+
+	log.Printf("Removed source %s from channel %s", source, channel)
 }

cmd/channelEdit.go

@@ -1,21 +0,0 @@
-package cmd
-
-import (
-	"log"
-
-	"github.com/spf13/cobra"
-)
-
-var channelEditCmd = &cobra.Command{
-	Use:   "edit",
-	Short: "Edit a channel",
-	Long: `
-`,
-	Run: func(cmd *cobra.Command, args []string) {
-		log.Fatal("not implemented")
-	},
-}
-
-func init() {
-	channelCmd.AddCommand(channelEditCmd)
-}

cmd/channelList.go

@@ -0,0 +1,45 @@
+package cmd
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/Jaculabilis/intake/core"
+	"github.com/spf13/cobra"
+)
+
+var channelListCmd = &cobra.Command{
+	Use:     "list",
+	Aliases: []string{"ls"},
+	Short:   "List channels",
+	Long: `List channels.
+`,
+	Run: func(cmd *cobra.Command, args []string) {
+		channelList(stringArg(cmd, "channel"))
+	},
+}
+
+func init() {
+	channelCmd.AddCommand(channelListCmd)
+
+	channelListCmd.Flags().StringP("channel", "c", "", "List sources in a specific channel")
+}
+
+func channelList(channel string) {
+	db := openAndMigrateDb()
+
+	channelSources, err := core.GetSourcesInChannel(db)
+	if err != nil {
+		log.Fatalf("error: failed to get sources in channel: %v", err)
+	}
+
+	if channel == "" {
+		for channel := range channelSources {
+			fmt.Println(channel)
+		}
+	} else {
+		for _, source := range channelSources[channel] {
+			fmt.Println(source)
+		}
+	}
+}

core/action.go

@@ -42,6 +42,7 @@ func GetActionsForSource(db DB, source string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	var names []string
 	for rows.Next() {
 		var name string
@@ -51,6 +52,9 @@ func GetActionsForSource(db DB, source string) ([]string, error) {
 		}
 		names = append(names, name)
 	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
 	return names, nil
 }
 

core/channel.go

@@ -0,0 +1,67 @@
+package core
+
+func AddSourceToChannel(db DB, channel string, source string) error {
+	_, err := db.Exec(`
+		insert into channels (name, source)
+		values (?, ?)
+	`, channel, source)
+	return err
+}
+
+func DeleteSourceFromChannel(db DB, channel string, source string) error {
+	_, err := db.Exec(`
+		delete from channels
+		where name = ? and source = ?
+	`, channel, source)
+	return err
+}
+
+func GetSourcesInChannel(db DB) (map[string][]string, error) {
+	rows, err := db.Query(`
+		select name, source
+		from channels
+		order by name, source
+	`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	channelSources := make(map[string][]string)
+	for rows.Next() {
+		var name, source string
+		if err := rows.Scan(&name, &source); err != nil {
+			return nil, err
+		}
+		channelSources[name] = append(channelSources[name], source)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return channelSources, nil
+}
+
+func GetChannelsAndActiveCounts(db DB) (map[string]int, error) {
+	rows, err := db.Query(`
+		select c.name, count(i.id) as count
+		from channels c
+		left outer join items i on c.source = i.source and i.active = 1
+		group by c.name
+	`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	channelCounts := make(map[string]int)
+	for rows.Next() {
+		var name string
+		var count int
+		if err := rows.Scan(&name, &count); err != nil {
+			return nil, err
+		}
+		channelCounts[name] = count
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return channelCounts, nil
+}

core/channel_test.go

@@ -0,0 +1,78 @@
+package core
+
+import "testing"
+
+func TestChannel(t *testing.T) {
+	db := EphemeralDb(t)
+	if err := AddSource(db, "one"); err != nil {
+		t.Fatalf("failed to add source: %v", err)
+	}
+	if err := AddSource(db, "two"); err != nil {
+		t.Fatalf("failed to add source: %v", err)
+	}
+
+	// Add sources to channel
+	if err := AddSourceToChannel(db, "channel", "one"); err != nil {
+		t.Fatalf("failed to add source to channel: %v", err)
+	}
+	if err := AddSourceToChannel(db, "channel", "two"); err != nil {
+		t.Fatalf("failed to add source to channel: %v", err)
+	}
+
+	// Both sources are in the channel
+	sources, err := GetSourcesInChannel(db)
+	if err != nil {
+		t.Fatalf("failed to get sources in channel: %v", err)
+	}
+	if len(sources["channel"]) != 2 || sources["channel"][0] != "one" || sources["channel"][1] != "two" {
+		t.Fatalf("expected two sources, got %d: %v", len(sources), sources)
+	}
+
+	// Get sources in channel after deletion
+	if err := DeleteSourceFromChannel(db, "channel", "one"); err != nil {
+		t.Fatalf("failed to delete source from channel: %v", err)
+	}
+	sources, err = GetSourcesInChannel(db)
+	if err != nil {
+		t.Fatalf("failed to get sources in channel: %v", err)
+	}
+	if len(sources) != 1 || sources["channel"][0] != "two" {
+		t.Fatalf("unexpected sources in channel after deletion: %v", sources)
+	}
+	if err := AddSourceToChannel(db, "channel", "one"); err != nil {
+		t.Fatalf("failed to add source to channel: %v", err)
+	}
+
+	// Items on both sources appear in the channel
+	if err := AddItems(db, []Item{
+		{"one", "a", 0, true, "", "", "", "", 0, nil},
+		{"two", "b", 0, true, "", "", "", "", 0, nil},
+	}); err != nil {
+		t.Fatalf("failed to add items to one: %v", err)
+	}
+	if counts, err := GetChannelsAndActiveCounts(db); counts["channel"] != 2 || err != nil {
+		t.Fatalf("expected 2 active items in channel, got %d: %v", counts["channel"], err)
+	}
+
+	if _, err := DeactivateItem(db, "one", "a"); err != nil {
+		t.Fatalf("failed to deactivate item: %v", err)
+	}
+	if counts, err := GetChannelsAndActiveCounts(db); counts["channel"] != 1 || err != nil {
+		t.Fatalf("expected 1 active items in channel, got %d: %v", counts["channel"], err)
+	}
+
+	items, err := GetAllItemsForChannel(db, "channel")
+	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")
+	if err != nil {
+		t.Fatalf("failed to get all items in channel: %v", err)
+	}
+	if len(items) != 1 || items[0].Id != "b" {
+		t.Fatalf("expected one item, got %d: %v", len(items), items)
+	}
+}

core/env.go

@@ -14,6 +14,7 @@ func GetEnvs(db DB, source string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	var envs []string
 	for rows.Next() {
 		var name string
@@ -23,6 +24,9 @@ func GetEnvs(db DB, source string) ([]string, error) {
 		}
 		envs = append(envs, fmt.Sprintf("%s=%s", name, value))
 	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
 	return envs, nil
 }
 

core/items.go

@@ -128,6 +128,7 @@ func getItems(db DB, query string, args ...any) ([]Item, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	var items []Item
 	for rows.Next() {
 		var item Item
@@ -137,6 +138,9 @@ func getItems(db DB, query string, args ...any) ([]Item, error) {
 		}
 		items = append(items, item)
 	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
 	return items, nil
 }
 
@@ -198,3 +202,28 @@ func GetAllItemsForSource(db DB, source string) ([]Item, error) {
 		order by case when time = 0 then created else time end, id
 	`, source)
 }
+
+func GetActiveItemsForChannel(db DB, channel string) ([]Item, error) {
+	return getItems(db, `
+		select
+			i.source, i.id, i.created, i.active, i.title, i.author, i.body, i.link, i.time, json(i.action)
+		from items i
+		join channels c on i.source = c.source
+		where
+			c.name = ?
+		and i.active <> 0
+		order by case when i.time = 0 then i.created else i.time end, i.id
+	`, channel)
+}
+
+func GetAllItemsForChannel(db DB, channel string) ([]Item, error) {
+	return getItems(db, `
+		select
+			i.source, i.id, i.created, i.active, i.title, i.author, i.body, i.link, i.time, json(i.action)
+		from items i
+		join channels c on i.source = c.source
+		where
+			c.name = ?
+		order by case when i.time = 0 then i.created else i.time end, i.id
+	`, channel)
+}

core/migrations.go

@@ -23,6 +23,7 @@ func InitDatabase(db DB) error {
 	if err != nil {
 		return err
 	}
+	defer rows.Close()
 
 	var exists bool
 	for rows.Next() {
@@ -31,6 +32,9 @@ func InitDatabase(db DB) error {
 			return err
 		}
 	}
+	if err := rows.Err(); err != nil {
+		return err
+	}
 
 	if exists {
 		return nil
@@ -56,6 +60,7 @@ func GetPendingMigrations(db DB) (map[string]bool, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		var name string
 		err = rows.Scan(&name)
@@ -64,6 +69,9 @@ func GetPendingMigrations(db DB) (map[string]bool, error) {
 		}
 		complete[name] = true
 	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
 
 	return complete, nil
 }

core/source.go

@@ -25,6 +25,7 @@ func GetSources(db DB) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	var names []string
 	for rows.Next() {
 		var name string
@@ -33,6 +34,9 @@ func GetSources(db DB) ([]string, error) {
 		}
 		names = append(names, name)
 	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
 	return names, nil
 }
 

core/sql/0001_initial_schema.sql

@@ -31,3 +31,9 @@ create table items(
     primary key (source, id),
     foreign key (source) references sources (name) on delete cascade
 ) strict;
+create table channels(
+    name text not null,
+    source text not null,
+    unique (name, source) on conflict replace
+    foreign key (source) references sources (name) on delete cascade
+)

web/channel.go

@@ -0,0 +1,30 @@
+package web
+
+import (
+	"net/http"
+
+	"github.com/Jaculabilis/intake/core"
+	"github.com/Jaculabilis/intake/web/html"
+)
+
+func (env *Env) getChannel(writer http.ResponseWriter, req *http.Request) {
+	channel := req.PathValue("channel")
+
+	var items []core.Item
+	var err error
+	inactive := req.URL.Query().Get("inactive") == "1"
+	if inactive {
+		items, err = core.GetAllItemsForChannel(env.db, channel)
+	} else {
+		items, err = core.GetActiveItemsForChannel(env.db, channel)
+	}
+	if err != nil {
+		http.Error(writer, err.Error(), 500)
+		return
+	}
+
+	data := html.FeedData{
+		Items: items,
+	}
+	html.Feed(writer, data)
+}

web/html/home.html

@@ -1,6 +1,25 @@
 {{ define "title" }}Intake{{ end }}
 
 {{ define "content" -}}
+<article>
+<details open>
+<summary><span class="item-title">Channels</span></summary>
+{{ if .Channels }}
+{{ range .Channels }}
+<p><a href="/channel/{{ .Name }}">
+{{ if .Active }}
+{{ .Name }} ({{ .Active }})
+{{ else }}
+{{ .Name }}
+{{ end }}
+</a></p>
+{{ end }}
+{{ else }}
+<p>No channels found.</p>
+{{ end }}
+</details>
+</article>
+
 <article>
 <details>
 <summary><span class="item-title">Sources</span></summary>

web/html/html.go

@@ -57,12 +57,18 @@ func load(files ...string) *template.Template {
 
 var home = load("home.html")
 
+type ChannelData struct {
+	Name   string
+	Active int
+}
+
 type SourceData struct {
 	Name string
 }
 
 type HomeData struct {
-	Sources []SourceData
+	Channels []ChannelData
+	Sources  []SourceData
 }
 
 func Home(writer io.Writer, data HomeData) error {

web/main.go

@@ -31,6 +31,7 @@ func RunServer(db core.DB, addr string, port string) {
 	handleFunc("GET    /style.css", env.getStyle)
 	handleFunc("GET    /htmx.org@2.0.4.js", env.getScript)
 	handleFunc("GET    /source/{source}", env.getSource)
+	handleFunc("GET    /channel/{channel}", env.getChannel)
 	handleFunc("GET    /item/{source}/{id}", env.getItem)
 	handleFunc("DELETE /item/{source}/{id}", env.deleteItem)
 	handleFunc("POST   /item/{source}/{id}/action/{action}", env.doAction)

web/root.go

@@ -13,17 +13,27 @@ func (env *Env) getRoot(writer http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	names, err := core.GetSources(env.db)
+	sources, err := core.GetSources(env.db)
 	if err != nil {
 		http.Error(writer, err.Error(), 500)
 	}
-
+	var sourceData []html.SourceData
-	var sources []html.SourceData
+	for _, name := range sources {
-	for _, name := range names {
+		sourceData = append(sourceData, html.SourceData{Name: name})
-		sources = append(sources, html.SourceData{Name: name})
 	}
+
+	channels, err := core.GetChannelsAndActiveCounts(env.db)
+	if err != nil {
+		http.Error(writer, err.Error(), 500)
+	}
+	var channelData []html.ChannelData
+	for name, active := range channels {
+		channelData = append(channelData, html.ChannelData{Name: name, Active: active})
+	}
+
 	data := html.HomeData{
-		Sources: sources,
+		Channels: channelData,
+		Sources:  sourceData,
 	}
 	html.Home(writer, data)
 }

web/source.go

@@ -1,7 +1,6 @@
 package web
 
 import (
-	"log"
 	"net/http"
 
 	"github.com/Jaculabilis/intake/core"
@@ -18,7 +17,6 @@ func (env *Env) getSource(writer http.ResponseWriter, req *http.Request) {
 	var items []core.Item
 	var err error
 	inactive := req.URL.Query().Get("inactive") == "1"
-	log.Printf("inactive = %t", inactive)
 	if inactive {
 		items, err = core.GetAllItemsForSource(env.db, source)
 	} else {