From 3239f41ac7a00342dcc4dd26e699230981f168e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20B=C3=BCtow?= <1224732+snonux@users.noreply.github.com> Date: Fri, 20 Jun 2025 21:27:03 +0300 Subject: add priority selection hotkey --- internal/ui/table.go | 56 +++++++++++++++++++++++++++++++++++++++++++++++ internal/ui/table_test.go | 49 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/internal/ui/table.go b/internal/ui/table.go index b175776..024be5a 100644 --- a/internal/ui/table.go +++ b/internal/ui/table.go @@ -17,6 +17,8 @@ import ( "tasksamurai/internal/task" ) +var priorityOptions = []string{"H", "M", "L", ""} + func init() { rand.Seed(time.Now().UnixNano()) } @@ -36,6 +38,10 @@ type Model struct { dueID int dueInput textinput.Model + prioritySelecting bool + priorityID int + priorityIndex int + filters []string tasks []task.Task @@ -183,6 +189,23 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { m.dueInput, cmd = m.dueInput.Update(msg) return m, cmd } + if m.prioritySelecting { + switch msg.Type { + case tea.KeyEnter: + task.SetPriority(m.priorityID, priorityOptions[m.priorityIndex]) + m.prioritySelecting = false + m.reload() + return m, nil + case tea.KeyEsc: + m.prioritySelecting = false + return m, nil + case tea.KeyLeft: + m.priorityIndex = (m.priorityIndex + len(priorityOptions) - 1) % len(priorityOptions) + case tea.KeyRight: + m.priorityIndex = (m.priorityIndex + 1) % len(priorityOptions) + } + return m, nil + } switch msg.String() { case "?": m.showHelp = true @@ -256,6 +279,16 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { m.reload() } } + case "p": + if row := m.tbl.SelectedRow(); row != nil { + idStr := ansi.Strip(row[0]) + if id, err := strconv.Atoi(idStr); err == nil { + m.priorityID = id + m.prioritySelecting = true + m.priorityIndex = 0 + return m, nil + } + } case "a": if row := m.tbl.SelectedRow(); row != nil { idStr := ansi.Strip(row[0]) @@ -305,6 +338,7 @@ func (m Model) View() string { "r: random due date", "a: annotate task", "A: replace annotations", + "p: set priority", "q: quit", "?: help", // show help toggle line ) @@ -326,6 +360,12 @@ func (m Model) View() string { m.dueInput.View(), ) } + if m.prioritySelecting { + view = lipgloss.JoinVertical(lipgloss.Left, + view, + m.priorityView(), + ) + } return view } @@ -415,3 +455,19 @@ func formatPriority(p string) string { } return style.Render(p) } + +func (m Model) priorityView() string { + var parts []string + for i, p := range priorityOptions { + label := p + if label == "" { + label = "none" + } + style := lipgloss.NewStyle() + if i == m.priorityIndex { + style = style.Foreground(lipgloss.Color("229")).Background(lipgloss.Color("57")) + } + parts = append(parts, style.Render(label)) + } + return "priority: " + strings.Join(parts, " ") +} diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go index 1161ec2..be4bb9b 100644 --- a/internal/ui/table_test.go +++ b/internal/ui/table_test.go @@ -202,7 +202,7 @@ func TestUndoHotkey(t *testing.T) { os.Unsetenv("TASKRC") }) - m, err := New("") + m, err := New(nil) if err != nil { t.Fatalf("New: %v", err) } @@ -334,3 +334,50 @@ func TestRandomDueDateHotkey(t *testing.T) { t.Fatalf("due date out of range: %d", days) } } + +func TestPriorityHotkey(t *testing.T) { + tmp := t.TempDir() + taskPath := filepath.Join(tmp, "task") + priFile := filepath.Join(tmp, "pri.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 \"$@\" > " + priFile + "\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{'p'}}) + m = mv.(Model) + mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyEnter}) + m = mv.(Model) + + data, err := os.ReadFile(priFile) + if err != nil { + t.Fatalf("read pri: %v", err) + } + + if strings.TrimSpace(string(data)) != "1 modify priority:H" { + t.Fatalf("priority not set: %q", data) + } +} -- cgit v1.2.3