README.md

@@ -110,11 +110,11 @@ Parity features
 * [x] crontab integration
 * [ ] source batching
 * [x] add item from web
-* [x] web edit channels
+* [ ] web edit channels
 * web edit sources
-  * [x] edit action argv
+  * [ ] edit action argv
-  * [x] edit source envs
+  * [ ] edit source envs
-  * [x] edit source crontab
+  * [ ] edit source crontab
 * [x] Nix build
 * [ ] NixOS module
 * [ ] NixOS vm demo

cmd/actionAdd.go

@@ -27,8 +27,6 @@ func init() {
 	actionAddCmd.MarkFlagRequired("action")
 }
 
-// TODO: This is a duplicate of `action edit`, the action CLI should be simplified
-
 func actionAdd(source string, action string, argv []string) {
 	if source == "" {
 		log.Fatal("error: --source is empty")
@@ -42,7 +40,7 @@ func actionAdd(source string, action string, argv []string) {
 
 	db := openAndMigrateDb()
 
-	err := core.SetAction(db, source, action, argv)
+	err := core.AddAction(db, source, action, argv)
 	if err != nil {
 		log.Fatalf("error: failed to add action: %v", err)
 	}

cmd/actionEdit.go

@@ -40,7 +40,7 @@ func actionEdit(source string, action string, argv []string) {
 
 	db := openAndMigrateDb()
 
-	err := core.SetAction(db, source, action, argv)
+	err := core.UpdateAction(db, source, action, argv)
 	if err != nil {
 		log.Fatalf("error: failed to update action: %v", err)
 	}

core/action.go

@@ -16,7 +16,7 @@ func (a *argList) Scan(value interface{}) error {
 	return json.Unmarshal([]byte(value.(string)), a)
 }
 
-func SetAction(db DB, source string, name string, argv []string) error {
+func AddAction(db DB, source string, name string, argv []string) error {
 	_, err := db.Exec(`
 		insert into actions (source, name, argv)
 		values (?, ?, jsonb(?))
@@ -24,6 +24,15 @@ func SetAction(db DB, source string, name string, argv []string) error {
 	return err
 }
 
+func UpdateAction(db DB, source string, name string, argv []string) error {
+	_, err := db.Exec(`
+		update actions
+		set argv = jsonb(?)
+		where source = ? and name = ?
+	`, argList(argv), source, name)
+	return err
+}
+
 func GetActionsForSource(db DB, source string) ([]string, error) {
 	rows, err := db.Query(`
 		select name

core/action_test.go

@@ -7,7 +7,7 @@ import (
 func TestActionCreate(t *testing.T) {
 	db := EphemeralDb(t)
 
-	if err := SetAction(db, "test", "hello", []string{"echo", "hello"}); err == nil {
+	if err := AddAction(db, "test", "hello", []string{"echo", "hello"}); err == nil {
 		t.Fatal("Action created for nonexistent source")
 	}
 
@@ -15,13 +15,13 @@ func TestActionCreate(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if err := SetAction(db, "test", "hello", []string{"echo", "hello"}); err != nil {
+	if err := AddAction(db, "test", "hello", []string{"echo", "hello"}); err != nil {
 		t.Fatal(err)
 	}
-	if err := SetAction(db, "test", "goodbye", []string{"exit", "1"}); err != nil {
+	if err := AddAction(db, "test", "goodbye", []string{"exit", "1"}); err != nil {
 		t.Fatal(err)
 	}
-	if err := SetAction(db, "test", "goodbye", []string{"echo", "goodbye"}); err != nil {
+	if err := UpdateAction(db, "test", "goodbye", []string{"echo", "goodbye"}); err != nil {
 		t.Fatal(err)
 	}
 

core/channel_test.go

@@ -36,7 +36,7 @@ func TestChannel(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to get sources in channel: %v", err)
 	}
-	if len(sources["channel"]) != 1 || sources["channel"][0] != "two" {
+	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 {

core/db_test.go

@@ -104,7 +104,7 @@ func TestDeleteSourceCascade(t *testing.T) {
 		t.Fatalf("failed to get active items: %v", err)
 	}
 	if len(items) != 2 {
-		t.Fatalf("Expected 2 items, got %d", len(items))
+		t.Fatal("Expected 2 items")
 	}
 
 	if err := DeleteSource(db, "source1"); err != nil {

core/env.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-func GetEnvs(db DB, source string) (envs []string, err error) {
+func GetEnvs(db DB, source string) ([]string, error) {
 	rows, err := db.Query(`
 		select name, value
 		from envs
@@ -15,43 +15,19 @@ func GetEnvs(db DB, source string) (envs []string, err error) {
 		return nil, err
 	}
 	defer rows.Close()
+	var envs []string
 	for rows.Next() {
 		var name string
 		var value string
-		if err = rows.Scan(&name, &value); err != nil {
+		if err := rows.Scan(&name, &value); err != nil {
 			return nil, err
 		}
 		envs = append(envs, fmt.Sprintf("%s=%s", name, value))
 	}
-	if err = rows.Err(); err != nil {
+	if err := rows.Err(); err != nil {
 		return nil, err
 	}
-	return
+	return envs, nil
-}
-
-func GetEnvsMap(db DB, source string) (envs map[string]string, err error) {
-	rows, err := db.Query(`
-		select name, value
-		from envs
-		where source = ?
-	`, source)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	envs = make(map[string]string)
-	for rows.Next() {
-		var name string
-		var value string
-		if err = rows.Scan(&name, &value); err != nil {
-			return nil, err
-		}
-		envs[name] = value
-	}
-	if err = rows.Err(); err != nil {
-		return nil, err
-	}
-	return
 }
 
 func SetEnvs(db DB, source string, envs []string) error {

core/source_test.go

@@ -141,7 +141,7 @@ func TestOnCreateAction(t *testing.T) {
 	if err := AddSource(db, "test"); err != nil {
 		t.Fatal(err)
 	}
-	if err := SetAction(db, "test", "on_create", []string{"true"}); err != nil {
+	if err := AddAction(db, "test", "on_create", []string{"true"}); err != nil {
 		t.Fatal(err)
 	}
 
@@ -164,7 +164,7 @@ func TestOnCreateAction(t *testing.T) {
 
 	onCreate := func(argv []string) {
 		t.Helper()
-		if err := SetAction(db, "test", "on_create", argv); err != nil {
+		if err := UpdateAction(db, "test", "on_create", argv); err != nil {
 			t.Fatal(err)
 		}
 	}

core/sql/0001_initial_schema.sql

@@ -7,7 +7,7 @@ create table actions(
     source text not null,
     name text not null,
     argv blob not null,
-    unique (source, name) on conflict replace,
+    primary key (source, name),
     foreign key (source) references sources (name) on delete cascade
 ) strict;
 create table envs(
@@ -52,10 +52,10 @@ create table sessions(
 ) strict;
 
 -- user introduction
--- insert into sources (name) values ('default');
+insert into sources (name) values ('default');
--- insert into channels (name, source) values ('home', 'default');
+insert into channels (name, source) values ('home', 'default');
--- insert into actions (source, name, argv) values ('default', 'fetch', jsonb('["true"]'));
+insert into actions (source, name, argv) values ('default', 'fetch', jsonb('["true"]'));
--- insert into items (source, id, active, title, author, body, link, time, ttl, ttd, tts, action)
+insert into items (source, id, active, title, author, body, link, time, ttl, ttd, tts, action)
---     values ('default', 'welcome', 1, 'Welcome to intake!', 'intake',
+    values ('default', 'welcome', 1, 'Welcome to intake!', 'intake',
---     '<p>Click the "X" button on this item to deactivate it and hide it from the feed.</p>',
+    '<p>Click the "X" button on this item to deactivate it and hide it from the feed.</p>',
---     '', 1, 0, 0, 0, jsonb('null'))
+    '', 1, 0, 0, 0, jsonb('null'))

web/html/editChannels.html

@@ -19,7 +19,7 @@
     <label for="channel">to</label>
     <input type="text" name="channel" list="channel-options">
     <button
-        hx-post="/channel/"
+    hx-post="/channel/"
     >Submit</button>
 </form>
 </p>

web/html/editSource.html

@@ -1,54 +0,0 @@
-{{ define "title" }}{{ .Name }} - Intake{{ end }}
-
-{{ define "content" -}}
-<nav class="center">
-    <span class="feed-controls">
-    <a href="/">Home</a>
-    </span>
-</nav>
-
-<nav>
-<span class="feed-controls">Edit source {{ .Name }}</span>
-<p>
-    <form method="post">
-        <label for="name">Name:</label>
-        <input type="text" name="name" placeholder="Source name" value="{{ .Name }}" readonly>
-        <input type="submit" value="Update" disabled>
-    </form>
-</p>
-
-<p>Environment:</p>
-<table id="envvars">{{ range $name, $value := .Envs }}
-<tr>
-    <td><input type="text" value="{{ $name }}" disabled></td>
-    <td><input type="text" value="{{ $value }}" disabled></td>
-</tr>{{ end }}
-<tr>
-    <td><input type="text" form="env" name="envName"></td>
-    <td><input type="text" form="env" name="envValue"></td>
-    <td><form id="env"><button
-        type="button"
-        hx-post="/source/{{ .Name }}/edit"
-    >Update</button></form></td>
-    </form>
-</tr>
-</table>
-
-<p>Actions:</p>
-<table id="actions">{{ range $name, $argv := .Actions }}
-<tr>
-    <td><input type="text" value="{{ $name }}" disabled></td>
-    <td><input type="text" value="{{ $argv }}" disabled></td>
-</tr>{{ end }}
-<tr>
-    <td><input type="text" form="action" name="actionName"></td>
-    <td><input type="text" form="action" name="actionArgv"></td>
-    <td><form id="action"><button
-        type="button"
-        hx-post="/source/{{ .Name }}/edit"
-    >Update</button></form></td>
-    </form>
-</tr>
-</table>
-</nav>
-{{- end }}

web/html/home.html

@@ -34,9 +34,6 @@
         <button type="submit">fetch</button>
     </form>
 </td>
-<td>
-<a href="/source/{{ .Name }}/edit">(edit)</a>
-</td>
 </td>
 <td><a href="/source/{{ .Name }}">{{ .Name }}</a></td>
 </tr>

web/html/html.go

@@ -182,17 +182,3 @@ func EditChannels(writer io.Writer, data EditChannelsData) {
 		log.Printf("error: failed to render edit channels: %v", err)
 	}
 }
-
-var editSource = load("editSource.html")
-
-type EditSourceData struct {
-	Name    string
-	Envs    map[string]string
-	Actions map[string]string
-}
-
-func EditSource(writer io.Writer, data EditSourceData) {
-	if err := editSource.Execute(writer, data); err != nil {
-		log.Printf("error: failed to render edit source: %v", err)
-	}
-}

web/html/intake.css

@@ -98,6 +98,3 @@ article textarea {
 span.error-message {
 	color: red;
 }
-#envvars input {
-	font-family: monospace;
-}

web/main.go

@@ -40,8 +40,6 @@ func RunServer(db core.DB, addr string, port string) {
 	handleFunc("GET    /htmx.org@2.0.4.js", env.getScript, logged)
 	handleFunc("POST   /login", env.login, logged)
 	handleFunc("GET    /source/{source}", env.getSource, env.authed, logged)
-	handleFunc("GET    /source/{source}/edit", env.getEditSource, env.authed, logged)
-	handleFunc("POST   /source/{source}/edit", env.editSource, env.authed, logged)
 	handleFunc("POST   /source/{source}/fetch", env.fetchSource, env.authed, logged)
 	handleFunc("GET    /channel/", env.getChannels, env.authed, logged)
 	handleFunc("POST   /channel/", env.editChannel, env.authed, logged)

web/shlex.go

@@ -1,44 +0,0 @@
-package web
-
-import (
-	"io"
-	"os/exec"
-	"strings"
-)
-
-func Shlex(cmd string) (argv []string, err error) {
-	xargs := exec.Command("xargs", "-n1")
-	stdin, err := xargs.StdinPipe()
-	if err != nil {
-		return
-	}
-	_, err = io.WriteString(stdin, cmd)
-	if err != nil {
-		return
-	}
-	err = stdin.Close()
-	if err != nil {
-		return
-	}
-	output, err := xargs.Output()
-	if err != nil {
-		return
-	}
-	argv = strings.Split(string(output), "\n")
-	if argv[len(argv)-1] == "" {
-		argv = argv[:len(argv)-1]
-	}
-	return
-}
-
-func Quote(argv []string) (cmd string, err error) {
-	argv = append([]string{"%q "}, argv...)
-	printf := exec.Command("printf", argv...)
-	output, err := printf.Output()
-	if err != nil {
-		return
-	}
-	cmd = string(output)
-	cmd = cmd[:len(cmd)-1] // strip off the last space from '%q '
-	return
-}

web/shlex_test.go

@@ -1,60 +0,0 @@
-package web
-
-import "testing"
-
-func TestShlex(t *testing.T) {
-	shlex := func(t *testing.T, cmd string, expected ...string) {
-		t.Helper()
-		actual, err := Shlex(cmd)
-		if err != nil {
-			t.Fatalf("shlex failed: %v", err)
-		}
-		if len(actual) != len(expected) {
-			t.Fatalf("expected %d args, got %d\nexpect: %v\nactual: %v", len(expected), len(actual), expected, actual)
-		}
-		for i := range len(expected) {
-			if actual[i] != expected[i] {
-				t.Fatalf("arg %d incorrect: expected %s got %s", i, expected[i], actual[i])
-			}
-		}
-	}
-
-	quote := func(t *testing.T, argvAndExpected ...string) {
-		t.Helper()
-		argv := argvAndExpected[:len(argvAndExpected)-1]
-		expected := argvAndExpected[len(argvAndExpected)-1]
-		actual, err := Quote(argv)
-		if err != nil {
-			t.Fatalf("quote failed: %v", err)
-		}
-		if actual != expected {
-			t.Fatalf("expected %q, got %q", expected, actual)
-		}
-	}
-
-	shlex(t,
-		`Lord "have mercy"`,
-		"Lord", "have mercy",
-	)
-	shlex(t,
-		`jq -cR '{id: .}'`,
-		"jq", "-cR", `{id: .}`,
-	)
-	shlex(t,
-		`jq -cR '{id: "hello"}'`,
-		"jq", "-cR", `{id: "hello"}`,
-	)
-
-	quote(t,
-		"Lord", "have mercy",
-		`Lord 'have mercy'`,
-	)
-	quote(t,
-		"jq", "-cR", `{id: .}`,
-		`jq -cR '{id: .}'`,
-	)
-	quote(t,
-		"jq", "-cR", `{id: "hello"}`,
-		`jq -cR '{id: "hello"}'`,
-	)
-}

web/source.go

@@ -78,80 +78,3 @@ func (env *Env) fetchSource(writer http.ResponseWriter, req *http.Request) {
 	}
 	html.Fetch(writer, data)
 }
-
-func (env *Env) getEditSource(writer http.ResponseWriter, req *http.Request) {
-	source := req.PathValue("source")
-	if exists, err := core.SourceExists(env.db, source); !exists || err != nil {
-		http.NotFound(writer, req)
-		return
-	}
-
-	envs, err := core.GetEnvsMap(env.db, source)
-	if err != nil {
-		http.Error(writer, err.Error(), 500)
-		return
-	}
-
-	actions, _ := core.GetActionsForSource(env.db, source)
-	argvs := make(map[string]string)
-	for _, action := range actions {
-		argv, _ := core.GetArgvForAction(env.db, source, action)
-		args, _ := Quote(argv)
-		argvs[action] = args
-	}
-
-	data := html.EditSourceData{
-		Name:    source,
-		Envs:    envs,
-		Actions: argvs,
-	}
-	html.EditSource(writer, data)
-}
-
-func (env *Env) editSource(writer http.ResponseWriter, req *http.Request) {
-	source := req.PathValue("source")
-	if exists, err := core.SourceExists(env.db, source); !exists || err != nil {
-		http.NotFound(writer, req)
-		return
-	}
-
-	if err := req.ParseForm(); err != nil {
-		http.Error(writer, err.Error(), 400)
-		return
-	}
-
-	envName := req.PostForm.Get("envName")
-	envValue := req.PostForm.Get("envValue")
-	if envName != "" {
-		log.Printf("setting %s=%s", envName, envValue)
-		if err := core.SetEnvs(env.db, source, []string{fmt.Sprintf("%s=%s", envName, envValue)}); err != nil {
-			http.Error(writer, err.Error(), 500)
-			return
-		}
-	}
-
-	actionName := req.PostForm.Get("actionName")
-	actionArgv := req.PostForm.Get("actionArgv")
-	if actionName != "" {
-		log.Printf("setting %s -- %s", actionName, actionArgv)
-		if actionArgv == "" {
-			if err := core.DeleteAction(env.db, source, actionName); err != nil {
-				http.Error(writer, err.Error(), 500)
-				return
-			}
-		} else {
-			argv, err := Shlex(actionArgv)
-			if err != nil {
-				http.Error(writer, err.Error(), 400)
-				return
-			}
-			if err = core.SetAction(env.db, source, actionName, argv); err != nil {
-				http.Error(writer, err.Error(), 500)
-				return
-			}
-		}
-	}
-
-	writer.Header()["HX-Refresh"] = []string{"true"}
-	writer.WriteHeader(http.StatusNoContent)
-}