Remove manual tagging
A tag could come from two places: rules.toml, or the TUI's t key, which wrote manual_tag with COALESCE(manual_tag, rule_tag) deciding the winner. That split paid for itself in the first invariant of the codebase, in ClearOverrides and the c key, in the * marker on the tag column, and in the one exception to a disposable index -- a tag set by hand was the only thing in index.db that the statements could not reproduce. Now rules.toml decides every tag. The index is derived entirely from the statements plus that file, so deleting it and re-importing gets back exactly what was there, and retag has nothing to be careful of. Tagging a one-off means writing a narrow rule on screen 4, which previews what the glob catches before it is saved. A manual tag in an existing index is dropped along with the column the first time this build opens it, and those rows read as whatever the rules say, or as untagged. TestManualTagSurvivesRetag guarded the invariant that has just been removed; TestRetagRewritesEveryTag replaces it with the one that took its place, and keeps Retag itself covered. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
+7
-59
@@ -1,5 +1,5 @@
|
||||
// Package tui is the terminal interface: browse accounts, tag transactions,
|
||||
// and see where the money went.
|
||||
// Package tui is the terminal interface: browse accounts, write the rules that
|
||||
// tag transactions, and see where the money went.
|
||||
package tui
|
||||
|
||||
import (
|
||||
@@ -47,12 +47,11 @@ const (
|
||||
)
|
||||
|
||||
// input is the modal state: the transaction list is read-only until the user
|
||||
// starts typing a tag or a search.
|
||||
// starts typing a search.
|
||||
type input int
|
||||
|
||||
const (
|
||||
inputNone input = iota
|
||||
inputTag
|
||||
inputSearch
|
||||
)
|
||||
|
||||
@@ -267,16 +266,12 @@ func (m *Model) reloadTxns() error {
|
||||
|
||||
rows := make([]table.Row, 0, len(txns))
|
||||
for _, t := range txns {
|
||||
tag := t.Tag()
|
||||
if tag != "" && t.ManualTag != "" {
|
||||
tag += "*" // marks a manual override
|
||||
}
|
||||
rows = append(rows, table.Row{
|
||||
t.Date, t.AccountSlug, t.FormatAmount(), tag, t.Description,
|
||||
t.Date, t.AccountSlug, t.FormatAmount(), t.RuleTag, t.Description,
|
||||
})
|
||||
}
|
||||
// Keep the cursor in range after the row count shrinks (e.g. tagging the
|
||||
// last untagged row while the untagged filter is on).
|
||||
// Keep the cursor in range after the row count shrinks (e.g. a new rule
|
||||
// tagging the last untagged row while the untagged filter is on).
|
||||
cursor := m.txnTable.Cursor()
|
||||
m.txnTable.SetRows(rows)
|
||||
if cursor >= len(rows) {
|
||||
@@ -989,20 +984,6 @@ func (m *Model) updateInput(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
m.text.SetValue("")
|
||||
|
||||
switch mode {
|
||||
case inputTag:
|
||||
t, ok := m.selected()
|
||||
if !ok {
|
||||
return m, nil
|
||||
}
|
||||
if err := m.db.SetManualTag(t.ID, value); err != nil {
|
||||
m.err = err
|
||||
return m, nil
|
||||
}
|
||||
if value == "" {
|
||||
m.status = "cleared manual tag"
|
||||
} else {
|
||||
m.status = "tagged as " + value
|
||||
}
|
||||
case inputSearch:
|
||||
m.filter.Search = value
|
||||
m.status = "search: " + value
|
||||
@@ -1084,20 +1065,6 @@ func (m *Model) updateNormal(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
m.err = m.reloadTxns()
|
||||
return m, nil
|
||||
|
||||
case "t":
|
||||
if m.view != viewTxns {
|
||||
return m, nil
|
||||
}
|
||||
t, ok := m.selected()
|
||||
if !ok {
|
||||
return m, nil
|
||||
}
|
||||
m.input = inputTag
|
||||
m.text.SetValue(t.ManualTag)
|
||||
m.text.CursorEnd()
|
||||
m.text.Focus()
|
||||
return m, nil
|
||||
|
||||
case "/":
|
||||
m.view = viewTxns
|
||||
m.input = inputSearch
|
||||
@@ -1106,23 +1073,6 @@ func (m *Model) updateNormal(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
m.text.Focus()
|
||||
return m, nil
|
||||
|
||||
case "c":
|
||||
// Drop the manual tag and fall back to what the rules say.
|
||||
if m.view != viewTxns {
|
||||
return m, nil
|
||||
}
|
||||
t, ok := m.selected()
|
||||
if !ok {
|
||||
return m, nil
|
||||
}
|
||||
if err := m.db.ClearOverrides(t.ID); err != nil {
|
||||
m.err = err
|
||||
return m, nil
|
||||
}
|
||||
m.status = "manual overrides cleared"
|
||||
m.err = m.reloadTxns()
|
||||
return m, nil
|
||||
|
||||
case "r":
|
||||
if m.importing {
|
||||
m.status = "import in progress…"
|
||||
@@ -1189,8 +1139,6 @@ func (m *Model) View() string {
|
||||
switch {
|
||||
case m.importing:
|
||||
b.WriteString(statusStyle.Render(m.spinner.View() + m.importingLabel()))
|
||||
case m.input == inputTag:
|
||||
b.WriteString(statusStyle.Render("tag: ") + m.text.View())
|
||||
case m.input == inputSearch:
|
||||
b.WriteString(statusStyle.Render("search: ") + m.text.View())
|
||||
case m.err != nil:
|
||||
@@ -1389,6 +1337,6 @@ func (m *Model) help() string {
|
||||
case viewReport:
|
||||
return "1 accounts · 2 transactions · 4 new rule · 5 rules · u untagged · a all accounts · q quit"
|
||||
default:
|
||||
return "t tag · c clear · / search · u untagged · a all · i import · r retag · 4 new rule · 5 rules · q quit"
|
||||
return "4 new rule · / search · u untagged · a all · i import · r retag · 5 rules · q quit"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user