summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Bütow <1224732+snonux@users.noreply.github.com>2025-06-21 23:51:57 +0300
committerPaul Bütow <1224732+snonux@users.noreply.github.com>2025-06-21 23:51:57 +0300
commitc1585e94cf4a0eeb8ebd49103291119b97e097a8 (patch)
tree224f417c19f324674f5a240dc98583725061049a
parentc5d91ea346ac91e58ba8f2b40e6289cc926fb257 (diff)
Swap recurrence and random due date hotkeys
-rw-r--r--README.md3
-rw-r--r--internal/ui/table.go13
-rw-r--r--internal/ui/table_test.go57
3 files changed, 70 insertions, 3 deletions
diff --git a/README.md b/README.md
index 04b9cca..05b03ca 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,8 @@ Task Samurai invokes the `task` command to read and modify tasks. The tasks are
- `D`: mark task done
- `U`: undo last done
- `d`: set due date
-- `r`: edit recurrence
+- `r`: random due date
+- `R`: edit recurrence
- `a`: annotate task
- `A`: replace annotations
- `p`: set priority
diff --git a/internal/ui/table.go b/internal/ui/table.go
index 3e189fa..1caf81b 100644
--- a/internal/ui/table.go
+++ b/internal/ui/table.go
@@ -554,6 +554,16 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if row := m.tbl.SelectedRow(); row != nil {
idStr := ansi.Strip(row[1])
if id, err := strconv.Atoi(idStr); err == nil {
+ days := rand.Intn(31) + 7
+ due := time.Now().AddDate(0, 0, days).Format("2006-01-02")
+ task.SetDueDate(id, due)
+ m.reload()
+ }
+ }
+ case "R":
+ if row := m.tbl.SelectedRow(); row != nil {
+ idStr := ansi.Strip(row[1])
+ if id, err := strconv.Atoi(idStr); err == nil {
m.recurID = id
m.recurEditing = true
m.recurInput.SetValue(m.tasks[m.tbl.Cursor()].Recur)
@@ -752,7 +762,8 @@ func (m Model) View() string {
"D: mark task done",
"U: undo done",
"d: set due date",
- "r: edit recurrence",
+ "r: random due date",
+ "R: edit recurrence",
"a: annotate task",
"A: replace annotations",
"p: set priority",
diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go
index 18a471b..4e2679d 100644
--- a/internal/ui/table_test.go
+++ b/internal/ui/table_test.go
@@ -289,6 +289,61 @@ func TestDueDateHotkey(t *testing.T) {
}
}
+func TestRandomDueDateHotkey(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(nil)
+ if err != nil {
+ t.Fatalf("New: %v", err)
+ }
+
+ mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'r'}})
+ m = mv.(Model)
+
+ data, err := os.ReadFile(dueFile)
+ if err != nil {
+ t.Fatalf("read due: %v", err)
+ }
+
+ parts := strings.Split(strings.TrimSpace(string(data)), " ")
+ if len(parts) != 3 {
+ t.Fatalf("unexpected command: %q", data)
+ }
+ dueStr := strings.TrimPrefix(parts[2], "due:")
+ dueTime, err := time.Parse("2006-01-02", dueStr)
+ if err != nil {
+ t.Fatalf("parse due: %v", err)
+ }
+ days := int(time.Until(dueTime).Hours() / 24)
+ if days < 7 || days > 37 {
+ t.Fatalf("due date out of range: %d", days)
+ }
+}
+
func TestRecurrenceHotkey(t *testing.T) {
tmp := t.TempDir()
taskPath := filepath.Join(tmp, "task")
@@ -321,7 +376,7 @@ func TestRecurrenceHotkey(t *testing.T) {
t.Fatalf("New: %v", err)
}
- mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'r'}})
+ mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'R'}})
m = mv.(Model)
for _, r := range "daily" {
mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{r}})