diff options
| -rw-r--r-- | internal/task/task.go | 10 | ||||
| -rw-r--r-- | internal/ui/table.go | 18 | ||||
| -rw-r--r-- | internal/ui/table_test.go | 90 |
3 files changed, 118 insertions, 0 deletions
diff --git a/internal/task/task.go b/internal/task/task.go index fb07333..f860b16 100644 --- a/internal/task/task.go +++ b/internal/task/task.go @@ -121,6 +121,16 @@ func Stop(id int) error { return run(strconv.Itoa(id), "stop") } +// Done marks the task with the given id as completed. +func Done(id int) error { + return run(strconv.Itoa(id), "done") +} + +// Delete removes the task with the given id. +func Delete(id int) error { + return run(strconv.Itoa(id), "delete") +} + // SetPriority changes the priority of the task with the given id. func SetPriority(id int, priority string) error { return run(strconv.Itoa(id), "modify", "priority:"+priority) diff --git a/internal/ui/table.go b/internal/ui/table.go index 755e077..071c9df 100644 --- a/internal/ui/table.go +++ b/internal/ui/table.go @@ -187,6 +187,22 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { m.reload() } } + case "d": + if row := m.tbl.SelectedRow(); row != nil { + idStr := ansi.Strip(row[0]) + if id, err := strconv.Atoi(idStr); err == nil { + task.Done(id) + m.reload() + } + } + case "D": + if row := m.tbl.SelectedRow(); row != nil { + idStr := ansi.Strip(row[0]) + if id, err := strconv.Atoi(idStr); err == nil { + task.Delete(id) + m.reload() + } + } case "a": if row := m.tbl.SelectedRow(); row != nil { idStr := ansi.Strip(row[0]) @@ -230,6 +246,8 @@ func (m Model) View() string { m.tbl.HelpView(), "E: edit task", "s: toggle start/stop", + "d: mark task done", + "D: delete task", "a: annotate task", "A: replace annotations", "q: quit", diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go index 527eba6..560a3bd 100644 --- a/internal/ui/table_test.go +++ b/internal/ui/table_test.go @@ -127,3 +127,93 @@ func TestReplaceAnnotationHotkey(t *testing.T) { t.Fatalf("denotate not called: %s", logData) } } + +func TestDoneHotkey(t *testing.T) { + tmp := t.TempDir() + taskPath := filepath.Join(tmp, "task") + doneFile := filepath.Join(tmp, "done.txt") + + script := "#!/bin/sh\n" + + "if echo \"$@\" | grep -q export; then\n" + + " echo '{\"id\":1,\"uuid\":\"x\",\"description\":\"d\",\"status\":\"pending\",\"entry\":\"\",\"priority\":\"\",\"urgency\":0}'\n" + + " exit 0\n" + + "fi\n" + + "echo \"$@\" > " + doneFile + "\n" + + if err := os.WriteFile(taskPath, []byte(script), 0o755); err != nil { + t.Fatal(err) + } + + origPath := os.Getenv("PATH") + os.Setenv("PATH", tmp+":"+origPath) + t.Cleanup(func() { os.Setenv("PATH", origPath) }) + + os.Setenv("TASKDATA", tmp) + os.Setenv("TASKRC", "/dev/null") + t.Cleanup(func() { + os.Unsetenv("TASKDATA") + os.Unsetenv("TASKRC") + }) + + m, err := New("") + if err != nil { + t.Fatalf("New: %v", err) + } + + mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'d'}}) + m = mv.(Model) + + data, err := os.ReadFile(doneFile) + if err != nil { + t.Fatalf("read done: %v", err) + } + + if strings.TrimSpace(string(data)) != "1 done" { + t.Fatalf("done not called: %q", data) + } +} + +func TestDeleteHotkey(t *testing.T) { + tmp := t.TempDir() + taskPath := filepath.Join(tmp, "task") + delFile := filepath.Join(tmp, "delete.txt") + + script := "#!/bin/sh\n" + + "if echo \"$@\" | grep -q export; then\n" + + " echo '{\"id\":1,\"uuid\":\"x\",\"description\":\"d\",\"status\":\"pending\",\"entry\":\"\",\"priority\":\"\",\"urgency\":0}'\n" + + " exit 0\n" + + "fi\n" + + "echo \"$@\" > " + delFile + "\n" + + if err := os.WriteFile(taskPath, []byte(script), 0o755); err != nil { + t.Fatal(err) + } + + origPath := os.Getenv("PATH") + os.Setenv("PATH", tmp+":"+origPath) + t.Cleanup(func() { os.Setenv("PATH", origPath) }) + + os.Setenv("TASKDATA", tmp) + os.Setenv("TASKRC", "/dev/null") + t.Cleanup(func() { + os.Unsetenv("TASKDATA") + os.Unsetenv("TASKRC") + }) + + m, err := New("") + if err != nil { + t.Fatalf("New: %v", err) + } + + mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'D'}}) + m = mv.(Model) + + data, err := os.ReadFile(delFile) + if err != nil { + t.Fatalf("read delete: %v", err) + } + + if strings.TrimSpace(string(data)) != "1 delete" { + t.Fatalf("delete not called: %q", data) + } +} |