Merge pull request #34 from snonux/codex/change-hotkey--d--to--d--and-add-new-hotkey-for-due-date

Add due-date hotkey and update done hotkey

2 files changed, 95 insertions, 3 deletions

diff --git a/internal/ui/table.go b/internal/ui/table.go
index 8d1b07c..ad64378 100644
--- a/internal/ui/table.go
+++ b/internal/ui/table.go
@@ -26,6 +26,10 @@ type Model struct {
 	annotateInput      textinput.Model
 	replaceAnnotations bool
 
+	dueEditing bool
+	dueID      int
+	dueInput   textinput.Model
+
 	filter string
 	tasks  []task.Task
 
@@ -49,6 +53,8 @@ func New(filter string) (Model, error) {
 	m := Model{filter: filter}
 	m.annotateInput = textinput.New()
 	m.annotateInput.Prompt = "annotation: "
+	m.dueInput = textinput.New()
+	m.dueInput.Prompt = "due: "
 
 	if err := m.reload(); err != nil {
 		return Model{}, err
@@ -158,6 +164,23 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.annotateInput, cmd = m.annotateInput.Update(msg)
 			return m, cmd
 		}
+		if m.dueEditing {
+			switch msg.Type {
+			case tea.KeyEnter:
+				task.SetDueDate(m.dueID, m.dueInput.Value())
+				m.dueEditing = false
+				m.dueInput.Blur()
+				m.reload()
+				return m, nil
+			case tea.KeyEsc:
+				m.dueEditing = false
+				m.dueInput.Blur()
+				return m, nil
+			}
+			var cmd tea.Cmd
+			m.dueInput, cmd = m.dueInput.Update(msg)
+			return m, cmd
+		}
 		switch msg.String() {
 		case "?":
 			m.showHelp = true
@@ -194,7 +217,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					m.reload()
 				}
 			}
-		case "d":
+		case "D":
 			if row := m.tbl.SelectedRow(); row != nil {
 				idStr := ansi.Strip(row[0])
 				if id, err := strconv.Atoi(idStr); err == nil {
@@ -202,6 +225,17 @@ 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 {
+					m.dueID = id
+					m.dueEditing = true
+					m.dueInput.SetValue("")
+					m.dueInput.Focus()
+					return m, nil
+				}
+			}
 		case "a":
 			if row := m.tbl.SelectedRow(); row != nil {
 				idStr := ansi.Strip(row[0])
@@ -245,7 +279,8 @@ func (m Model) View() string {
 			m.tbl.HelpView(),
 			"E: edit task",
 			"s: toggle start/stop",
-			"d: mark task done",
+			"D: mark task done",
+			"d: set due date",
 			"a: annotate task",
 			"A: replace annotations",
 			"q: quit",
@@ -263,6 +298,12 @@ func (m Model) View() string {
 			m.annotateInput.View(),
 		)
 	}
+	if m.dueEditing {
+		view = lipgloss.JoinVertical(lipgloss.Left,
+			view,
+			m.dueInput.View(),
+		)
+	}
 	return view
 }
 
diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go
index b7c61d2..061b418 100644
--- a/internal/ui/table_test.go
+++ b/internal/ui/table_test.go
@@ -160,7 +160,7 @@ func TestDoneHotkey(t *testing.T) {
 		t.Fatalf("New: %v", err)
 	}
 
-	mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'d'}})
+	mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'D'}})
 	m = mv.(Model)
 
 	data, err := os.ReadFile(doneFile)
@@ -172,3 +172,54 @@ func TestDoneHotkey(t *testing.T) {
 		t.Fatalf("done not called: %q", data)
 	}
 }
+
+func TestDueDateHotkey(t *testing.T) {
+	tmp := t.TempDir()
+	taskPath := filepath.Join(tmp, "task")
+	dueFile := filepath.Join(tmp, "due.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 \"$@\" > " + dueFile + "\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)
+	for _, r := range "2024-12-31" {
+		mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{r}})
+		m = mv.(Model)
+	}
+	mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyEnter})
+	m = mv.(Model)
+
+	data, err := os.ReadFile(dueFile)
+	if err != nil {
+		t.Fatalf("read due: %v", err)
+	}
+
+	if strings.TrimSpace(string(data)) != "1 modify due:2024-12-31" {
+		t.Fatalf("due not set: %q", data)
+	}
+}