nikola/money
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: nikola/money:7ec9976b80cb075bdfa0cd02ffd57a12ab503836
Branches Tags
nikola/money:main
...
compare: nikola/money:main
Branches Tags
nikola/money:main
10 Commits
7ec9976b80 ... main
Author SHA1 Message Date
nikolaandClaude Opus 5.5 a086f9242d Give the page an icon 
An SVG favicon in the page's accent colour, three bars like report rows,
embedded with the rest of static/ so there is still nothing else to deploy.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-03 00:04:47 +02:00
nikolaandClaude Opus 5.5 c271cf2c8f Drop the keyboard shortcuts; add a Re-read all button 
The page carried the TUI's keymap -- screens on 1-8, / u a i r, the
report's arrows and s, the rule builder's ctrl+s and esc. Every one of
them already had a link, button or click, so they are gone, along with
the key numbers in the nav and the key hints in placeholders and
tooltips. The upload box still answers Enter and Space, which is what
makes it a button rather than a shortcut.

The forced import was reachable only by shift-clicking Import. It is now
a Re-read all button: every statement parsed again, including the ones
an import skips as unchanged -- what to run after a parser fix. Both
buttons disable while either runs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 23:36:59 +02:00
nikolaandClaude Opus 5.5 3d72a54be1 Add a tags screen 
Screen 8 lists every distinct tag -- the ones the index holds and the
ones rules.toml names -- with how many transactions carry it and the
rules that write it, each by file position with the transactions it
wins. It is where near-duplicate tags and tags several rules feed show
up, and a rule beaten by a more specific one reads (0) there as it does
on the rules screen. A tag no rule names any more says the next retag
clears it. The transfer label is not a tag and is never listed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 23:30:38 +02:00
nikolaandClaude Opus 5.5 ba7e0e2b42 Shorten the statement statuses 
The statements list now reads imported, changed, not imported and gone
from disk. What each means is in the README's statements table.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 22:49:41 +02:00
nikolaandClaude Opus 5.5 ed52be3f1d Name NLB uploads izpisek_YYYY-MM-DD 
Back to the dashed date rename_izpiski.py used, so a statement the script
already named is recognised as already there when it is uploaded again,
rather than landing as a second copy under the underscored name.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 22:49:41 +02:00
nikolaandClaude Opus 5.5 bd406a110d Name Trade Republic uploads by statement period 
Trade Republic statements all download as document-N.pdf, which says
nothing about what they hold. traderepublic now implements parser.Namer:
it reads the period from the address block at the top of the first page
("DATE 01 May 2025 - 31 Jul 2026") and names the statement
traderepublic_2025_05_01_2026_07_31, lowercase like the NLB names, so the
folder sorts by start date and two downloads of one statement meet under
one name. The transaction table's own DATE heading never matches, since
no date range follows it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 22:26:15 +02:00
nikolaandClaude Opus 5.5 a5f7541980 Name NLB uploads, delete statements, and stop importing on upload 
Four changes to statement handling in the web app, made together and
touching the same upload and statements-list code.

Name NLB uploads by statement date. parser.Namer is an optional
interface, like Warner, through which a parser names its statements;
nlb reads the "Datum izpiska" from the izpisek header and names it
izpisek_YYYY_MM_DD, lowercase, extension included -- ported from the
rename_izpiski.py it replaces. Uploads are staged as dotfiles, invisible
to import, so the parser can read them; two downloads of one statement
then meet under one name and the second is recognised as already there,
while a different statement of the same date is numbered _2 as the
script did. Only uploads are named: source_files records statements by
path, so renaming a file already in a folder would orphan its rows.

Delete a statement from the statements list. The file is removed from
disk for good -- the page says so before it asks -- and
store.ForgetSourceFile drops its transactions and their transfer rows.
A row two overlapping statements share is stored once, under the file
imported first, so it goes too; the account's other statements forget
their checksums and show as changed until the next Import re-reads them
and restores it. A file already gone from disk can be forgotten.

Upload and delete no longer import. Importing stays the user's call,
made with the Import button, so a batch can be put together and looked
over first. Delete still re-pairs transfers, which reads no statement.

Show rows and new rows per statement. The list read "0" for a file
whose rows an earlier, overlapping statement already held, which looked
like a file that failed to parse. source_files now records how many
transactions each statement holds, and the list reads "3 rows · 0 new".

This adds a column the code reads, so an index built by an earlier
version fails with "no such column: s.rows": delete index.db and import
again.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 21:48:29 +02:00
nikolaandClaude Opus 5.5 9ad6c05f9a List each account's statement files, and open them 
The Accounts screen gets a Statements list: every file in every account
folder beside what the index made of it -- imported, changed since,
not imported yet (or failed), or gone from disk while its rows remain --
with its size, modified and import times, and how many transactions it
brought in. Clicking a name opens the file.

The list is read from the folders, not the index, through
importer.StatementFiles, so a file shows exactly when import would read
it; store.SourceFiles and importer.Checksum then say how far each has
got. A file the index remembers but the disk lost is listed as missing
rather than vanishing, since its rows would not survive a rebuild.

A file is served only by finding it in that list, never by joining the
requested name onto a path. Statements come from outside and are served
from the app's origin, so none is rendered as a page: text is text/plain
under CSP sandbox, anything not text or PDF is a sandboxed download, and
PDFs -- whose viewers refuse a sandbox -- open in the browser's own
isolated viewer.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 20:00:03 +02:00
nikolaandClaude Opus 5.5 7f5b4846ef Show which legs a transfer cannot pair, and what would pair them 
The transfers screen counted unpaired legs per definition but never said
which transactions they were; finding them meant retyping the definition
into the builder. A ⚠ row now opens onto its legs, newest first, each
naming the missing side and what that side would have had to be:

  revolut → ?  arriving leg  +250.00 in other matching *FROM REVOLUT*,
                             dated 2026-02-01 to 2026-02-11

That description comes from transfers.Engine.Want, next to
bestCounterpart, so it is stated in the terms the pairing actually uses:
the other half of the definition, the window, and the amount -- exact,
widened only by the definition's own tolerance, and "any amount" across
currencies, where amounts are not compared. When the other account has
nothing imported at all, the line says so, since that is the usual cause.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 19:43:13 +02:00
nikolaandClaude Opus 5.5 17428a4f51 Fix the report's transfer rows rendering as text 
The report builds its excluded rows as a group per currency -- the
transfer legs and, when a tolerance admitted one, the fee -- so its tbody
children nest two arrays deep. h flattened only one level, so each group
was stringified and the page showed "[object HTMLTableRowElement]" wherever
a period held a matched transfer. Children now flatten all the way down.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-02 19:25:42 +02:00
19 changed files with 1547 additions and 290 deletions
Expand all files Collapse all files
CLAUDE.md
+59 -21
View File
@@ -143,14 +143,14 @@ Anything new that reports a rule must report its file position too.
settles ties: a saved rule cannot displace an equally specific one written by settles ties: a saved rule cannot displace an equally specific one written by
hand, while a narrower one is meant to take precedence and does. hand, while a narrower one is meant to take precedence and does.
**The report's period narrows the report and nothing else.** The screen opens **The report's period narrows the report and nothing else.** The screen opens on
on last month, and `←`/`→` step along `report.Periods` — the named windows, last month, and `←`/`→` step along `report.Periods` — the named windows, then
then the months the index holds. The report and the transaction list share a the months the index holds. The report and the transaction list share a scope
scope (account, search, untagged), which `web.filterFrom` reads and (account, search, untagged), which `web.filterFrom` reads and `state.filter`
`state.filter` holds in the page; the period is read by the report handler holds in the page; the period is read by the report handler alone and kept in
alone and kept in `state.report`, so opening on last month cannot hide the `state.report`, so opening on last month cannot hide the rest of the index from
rest of the index from the list. Nothing may put the period into that shared the list. Nothing may put the period into that shared scope, which is exactly
scope, which is exactly what would make it leak. Covered by `TestReportPeriodLeavesTransactionsAlone`. what would make it leak. Covered by `TestReportPeriodLeavesTransactionsAlone`.
The axis is built from `store.Months` over the *whole* index, not from the rows The axis is built from `store.Months` over the *whole* index, not from the rows
in view, or it would grow and shrink as the account or search filter changed and in view, or it would grow and shrink as the account or search filter changed and
@@ -174,12 +174,12 @@ tag so ties keep a fixed position instead of shuffling between reloads.
own copy of that mapping; a new order needs a column of its own, which own copy of that mapping; a new order needs a column of its own, which
`TestOrderColumnsAreDistinct` checks. `TestOrderColumnsAreDistinct` checks.
**The single-key shortcuts must not fire while typing.** The page's `keydown` **There are no keyboard shortcuts.** The page used to carry the TUI's keymap —
handler ignores them whenever the target is an input, or typing `i` in the tag screens on `1`–`8`, `u`, `/`, `i`, `r`, and chords inside the builders — and it
field would start an import. A view's own `key` hook runs first and is told was removed on purpose: every action is a link or a button. Do not add a global
whether the user is typing, so a command *inside* a builder has to be a chord — `keydown` handler back without being asked; a single-letter key fires while
`ctrl+s` re-sorts the preview — because every printable key belongs to the typing in a field unless every one of them is guarded, which is what the old one
field being typed in. existed to do.
**A rule's usage count is how many transactions it wins, not how many its glob **A rule's usage count is how many transactions it wins, not how many its glob
could match** — `Engine.Usage` counts by `MatchIndex`, so a rule shadowed by a could match** — `Engine.Usage` counts by `MatchIndex`, so a rule shadowed by a
@@ -241,13 +241,38 @@ That is why `/api/upload` takes files base64 inside JSON rather than as
multipart: multipart is precisely what a cross-site form can send. multipart: multipart is precisely what a cross-site form can send.
**An upload only puts a file where `money import` looks.** It writes into an **An upload only puts a file where `money import` looks.** It writes into an
existing account folder and then runs the same import as `/api/import`, so the existing account folder and stops there: importing stays the user's call, made
statements stay the source of truth and nothing reaches the index any other with the Import button, so the statements stay the source of truth and nothing
way. It never overwrites a statement (identical contents are a no-op, different reaches the index any other way. It never overwrites a statement (identical
ones a 409), refuses any name import would not read back — not a plain file contents are a no-op, different ones a 409), refuses any name import would not
name, a dotfile, `account.toml`, outside the account's `include` — and checks a read back — not a plain file name, a dotfile, `account.toml`, outside the
whole batch before writing any of it. Covered by account's `include` — and checks a whole batch before writing any of it. Covered
`TestUploadNeverReplacesAStatement` and `TestUploadRefusesBadNames`. by `TestUploadSavesWithoutImporting`, `TestUploadNeverReplacesAStatement` and
`TestUploadRefusesBadNames`.
**The statements list is read from the folders, not the index.** `/api/files`
walks `importer.StatementFiles` — the same list import reads — and only then
looks each file up in `store.SourceFiles`, comparing `importer.Checksum`, so a
file is listed exactly when import would read it and a file the index remembers
but the disk lost shows as `missing` instead of vanishing.
`/api/files/{account}/{name}` serves a file only by finding it in that list,
never by joining the name onto a path. A statement is served from the app's
origin, where a script could drive the API, so nothing is ever rendered as a
page: text is `text/plain` under `CSP: sandbox`, anything not text or PDF is a
sandboxed download, and PDFs — whose viewers refuse a sandbox — open in the
browser's own isolated viewer. Covered by `TestServeFileServesOnlyStatements`.
**Deleting a statement marks its neighbours to be re-read.** `/api/files/delete`
finds the file the same way `serveFile` does and deletes it — permanently, by
the user's choice; the page says so before it asks. `store.ForgetSourceFile`
then drops its transactions and their transfer rows, and `Link` re-pairs, which
reads no statement. It does not import, any more than an upload does. A
transaction two overlapping statements share is stored once, under the file
imported first, so it goes too; `ForgetSourceFile` therefore blanks the
checksums of the account's other statements, which show as `changed` until the
next Import re-reads them and restores what they hold. Without that the checksum
skip would leave those rows gone for good. Covered by
`TestRemoveFileKeepsWhatAnotherStatementHolds`.
## Adding a bank parser ## Adding a bank parser
@@ -288,6 +313,19 @@ description — at the end, and not in the position it held on the page, so an
IBAN wrapped across continuation lines stays contiguous for a glob to match. IBAN wrapped across continuation lines stays contiguous for a glob to match.
A new parser must do the same rather than reintroduce a structured field. A new parser must do the same rather than reintroduce a structured field.
**A parser may name its statements, and only uploads use it.** `parser.Namer` is
optional, like `parser.Warner`: `nlb` names an izpisek `izpisek_YYYY-MM-DD`
after its *Datum izpiska*, ported from the `rename_izpiski.py` it replaced, and
`traderepublic` names a statement `traderepublic_YYYY_MM_DD_YYYY_MM_DD` after
the period in its header. A name is derived from what the statement says, never
from the upload's own name, and comes back without an extension; the upload's is
kept, lowercased. `/api/upload` stages each file as a dotfile — invisible to
import — so the parser can read it, then numbers a chosen name that is taken by
different contents (`_2`, as the script did) where a name the user gave is
refused with 409. Nothing renames a file already in a folder: `source_files`
records statements by path, so a rename would orphan its rows as `missing` until
the index is rebuilt. Covered by `TestUploadNamesStatementsTheParserCanName`.
## Verifying ## Verifying
``` ```
README.md
+135 -60
View File
@@ -102,8 +102,7 @@ money config # which data root is in use, and why
An account folder appears in the app only once its statements have been An account folder appears in the app only once its statements have been
imported — creating an `account.toml` is not enough on its own. Run imported — creating an `account.toml` is not enough on its own. Run
`money import` (or press Import in the web app) after adding one, or add its `money import` (or press Import in the web app) after adding one.
first statements from the Accounts screen, which imports them as it saves them.
`--uniq` turns `ls` into a list of patterns still to write rather than a list of `--uniq` turns `ls` into a list of patterns still to write rather than a list of
rows to read: one line per distinct description, since fifty visits to the same rows to read: one line per distinct description, since fifty visits to the same
@@ -124,9 +123,8 @@ LIDL SOFIA 4412
The account is not part of what makes a row distinct. A rule matches on the The account is not part of what makes a row distinct. A rule matches on the
description and only optionally narrows to an account, so one payee seen on two description and only optionally narrows to an account, so one payee seen on two
accounts is still one pattern to write — and it is one row in the rule builder accounts is still one pattern to write — and it is one row in the rule builder,
on `4`, which groups the same way. Pass `--account` to scope the listing which groups the same way. Pass `--account` to scope the listing instead.
instead.
It composes with the other filters (`--account`, `--month`, `--search`), and It composes with the other filters (`--account`, `--month`, `--search`), and
`--limit` caps the rows printed, saying how many it held back. It cannot be `--limit` caps the rows printed, saying how many it held back. It cannot be
@@ -134,11 +132,12 @@ combined with `--wide`, whose columns all belong to a single transaction.
## The web app ## The web app
`money serve`, which is also what `money` runs with no command, puts seven `money serve`, which is also what `money` runs with no command, puts eight
screens in a browser: accounts, transactions, report, rule builder, rules, screens in a browser: accounts, transactions, report, rule builder, rules,
transfer builder and transfers. It runs the same code as the CLI: amounts are formatted, transfer builder, transfers and tags. It runs the same code as the CLI: amounts
globs matched and transfers paired on the server, and the page only shows the are formatted, globs matched and transfers paired on the server, and the page
answers. It is one binary with the page built in; nothing else to deploy. only shows the answers. It is one binary with the page built in; nothing else to
deploy.
``` ```
money # http://127.0.0.1:8080 money # http://127.0.0.1:8080
@@ -164,15 +163,52 @@ fresh command would:
rule there (another tab, a hand edit) the change is refused and you are asked rule there (another tab, a hand edit) the change is refused and you are asked
to reload, rather than editing whichever rule moved into its place. to reload, rather than editing whichever rule moved into its place.
Shift-click **Import** for `import --force`. **Re-read all** is `import --force`: every statement is parsed again, including
the ones an Import skips because they have not changed. Use it after updating
money, when a parser has learned to read something it used to get wrong; rows
already in the index are recognised and not duplicated.
### Statements
The Accounts screen also lists every statement file in every account
folder, with what the index made of it:
| Status | Meaning |
| --- | --- |
| `✓` imported | read, and unchanged since |
| `⚠` changed | the file differs from what was imported; Import re-reads it |
| `•` not imported | new since the last import — or an import tried and failed, in which case the error is in the import report |
| `✗` gone from disk | imported once, then removed; its transactions stay in the index only until it is rebuilt |
**Transactions** reads like `3 rows · 0 new`: how many transactions the file
holds, then how many of them it was the first to bring in. Statements that
overlap share rows, and a shared row is stored once, under whichever file was
imported first — so a later statement covering the same days shows fewer new
rows than it holds, down to `0 new` when an earlier one already had them all.
That is deduplication working, not a file that failed to parse.
Click a file name to open it. PDFs and CSVs open in the browser; anything else
downloads. Only files import would read are listed or served — not
`account.toml`, dotfiles, or anything outside an account's `include` patterns.
**Delete** removes a statement from disk for good — there is no copy kept
and no undo, so keep the bank's original if you might want it back. Its
transactions leave the index, and transfers that used them lose their pairing:
the other leg shows as unpaired, which is the truth once one side is gone.
Deleting does not import. A row that an overlapping statement also contains goes
too, for now: the account's other statements are marked *changed*, and the next
**Import** re-reads them and puts it back. For a file already gone from disk the
button says **Forget** and only clears the index.
### Adding statements from the browser ### Adding statements from the browser
The Accounts screen (`1`) has an **Add statements** panel: pick the account, The Accounts screen has an **Add statements** panel: pick the account,
drop files on it (or click to choose them) and press **Upload and import**. The drop files on it (or click to choose them) and press **Upload**. The files are
files are saved into that account's folder, exactly where you would have copied saved into that account's folder, exactly where you would have copied them by
them by hand, and then imported — the folder stays the source of truth, so hand — the folder stays the source of truth, so deleting `index.db` and
deleting `index.db` and re-importing still gets everything back. re-importing still gets everything back. Uploading does not import: the files
wait on the statements list as *not imported* until you press **Import**, so you
can put a batch together and look it over first.
An upload never replaces a statement. A file whose name is already in the folder An upload never replaces a statement. A file whose name is already in the folder
is skipped if its contents are identical and refused if they differ; rename it is skipped if its contents are identical and refused if they differ; rename it
@@ -182,28 +218,30 @@ too, and a batch with one bad file writes none of them. The folder itself must
already exist with an `account.toml`: an upload adds statements to an account, already exist with an `account.toml`: an upload adds statements to an account,
it does not create one. it does not create one.
### Keys Some banks name their downloads unhelpfully, so a parser may name the statement
instead — lowercase throughout, extension included — and the status line says
what each file became. An NLB izpisek is saved as `izpisek_YYYY-MM-DD.pdf` after
the *Datum izpiska* in its header, and a Trade Republic statement, which
downloads as `document-N.pdf`, as `traderepublic_YYYY_MM_DD_YYYY_MM_DD.pdf`
after the period on its first page (`DATE 01 May 2025 - 31 Jul 2026`). Either
way the folder sorts by date. Downloading the same statement twice then lands on
the same name and is recognised as already there; a different statement with the
same name (a reissue) is numbered `_2`, `_3` rather than refused. A statement
with no date it can find keeps its own name. Only uploads are named — files
already in a folder are never renamed, since the index records them by path.
| Key | Action | ### Navigating
| --- | --- |
| `1` – `7` | accounts · transactions · report · rule builder · rules · transfer builder · transfers |
| `/` | filter by description |
| `u` | show only untagged transactions (matched transfer legs are not among them) |
| `a` | clear the account filter |
| `←` `→` | move the report's period (report) |
| `s` | change how the report is sorted (report) |
| `ctrl+s` | sort the rule builder's preview by name / by count |
| `i` | import · `r` retag |
Inside a form every printable key belongs to the field you are typing in, so Every screen is a link in the bar along the top, and every action is a button or
the single-letter keys only work outside one; that is why the builder's sort is a click; there are no keyboard shortcuts. Clicking an account on the Accounts
a chord. Clicking an account on `1` filters the transaction list to it. screen filters the transaction list to it.
There is no control that tags a transaction. Tags come from `rules.toml` and There is no control that tags a transaction. Tags come from `rules.toml` and
nowhere else, so tagging what you are looking at means writing a rule for it on nowhere else, so tagging what you are looking at means writing a rule for it in
`4` — which is why that screen shows you what a glob catches before you save. the rule builder — which is why it shows you what a glob catches before you
save.
### Report (`3`) ### Report
The report opens on **last month**, not on everything you have ever imported: The report opens on **last month**, not on everything you have ever imported:
an all-time total is the one number a spending report is least often asked for, an all-time total is the one number a spending report is least often asked for,
@@ -213,8 +251,8 @@ period is empty rather than quietly showing you a different one.
The time axis beside the totals runs from the widest window down to the oldest The time axis beside the totals runs from the widest window down to the oldest
month in the index — `all time`, `this year`, `last 12 months`, `last 3 month in the index — `all time`, `this year`, `last 12 months`, `last 3
months`, `this month`, `last month`, then one entry per month. Click one, or months`, `this month`, `last month`, then one entry per month. Click one to
step along it with `←` and `→`. report on it.
The three rolling windows run to the end of *this* month rather than to the The three rolling windows run to the end of *this* month rather than to the
last complete one — you ask for "last 3 months" to see what is happening now, last complete one — you ask for "last 3 months" to see what is happening now,
@@ -222,12 +260,11 @@ and leaving out the days since the 1st would answer a different question. Each
month below `last month` is a month the index actually holds; months that a month below `last month` is a month the index actually holds; months that a
named window above already covers are not repeated. named window above already covers are not repeated.
Click a column heading, or press `s` to cycle, to change how the rows are Click a column heading to change how the rows are arranged; the marked heading
arranged; the marked heading says which one they are arranged by: `Out ▾` says which one they are arranged by: `Out ▾` largest spend first (the default
largest spend first (the default question a spending report answers), then question a spending report answers), then `In ▾`, `Net ▾` lowest first so the
`In ▾`, `Net ▾` lowest first so the biggest losses lead, `N ▾` most biggest losses lead, `N ▾` most transactions first, and `Tag ▴` A→Z. `money
transactions first, and `Tag ▴` A→Z. `money report` takes the same choice as report` takes the same choice as `--sort out|in|net|count|tag`.
`--sort out|in|net|count|tag`.
Currency is always the outer grouping and no sort changes that — there are no Currency is always the outer grouping and no sort changes that — there are no
exchange rates here, so two currencies interleaved by amount would invite a exchange rates here, so two currencies interleaved by amount would invite a
@@ -237,12 +274,12 @@ The sort rearranges rows; it never changes which rows there are.
The period narrows the report and only the report. The account, the search and The period narrows the report and only the report. The account, the search and
the untagged toggle are shared with the transaction list, so opening on last the untagged toggle are shared with the transaction list, so opening on last
month does not hide the rest of the index from `2`. month does not hide the rest of the index from the transaction list.
`money report` takes `--month` instead; there is no command-line equivalent of `money report` takes `--month` instead; there is no command-line equivalent of
the wider windows. the wider windows.
### Rule builder (`4`) ### Rule builder
Writing rules by hand means guessing what a glob will catch. This screen shows Writing rules by hand means guessing what a glob will catch. This screen shows
the answer as you type: the form is on the left — glob, account, tag, note — the answer as you type: the form is on the left — glob, account, tag, note —
@@ -264,13 +301,13 @@ point to narrow down.
immediately, so the rows it caught disappear from the list. The account stays immediately, so the rows it caught disappear from the list. The account stays
filled in, since the next rule is usually for the same one. filled in, since the next rule is usually for the same one.
Clicking the column headings, or `ctrl+s`, switches the list between by name and Clicking the column headings switches the list between by name and by count,
by count, most seen first; the `↓` says which column the order is read from. most seen first; the `↓` says which column the order is read from. The two
The two answer different questions: by name finds the payee you are looking at, answer different questions: by name finds the payee you are looking at, by count
by count finds the rule worth writing next, since one pattern claiming forty finds the rule worth writing next, since one pattern claiming forty rows is
rows is worth more than the first of forty claiming one. Ties keep the worth more than the first of forty claiming one. Ties keep the alphabetical
alphabetical order, so the list does not reshuffle under you, and the choice order, so the list does not reshuffle under you, and the choice lasts until you
lasts until you change it. change it.
The account and tag fields offer completions as you type. Accounts come from The account and tag fields offer completions as you type. Accounts come from
the folders on disk and the index; tags from every tag in use plus any named in the folders on disk and the index; tags from every tag in use plus any named in
@@ -290,7 +327,7 @@ report leaves them out anyway.
#### Editing a rule #### Editing a rule
**Edit** on the rules screen (`5`) opens the rule in this same form with the **Edit** on the rules screen opens the rule in this same form with the
fields filled in, and saving rewrites that rule where it sits instead of fields filled in, and saving rewrites that rule where it sits instead of
appending a new one. It keeps its position, since position still breaks ties appending a new one. It keeps its position, since position still breaks ties
between equally specific rules; `rules.toml` is edited textually, so the between equally specific rules; `rules.toml` is edited textually, so the
@@ -306,10 +343,10 @@ you are about to hand back to whatever rule catches it next.
The form has no `type` field, so a rule that sets one carries it through The form has no `type` field, so a rule that sets one carries it through
unchanged rather than losing it; it is shown under the glob as `+ type:… · unchanged rather than losing it; it is shown under the glob as `+ type:… ·
kept`. Saving lands back on the rules screen with the new counts; **Cancel**, kept`. Saving lands back on the rules screen with the new counts; **Cancel**, or
`esc`, or leaving the screen leaves the rule as it was. leaving the screen leaves the rule as it was.
### Rules (`5`) ### Rules
Every rule in file order — the order they are written in, not the order they Every rule in file order — the order they are written in, not the order they
are tried in — with the number of transactions it actually claims. Rules that are tried in — with the number of transactions it actually claims. Rules that
@@ -344,7 +381,7 @@ it, while one separated by a blank line is treated as a section heading and
left alone; an edited rule keeps its comments, since they say why it is there left alone; an edited rule keeps its comments, since they say why it is there
and changing its glob rarely changes that. and changing its glob rarely changes that.
### Transfer builder (`6`) ### Transfer builder
Same idea as the rule builder, for money moved between your own accounts. The Same idea as the rule builder, for money moved between your own accounts. The
form names both sides — from account, from desc, to account, to desc — plus an form names both sides — from account, from desc, to account, to desc — plus an
@@ -379,7 +416,7 @@ A half-written definition previews too: fill in one side and its legs show up as
unpaired, which is the quickest way to see that a glob is wrong before you have unpaired, which is the quickest way to see that a glob is wrong before you have
written the other half. written the other half.
### Transfers (`7`) ### Transfers
Every definition in file order, with what it currently pairs. Every definition in file order, with what it currently pairs.
@@ -398,6 +435,23 @@ definition catching legs it cannot complete: a wrong glob on the other side, a
statement not imported yet, or a movement that genuinely went missing. `✗` is a statement not imported yet, or a movement that genuinely went missing. `✗` is a
definition matching nothing at all, which is just dead weight. definition matching nothing at all, which is just dead weight.
Click a `⚠` row to see the legs behind it, newest first. Each one says which
side is missing and what that side would have had to look like:
```
Date Amount Movement Missing Would pair with
2026-04-01 500.00 checking → ? arriving leg +500.00 in savings matching *FROM CHECKING*,
dated 2026-03-27 to 2026-04-06
```
That is the search to run on the other statement. If it is not there, the
statement probably is not imported yet — when nothing at all from that account
is, the line says so. If something close is there, the difference tells you
which condition failed: a date outside the window, an amount off by a fee (see
[When the bank takes a fee](#when-the-bank-takes-a-fee)), or a description the
glob does not match. Across currencies the line says *any amount*, since only
the dates are checked there.
`Tol` is the definition's `tolerance_pct`, and it qualifies the counts beside `Tol` is the definition's `tolerance_pct`, and it qualifies the counts beside
it: row 3's two pairs were matched on slack rather than on the amount agreeing. it: row 3's two pairs were matched on slack rather than on the amount agreeing.
It is blank for every definition that requires the exact amount — which is the It is blank for every definition that requires the exact amount — which is the
@@ -408,6 +462,27 @@ once, both after asking. Definitions marked `⚠` are never pruned — they are
doing something, just not finishing it, and deleting one would hide the problem doing something, just not finishing it, and deleting one would hide the problem
rather than fix it. **Refresh pairing** re-reads what is currently in the index. rather than fix it. **Refresh pairing** re-reads what is currently in the index.
### Tags
Every distinct tag, A→Z: the ones your transactions carry and any `rules.toml`
names, with how many transactions carry each and the rules that write it.
```
Tags · 2 tags
Tag Txns Rules
clothes 0 #4 *ZARA* (0)
groceries 2 #1 *LIDL* (0) #2 *KAUFLAND* (1) #3 *LIDL SOFIA* (1)
```
Rules are numbered by their position in `rules.toml`, as on the rules screen,
and the count after each is how many transactions it wins — so a tag's rules
add up to its transactions, and a rule at `(0)` is matching nothing or being
beaten by a more specific one. It is the place to spot near-duplicate tags
(`grocery` beside `groceries`) and tags that several rules feed. A tag no rule
names any more — `rules.toml` was edited since the last retag — says so; the
next Retag clears it. The transfer label is not a tag and never appears here.
## rules.toml ## rules.toml
**The most specific rule wins**, so `*NIKOLA*` claims what it names even with a **The most specific rule wins**, so `*NIKOLA*` claims what it names even with a
@@ -463,7 +538,7 @@ tag = "groceries"
Every tag comes from this file, so a tag is never something you have to keep Every tag comes from this file, so a tag is never something you have to keep
safe: `money retag` recomputes all of them from the current rules and is safe safe: `money retag` recomputes all of them from the current rules and is safe
to run whenever you change it. A transaction no rule matches simply stays to run whenever you change it. A transaction no rule matches simply stays
untagged, and shows up under `money ls --untagged`, the `u` view, and untagged, and shows up under `money ls --untagged`, **Untagged only**, and
`(untagged)` in the report — unless it is one leg of a matched transfer, which `(untagged)` in the report — unless it is one leg of a matched transfer, which
is already spoken for and is left out of all three. is already spoken for and is left out of all three.
@@ -565,7 +640,7 @@ that is the number your spending is short by:
transfers excluded: 2 legs in EUR, 500.00 out, 495.00 in, 5.00 in fees transfers excluded: 2 legs in EUR, 500.00 out, 495.00 in, 5.00 in fees
``` ```
The report screen (`3`) shows the same thing under its `TOTAL`, the fee on its The report screen shows the same thing under its `TOTAL`, the fee on its
own row (for whichever period it is on): own row (for whichever period it is on):
``` ```
@@ -591,7 +666,7 @@ An *unpaired* leg is not a transfer and still counts, tagged like anything
else. That is deliberate: money that left an account and cannot be shown to else. That is deliberate: money that left an account and cannot be shown to
have arrived is exactly what you want to see, not something to quietly drop. have arrived is exactly what you want to see, not something to quietly drop.
`money import` and `money retag` report unpaired legs on stderr, and the `money import` and `money retag` report unpaired legs on stderr, and the
transfers screen (`7`) shows which definition they belong to. transfers screen shows which definition they belong to.
The pairing is derived state, like the tags: it lives in the index, is The pairing is derived state, like the tags: it lives in the index, is
recomputed wholesale by `money retag` and after every import, and disappears recomputed wholesale by `money retag` and after every import, and disappears
@@ -617,8 +692,8 @@ nothing else to configure — `parser` names one of these and that is all.
| `parser` | Statement | Notes | | `parser` | Statement | Notes |
| --- | --- | --- | | --- | --- | --- |
| `nlb` | NLB izpisek PDF | Wrapped descriptions are folded in from continuation lines, and the IBAN column is appended to the description. | | `nlb` | NLB izpisek PDF | Wrapped descriptions are folded in from continuation lines, and the IBAN column is appended to the description. Uploads are saved as `izpisek_YYYY-MM-DD.pdf` after the statement date. |
| `traderepublic` | Trade Republic PDF | Handles both the single-line and the stacked layout by measuring column positions. | | `traderepublic` | Trade Republic PDF | Handles both the single-line and the stacked layout by measuring column positions. Uploads are saved as `traderepublic_YYYY_MM_DD_YYYY_MM_DD.pdf` after the statement period. |
| `revolut` | `account-statement*.csv` | Skips non-COMPLETED rows, folds the fee into the amount. | | `revolut` | `account-statement*.csv` | Skips non-COMPLETED rows, folds the fee into the amount. |
```toml ```toml
internal/importer/importer.go
+10 -7
View File
@@ -101,7 +101,7 @@ func Run(root string, db *store.DB, accounts []*config.Account, engine *rules.En
continue continue
} }
files, err := statementFiles(acc) files, err := StatementFiles(acc)
if err != nil { if err != nil {
return res, err return res, err
} }
@@ -134,7 +134,7 @@ func importFile(root string, db *store.DB, acc *config.Account, accountID int64,
} }
fr := FileResult{Account: acc.Slug, Path: rel} fr := FileResult{Account: acc.Slug, Path: rel}
sum, err := checksum(path) sum, err := Checksum(path)
if err != nil { if err != nil {
fr.Err = err fr.Err = err
return fr return fr
@@ -162,7 +162,7 @@ func importFile(root string, db *store.DB, acc *config.Account, accountID int64,
} }
fr.Warnings = append(fr.Warnings, checkBalances(txns, acc.Digits())...) fr.Warnings = append(fr.Warnings, checkBalances(txns, acc.Digits())...)
sourceID, err := db.SourceFile(accountID, rel, sum, time.Now().UTC().Format(time.RFC3339)) sourceID, err := db.SourceFile(accountID, rel, sum, time.Now().UTC().Format(time.RFC3339), len(txns))
if err != nil { if err != nil {
fr.Err = err fr.Err = err
return fr return fr
@@ -252,10 +252,11 @@ func fingerprint(key string, ordinal int) string {
return hex.EncodeToString(sum[:]) return hex.EncodeToString(sum[:])
} }
// statementFiles lists the files in an account folder that should be parsed: // StatementFiles lists the files in an account folder that should be parsed:
// every regular file except account.toml and dotfiles, narrowed by the // every regular file except account.toml and dotfiles, narrowed by the
// account's optional include globs. // account's optional include globs. It is also what the web app lists and
func statementFiles(acc *config.Account) ([]string, error) { // serves, so a file is shown exactly when import would read it.
func StatementFiles(acc *config.Account) ([]string, error) {
entries, err := os.ReadDir(acc.Dir) entries, err := os.ReadDir(acc.Dir)
if err != nil { if err != nil {
return nil, fmt.Errorf("read account dir %s: %w", acc.Dir, err) return nil, fmt.Errorf("read account dir %s: %w", acc.Dir, err)
@@ -284,7 +285,9 @@ func matchAny(patterns []string, name string) bool {
return false return false
} }
func checksum(path string) (string, error) { // Checksum is the sha256 a statement is recorded under; an import skips a file
// whose checksum has not changed.
func Checksum(path string) (string, error) {
f, err := os.Open(path) f, err := os.Open(path)
if err != nil { if err != nil {
return "", err return "", err
internal/parser/nlb.go
+22
View File
@@ -43,6 +43,10 @@ var (
nlbAccount = regexp.MustCompile(`^SI\d{2}(?:\s?\d{4}){3}\s?\d{3}$`) nlbAccount = regexp.MustCompile(`^SI\d{2}(?:\s?\d{4}){3}\s?\d{3}$`)
) )
// nlbStatementDate is the issue date in an izpisek's header. It names the
// statement: NLB's downloads are not named for what they hold.
var nlbStatementDate = regexp.MustCompile(`Datum izpiska\s+(\d{2})\.(\d{2})\.(\d{4})`)
// nlbMinContinuationIndent is the shallowest indent a wrapped description line // nlbMinContinuationIndent is the shallowest indent a wrapped description line
// may have. The real threshold is the description column of the transaction // may have. The real threshold is the description column of the transaction
// the line belongs to, measured per line rather than hardcoded: pdftotext // the line belongs to, measured per line rather than hardcoded: pdftotext
@@ -61,6 +65,24 @@ func (p *nlbParser) Parse(path string, acc *config.Account) ([]RawTxn, error) {
return parseNLBText(text, p.digits) return parseNLBText(text, p.digits)
} }
// StatementName names an izpisek after its statement date, izpisek_YYYY-MM-DD,
// so the folder sorts by date and two downloads of one statement collide.
func (p *nlbParser) StatementName(path string) (string, error) {
text, err := pdfToText(path)
if err != nil {
return "", err
}
return nlbStatementName(text), nil
}
func nlbStatementName(text string) string {
m := nlbStatementDate.FindStringSubmatch(text)
if m == nil {
return ""
}
return fmt.Sprintf("izpisek_%s-%s-%s", m[3], m[2], m[1])
}
// parseNLBText holds the whole parser, separated from PDF extraction so it can // parseNLBText holds the whole parser, separated from PDF extraction so it can
// be tested against captured pdftotext output. // be tested against captured pdftotext output.
func parseNLBText(text string, digits int) ([]RawTxn, error) { func parseNLBText(text string, digits int) ([]RawTxn, error) {
internal/parser/nlb_test.go
+12
View File
@@ -112,3 +112,15 @@ func TestParseNLBRejectsMalformedLine(t *testing.T) {
t.Error("expected an error for a transaction line with no amount") t.Error("expected an error for a transaction line with no amount")
} }
} }
// An izpisek is named after its statement date, as rename_izpiski.py did.
func TestNLBStatementName(t *testing.T) {
header := " IZPISEK 001/2026\n" +
" Datum izpiska 31.01.2026 Stran 1\n"
if got := nlbStatementName(header + nlbPage); got != "izpisek_2026-01-31" {
t.Errorf("name = %q, want izpisek_2026-01-31", got)
}
if got := nlbStatementName(nlbPage); got != "" {
t.Errorf("name without a statement date = %q, want none", got)
}
}
internal/parser/parser.go
+11
View File
@@ -43,6 +43,17 @@ type Warner interface {
Warnings() []string Warnings() []string
} }
// Namer is an optional interface for parsers whose bank names its downloads
// unhelpfully. StatementName reads the statement at path and returns the name,
// without extension, it should be stored under — the upload's extension is
// kept, lowercased — or "" when the statement does not say, in which case it
// keeps the name it came with. Only an upload uses
// it; files already in a folder are never renamed, since the index records
// them by path.
type Namer interface {
StatementName(path string) (string, error)
}
// Factory builds a parser from an account's config, validating it up front so // Factory builds a parser from an account's config, validating it up front so
// a bad account.toml fails before any file is read. // a bad account.toml fails before any file is read.
type Factory func(acc *config.Account) (Parser, error) type Factory func(acc *config.Account) (Parser, error)
internal/parser/traderepublic.go
+33
View File
@@ -46,6 +46,12 @@ const trAmountSlack = 5
// trDateLayout is the date Trade Republic prints, e.g. "05 Jan 2026". // trDateLayout is the date Trade Republic prints, e.g. "05 Jan 2026".
const trDateLayout = "02 Jan 2006" const trDateLayout = "02 Jan 2006"
// trPeriod is the statement period in the address block at the top of the
// first page, e.g. "DATE 01 May 2025 - 31 Jul 2026". It names the
// statement: Trade Republic's downloads are all called document-N.pdf. The
// transaction table's own DATE heading never matches, since no dates follow it.
var trPeriod = regexp.MustCompile(`\bDATE\s+(\d{2} [A-Z][a-z]{2} \d{4})\s*[-\x{2013}\x{2212}]\s*(\d{2} [A-Z][a-z]{2} \d{4})`)
func (p *tradeRepublicParser) Parse(path string, acc *config.Account) ([]RawTxn, error) { func (p *tradeRepublicParser) Parse(path string, acc *config.Account) ([]RawTxn, error) {
text, err := pdfToText(path) text, err := pdfToText(path)
if err != nil { if err != nil {
@@ -54,6 +60,33 @@ func (p *tradeRepublicParser) Parse(path string, acc *config.Account) ([]RawTxn,
return parseTradeRepublicText(text, p.digits) return parseTradeRepublicText(text, p.digits)
} }
// StatementName names a statement after its period,
// traderepublic_YYYY_MM_DD_YYYY_MM_DD, so the folder sorts by when it starts
// and two downloads of one statement collide.
func (p *tradeRepublicParser) StatementName(path string) (string, error) {
text, err := pdfToText(path)
if err != nil {
return "", err
}
return tradeRepublicStatementName(text), nil
}
func tradeRepublicStatementName(text string) string {
m := trPeriod.FindStringSubmatch(text)
if m == nil {
return ""
}
from, err := time.Parse(trDateLayout, m[1])
if err != nil {
return ""
}
to, err := time.Parse(trDateLayout, m[2])
if err != nil {
return ""
}
return "traderepublic_" + from.Format("2006_01_02") + "_" + to.Format("2006_01_02")
}
// parseTradeRepublicText holds the whole parser, separated from PDF extraction // parseTradeRepublicText holds the whole parser, separated from PDF extraction
// so it can be tested against captured pdftotext output. // so it can be tested against captured pdftotext output.
func parseTradeRepublicText(text string, digits int) ([]RawTxn, error) { func parseTradeRepublicText(text string, digits int) ([]RawTxn, error) {
internal/parser/traderepublic_test.go
+16
View File
@@ -162,3 +162,19 @@ func TestParseTradeRepublicIgnoresAmountsInDescription(t *testing.T) {
t.Errorf("description = %q, want the inline figure kept", txns[0].Description) t.Errorf("description = %q, want the inline figure kept", txns[0].Description)
} }
} }
// A statement is named after the period in its header; the transaction
// table's DATE heading, with no dates after it, is not mistaken for it.
func TestTradeRepublicStatementName(t *testing.T) {
header := "NIKOLA PETROV DATE 01 May 2025 - 31 Jul 2026\n" +
"Ulica 21 IBAN DE00000000000000000000\n\n" +
"DATE TYPE DESCRIPTION MONEY IN MONEY OUT BALANCE\n"
if got := tradeRepublicStatementName(header); got != "traderepublic_2025_05_01_2026_07_31" {
t.Errorf("name = %q, want traderepublic_2025_05_01_2026_07_31", got)
}
table := "DATE TYPE DESCRIPTION MONEY IN MONEY OUT BALANCE\n" +
"01 Jul 2026 Interest Interest payment €1.17 €671.58\n"
if got := tradeRepublicStatementName(table); got != "" {
t.Errorf("name without a period = %q, want none", got)
}
}
internal/rules/rules_test.go
+1 -1
View File
@@ -28,7 +28,7 @@ func seed(t *testing.T, db *store.DB, descriptions ...string) int64 {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
sourceID, err := db.SourceFile(accountID, "checking/st.csv", "sha", "2026-01-01T00:00:00Z") sourceID, err := db.SourceFile(accountID, "checking/st.csv", "sha", "2026-01-01T00:00:00Z", 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
internal/store/store.go
+98 -6
View File
@@ -37,6 +37,9 @@ CREATE TABLE IF NOT EXISTS source_files (
path TEXT NOT NULL, path TEXT NOT NULL,
sha256 TEXT NOT NULL, sha256 TEXT NOT NULL,
imported_at TEXT NOT NULL, imported_at TEXT NOT NULL,
-- How many transactions the statement holds, as parsed. Not how many it
-- brought in: rows an overlapping statement already had are deduplicated.
rows INTEGER NOT NULL DEFAULT 0,
UNIQUE(account_id, path) UNIQUE(account_id, path)
); );
@@ -130,15 +133,17 @@ func (d *DB) Accounts() ([]model.Account, error) {
return out, rows.Err() return out, rows.Err()
} }
// SourceFile records that a statement file was imported, returning its id. // SourceFile records that a statement file was imported, holding rows
func (d *DB) SourceFile(accountID int64, path, sha, importedAt string) (int64, error) { // transactions, and returns its id.
func (d *DB) SourceFile(accountID int64, path, sha, importedAt string, rows int) (int64, error) {
_, err := d.sql.Exec(` _, err := d.sql.Exec(`
INSERT INTO source_files (account_id, path, sha256, imported_at) INSERT INTO source_files (account_id, path, sha256, imported_at, rows)
VALUES (?, ?, ?, ?) VALUES (?, ?, ?, ?, ?)
ON CONFLICT(account_id, path) DO UPDATE SET ON CONFLICT(account_id, path) DO UPDATE SET
sha256 = excluded.sha256, sha256 = excluded.sha256,
imported_at = excluded.imported_at`, imported_at = excluded.imported_at,
accountID, path, sha, importedAt) rows = excluded.rows`,
accountID, path, sha, importedAt, rows)
if err != nil { if err != nil {
return 0, fmt.Errorf("record source file %s: %w", path, err) return 0, fmt.Errorf("record source file %s: %w", path, err)
} }
@@ -393,6 +398,93 @@ func (d *DB) Months() ([]string, error) {
return out, rows.Err() return out, rows.Err()
} }
// SourceFileInfo is what the index recorded about one imported statement.
type SourceFileInfo struct {
AccountSlug string
Path string // relative to the data root, as the importer records it
SHA256 string
ImportedAt string
// Rows is how many transactions the statement holds, as parsed.
Rows int
// Added counts the transactions this file introduced. A row seen again in
// an overlapping statement is deduplicated and stays with the file that
// brought it first, so this is not how many rows the file holds.
Added int
}
// SourceFiles lists every statement the index has imported.
func (d *DB) SourceFiles() ([]SourceFileInfo, error) {
rows, err := d.sql.Query(`
SELECT a.slug, s.path, s.sha256, s.imported_at, s.rows, COUNT(t.id)
FROM source_files s
JOIN accounts a ON a.id = s.account_id
LEFT JOIN transactions t ON t.source_file_id = s.id
GROUP BY s.id
ORDER BY a.slug, s.path`)
if err != nil {
return nil, fmt.Errorf("list source files: %w", err)
}
defer rows.Close()
var out []SourceFileInfo
for rows.Next() {
var f SourceFileInfo
if err := rows.Scan(&f.AccountSlug, &f.Path, &f.SHA256, &f.ImportedAt, &f.Rows, &f.Added); err != nil {
return nil, err
}
out = append(out, f)
}
return out, rows.Err()
}
// ForgetSourceFile removes a statement from the index: its transactions, any
// transfer pairing that used them, and the record of it, returning how many
// transactions went. Pairing is derived state that the next Link rewrites, so
// dropping a pair here loses nothing.
//
// A transaction two overlapping statements share is stored once, under the
// file that brought it first, so removing that file can take rows another
// statement still holds. The account's other statements therefore forget
// their checksums, and the next import re-reads them and restores those rows.
func (d *DB) ForgetSourceFile(accountSlug, path string) (int, error) {
tx, err := d.sql.Begin()
if err != nil {
return 0, err
}
defer tx.Rollback()
var id, accountID int64
err = tx.QueryRow(`
SELECT s.id, s.account_id FROM source_files s JOIN accounts a ON a.id = s.account_id
WHERE a.slug = ? AND s.path = ?`, accountSlug, path).Scan(&id, &accountID)
if err == sql.ErrNoRows {
return 0, nil
}
if err != nil {
return 0, fmt.Errorf("find source file %s: %w", path, err)
}
if _, err := tx.Exec(`
DELETE FROM transfers WHERE
out_txn_id IN (SELECT id FROM transactions WHERE source_file_id = ?) OR
in_txn_id IN (SELECT id FROM transactions WHERE source_file_id = ?)`, id, id); err != nil {
return 0, fmt.Errorf("forget transfers from %s: %w", path, err)
}
res, err := tx.Exec(`DELETE FROM transactions WHERE source_file_id = ?`, id)
if err != nil {
return 0, fmt.Errorf("forget transactions from %s: %w", path, err)
}
n, err := res.RowsAffected()
if err != nil {
return 0, err
}
if _, err := tx.Exec(`DELETE FROM source_files WHERE id = ?`, id); err != nil {
return 0, fmt.Errorf("forget %s: %w", path, err)
}
if _, err := tx.Exec(`UPDATE source_files SET sha256 = '' WHERE account_id = ?`, accountID); err != nil {
return 0, fmt.Errorf("mark %s's statements for re-reading: %w", accountSlug, err)
}
return int(n), tx.Commit()
}
// Tags lists every tag in use, for completion in the rule builder. // Tags lists every tag in use, for completion in the rule builder.
func (d *DB) Tags() ([]string, error) { func (d *DB) Tags() ([]string, error) {
rows, err := d.sql.Query(` rows, err := d.sql.Query(`
internal/transfers/transfers.go
+35
View File
@@ -214,6 +214,41 @@ func bestCounterpart(out model.Transaction, ins []model.Transaction, used map[in
return best return best
} }
// Wanted describes the counterpart an unpaired leg is missing, in the terms
// bestCounterpart judges it by, so a person can go and look for it.
type Wanted struct {
Account string // where the other leg would be
Desc string // the glob it would have to match
From string // the window it would have to fall in, inclusive
To string
// Amount is the other leg's signed amount, exact unless TolerancePct
// widens it. AnyAmount is set across currencies, where the amount is not
// checked at all and the dates carry the pairing alone.
Amount int64
TolerancePct float64
AnyAmount bool
}
// Want says what would have paired l. currencyOf names an account's currency,
// or "" for one the index holds nothing for.
func (e *Engine) Want(l Leg, currencyOf func(slug string) string) Wanted {
def := e.defs[l.Def]
w := Wanted{Account: def.ToAccount, Desc: def.ToDesc, Amount: -l.Txn.AmountMinor}
if !l.Out {
w.Account, w.Desc = def.FromAccount, def.FromDesc
}
if c := currencyOf(w.Account); c != "" && c != l.Txn.Currency {
w.AnyAmount = true
} else {
w.TolerancePct = def.TolerancePct
}
if d, ok := day(l.Txn.Date); ok {
w.From = d.AddDate(0, 0, -WindowDays).Format("2006-01-02")
w.To = d.AddDate(0, 0, WindowDays).Format("2006-01-02")
}
return w
}
// allowance is how far the arriving leg may miss the leaving one, in minor // allowance is how far the arriving leg may miss the leaving one, in minor
// units. It is a share of the amount that left, not of the difference, so the // units. It is a share of the amount that left, not of the difference, so the
// same percentage means the same thing on a large transfer as on a small one. // same percentage means the same thing on a large transfer as on a small one.
internal/transfers/transfers_test.go
+37
View File
@@ -353,3 +353,40 @@ func TestEqualGapPrefersTheNearerAmount(t *testing.T) {
t.Errorf("paired with %d, want 3: same gap, exact amount", res.Pairs[0].In.ID) t.Errorf("paired with %d, want 3: same gap, exact amount", res.Pairs[0].In.ID)
} }
} }
// Want describes the missing side in the terms the pairing judges it by: the
// other definition half, the window, and the amount — exact by default,
// widened only by the definition's own tolerance, unchecked across currencies.
func TestWantDescribesTheMissingSide(t *testing.T) {
eur := func(string) string { return "EUR" }
out := Leg{Def: 0, Out: true, Txn: txn(1, "nlb", "2026-03-06", "TRANSFER TO REVOLUT", -50000)}
got := engine(topUp).Want(out, eur)
want := Wanted{Account: "revolut", Desc: "*FROM NLB*", From: "2026-03-01", To: "2026-03-11", Amount: 50000}
if got != want {
t.Errorf("arriving side = %+v, want %+v", got, want)
}
in := Leg{Def: 0, Txn: txn(2, "revolut", "2026-03-09", "Top-up from NLB", 50000)}
got = engine(topUp).Want(in, eur)
want = Wanted{Account: "nlb", Desc: "*TO REVOLUT*", From: "2026-03-04", To: "2026-03-14", Amount: -50000}
if got != want {
t.Errorf("leaving side = %+v, want %+v", got, want)
}
fee := topUp
fee.TolerancePct = 1.5
if got := engine(fee).Want(out, eur); got.TolerancePct != 1.5 || got.AnyAmount {
t.Errorf("tolerant = %+v, want the definition's 1.5%%", got)
}
usd := func(slug string) string {
if slug == "revolut" {
return "USD"
}
return "EUR"
}
if got := engine(fee).Want(out, usd); !got.AnyAmount || got.TolerancePct != 0 {
t.Errorf("cross-currency = %+v, want any amount and no tolerance", got)
}
}
internal/web/server.go
+496 -74
View File
@@ -12,6 +12,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io/fs" "io/fs"
"mime"
"net/http" "net/http"
"os" "os"
"path/filepath" "path/filepath"
@@ -26,6 +27,7 @@ import (
"git.petrovv.com/nikola/money/internal/glob" "git.petrovv.com/nikola/money/internal/glob"
"git.petrovv.com/nikola/money/internal/importer" "git.petrovv.com/nikola/money/internal/importer"
"git.petrovv.com/nikola/money/internal/model" "git.petrovv.com/nikola/money/internal/model"
"git.petrovv.com/nikola/money/internal/parser"
"git.petrovv.com/nikola/money/internal/report" "git.petrovv.com/nikola/money/internal/report"
"git.petrovv.com/nikola/money/internal/rules" "git.petrovv.com/nikola/money/internal/rules"
"git.petrovv.com/nikola/money/internal/store" "git.petrovv.com/nikola/money/internal/store"
@@ -76,6 +78,7 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("GET /api/report", s.read(s.report)) mux.HandleFunc("GET /api/report", s.read(s.report))
mux.HandleFunc("GET /api/rules", s.read(s.ruleList)) mux.HandleFunc("GET /api/rules", s.read(s.ruleList))
mux.HandleFunc("GET /api/tags", s.read(s.tagList))
mux.HandleFunc("POST /api/rules/preview", s.read(s.rulePreview)) mux.HandleFunc("POST /api/rules/preview", s.read(s.rulePreview))
mux.HandleFunc("POST /api/rules", s.write(s.createRule)) mux.HandleFunc("POST /api/rules", s.write(s.createRule))
mux.HandleFunc("PUT /api/rules/{pos}", s.write(s.editRule)) mux.HandleFunc("PUT /api/rules/{pos}", s.write(s.editRule))
@@ -88,6 +91,9 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("POST /api/import", s.write(s.runImport)) mux.HandleFunc("POST /api/import", s.write(s.runImport))
mux.HandleFunc("POST /api/upload", s.write(s.upload)) mux.HandleFunc("POST /api/upload", s.write(s.upload))
mux.HandleFunc("GET /api/files", s.read(s.fileList))
mux.HandleFunc("GET /api/files/{account}/{name}", s.serveFile)
mux.HandleFunc("POST /api/files/delete", s.write(s.removeFile))
mux.HandleFunc("POST /api/retag", s.write(s.retag)) mux.HandleFunc("POST /api/retag", s.write(s.retag))
return mux return mux
} }
@@ -551,6 +557,55 @@ func (s *Server) ruleList(*http.Request) (any, error) {
return map[string]any{"rules": rows}, nil return map[string]any{"rules": rows}, nil
} }
type tagRule struct {
Pos int `json:"pos"` // file position, as the rules screen numbers it
Pattern string `json:"pattern"`
Account string `json:"account"`
Usage int `json:"usage"`
}
type tagEntry struct {
Tag string `json:"tag"`
Transactions int `json:"transactions"`
Rules []tagRule `json:"rules"`
}
// tagList is every distinct tag — the ones the index holds and the ones
// rules.toml names — with how many transactions carry it and the rules that
// write it. A tag is only ever what a rule wrote, so the transfer label is
// never among them, and a tag no rule names any more is one a retag will
// clear.
func (s *Server) tagList(*http.Request) (any, error) {
txns, err := s.db.Transactions(store.Filter{})
if err != nil {
return nil, err
}
counts := map[string]int{}
for _, t := range txns {
if t.RuleTag != "" {
counts[t.RuleTag]++
}
}
rules := map[string][]tagRule{}
usage := s.engine.Usage(txns)
for i, r := range s.engine.Rules() {
rules[r.Tag] = append(rules[r.Tag], tagRule{Pos: i, Pattern: rulePattern(r), Account: r.Account, Usage: usage[i]})
}
tags, err := s.knownTags()
if err != nil {
return nil, err
}
rows := make([]tagEntry, 0, len(tags))
for _, tag := range tags {
rs := rules[tag]
if rs == nil {
rs = []tagRule{}
}
rows = append(rows, tagEntry{Tag: tag, Transactions: counts[tag], Rules: rs})
}
return map[string]any{"tags": rows}, nil
}
// rulePattern renders whichever patterns a rule sets, labelled so a type rule // rulePattern renders whichever patterns a rule sets, labelled so a type rule
// is not mistaken for a description one. // is not mistaken for a description one.
func rulePattern(r config.Rule) string { func rulePattern(r config.Rule) string {
@@ -892,6 +947,20 @@ type transferRow struct {
Tolerance string `json:"tolerance"` // blank for the exact-amount default Tolerance string `json:"tolerance"` // blank for the exact-amount default
Paired int `json:"paired"` Paired int `json:"paired"`
Orphaned int `json:"orphaned"` Orphaned int `json:"orphaned"`
// Legs are the transactions behind Orphaned, newest first, so a ⚠ can be
// opened to see which movement is missing its other side.
Legs []unpairedLeg `json:"legs"`
}
type unpairedLeg struct {
Date string `json:"date"`
Amount string `json:"amount"`
Movement string `json:"movement"` // "checking → ?" or "? → savings"
Description string `json:"description"`
// Missing names the side not found, "arriving" or "leaving", and Want
// what it would have had to look like to pair.
Missing string `json:"missing"`
Want string `json:"want"`
} }
func (s *Server) transferList(*http.Request) (any, error) { func (s *Server) transferList(*http.Request) (any, error) {
@@ -899,18 +968,80 @@ func (s *Server) transferList(*http.Request) (any, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
accounts, err := s.db.Accounts()
if err != nil {
return nil, err
}
currency := map[string]string{}
digits := map[string]int{}
for _, a := range accounts {
currency[a.Slug], digits[a.Slug] = a.Currency, a.MinorDigits
}
defs := s.links.Transfers() defs := s.links.Transfers()
res := s.links.Analyze(txns) res := s.links.Analyze(txns)
rows := make([]transferRow, 0, len(defs)) rows := make([]transferRow, 0, len(defs))
for i, t := range defs { for i, t := range defs {
rows = append(rows, transferRow{ rows = append(rows, transferRow{
transferJSON: toTransferJSON(t), Pos: i, Tolerance: formatTolerance(t.TolerancePct), transferJSON: toTransferJSON(t), Pos: i, Tolerance: formatTolerance(t.TolerancePct),
Paired: res.Paired[i], Orphaned: res.Orphaned[i], Paired: res.Paired[i], Orphaned: res.Orphaned[i], Legs: []unpairedLeg{},
}) })
} }
for _, l := range res.Unmatched {
row := legRow(l)
w := s.links.Want(l, func(slug string) string { return currency[slug] })
d, imported := digits[w.Account]
if !imported {
d = l.Txn.MinorDigits
}
leg := unpairedLeg{
Date: row.Date, Amount: row.Amount, Movement: row.Movement, Description: row.Description,
Missing: "arriving", Want: describeWant(w, d),
}
if !l.Out {
leg.Missing = "leaving"
}
if !imported {
// The commonest cause of all, so it is named outright.
leg.Want += fmt.Sprintf(" — nothing from %s is imported", w.Account)
}
rows[l.Def].Legs = append(rows[l.Def].Legs, leg)
}
for i := range rows {
sort.SliceStable(rows[i].Legs, func(a, b int) bool { return rows[i].Legs[a].Date > rows[i].Legs[b].Date })
}
return map[string]any{"transfers": rows, "unpaired": len(res.Unmatched)}, nil return map[string]any{"transfers": rows, "unpaired": len(res.Unmatched)}, nil
} }
// describeWant puts transfers.Wanted into the words the transfers screen uses.
// The amount is signed as the other statement would show it.
func describeWant(w transfers.Wanted, digits int) string {
amount := model.FormatMinor(w.Amount, digits)
if w.Amount > 0 {
amount = "+" + amount
}
switch {
case w.AnyAmount:
amount = "any amount (another currency)"
case w.TolerancePct > 0:
amount += " ±" + formatTolerance(w.TolerancePct)
}
return fmt.Sprintf("%s in %s matching %s, dated %s to %s", amount, w.Account, w.Desc, w.From, w.To)
}
// legRow is an unpaired leg as the builder's preview and the transfers screen
// both show it: the amount that moved, and the side that has no partner.
func legRow(l transfers.Leg) transferPreviewRow {
amount, movement := l.Txn.AmountMinor, "? → "+l.Txn.AccountSlug
if l.Out {
amount, movement = -amount, l.Txn.AccountSlug+" → ?"
}
return transferPreviewRow{
Marker: "⚠", Date: l.Txn.Date, Amount: model.FormatMinor(amount, l.Txn.MinorDigits),
Movement: movement, Description: l.Txn.Description,
}
}
// formatTolerance leaves the default blank, so the one or two definitions // formatTolerance leaves the default blank, so the one or two definitions
// actually pairing on slack are what the column shows. // actually pairing on slack are what the column shows.
func formatTolerance(pct float64) string { func formatTolerance(pct float64) string {
@@ -1009,14 +1140,7 @@ func (s *Server) transferPreview(r *http.Request) (any, error) {
if l.Def != mine { if l.Def != mine {
continue continue
} }
amount, movement := l.Txn.AmountMinor, "? → "+l.Txn.AccountSlug out.Rows = append(out.Rows, legRow(l))
if l.Out {
amount, movement = -amount, l.Txn.AccountSlug+" → ?"
}
out.Rows = append(out.Rows, transferPreviewRow{
Marker: "⚠", Date: l.Txn.Date, Amount: model.FormatMinor(amount, l.Txn.MinorDigits),
Movement: movement, Description: l.Txn.Description,
})
} }
sort.SliceStable(out.Rows, func(i, j int) bool { return out.Rows[i].Date > out.Rows[j].Date }) sort.SliceStable(out.Rows, func(i, j int) bool { return out.Rows[i].Date > out.Rows[j].Date })
if fees != 0 { if fees != 0 {
@@ -1139,26 +1263,22 @@ func (s *Server) runImport(r *http.Request) (any, error) {
if err := decode(r, &req); err != nil { if err := decode(r, &req); err != nil {
return nil, err return nil, err
} }
return s.importAll(req.Force)
}
func (s *Server) importAll(force bool) (importJSON, error) {
accounts, err := config.LoadAccounts(s.root) accounts, err := config.LoadAccounts(s.root)
if err != nil { if err != nil {
return importJSON{}, err return nil, err
} }
if len(accounts) == 0 { if len(accounts) == 0 {
return importJSON{}, badRequest("no accounts found in %s (an account is a folder containing %s)", return nil, badRequest("no accounts found in %s (an account is a folder containing %s)",
s.root, config.AccountFile) s.root, config.AccountFile)
} }
if err := s.reloadRules(); err != nil { if err := s.reloadRules(); err != nil {
return importJSON{}, err return nil, err
} }
s.accounts = accounts s.accounts = accounts
res, err := importer.Run(s.root, s.db, s.accounts, s.engine, s.links, importer.Options{Force: force}) res, err := importer.Run(s.root, s.db, s.accounts, s.engine, s.links, importer.Options{Force: req.Force})
if err != nil { if err != nil {
return importJSON{}, err return nil, err
} }
_, added, skipped := res.Total() _, added, skipped := res.Total()
@@ -1197,10 +1317,11 @@ type uploadReq struct {
Files []uploadFile `json:"files"` Files []uploadFile `json:"files"`
} }
// upload saves statements into an account folder and imports them. The files // upload saves statements into an account folder. The files on disk are the
// on disk are the source of truth and the index is derived from them, so an // source of truth and the index is derived from them, so an upload is nothing
// upload is nothing more than putting a file where `money import` looks; the // more than putting a file where `money import` looks. It does not import:
// import that follows is the one the Import button runs. // that stays the user's call, made with the Import button, so a batch can be
// put together and checked on the statements list before it is read.
// //
// Files arrive base64 inside JSON rather than as multipart: a multipart body // Files arrive base64 inside JSON rather than as multipart: a multipart body
// is exactly what a cross-site form can send, and the JSON-only rule is the // is exactly what a cross-site form can send, and the JSON-only rule is the
@@ -1228,60 +1349,133 @@ func (s *Server) upload(r *http.Request) (any, error) {
req.Account, s.root, config.AccountFile) req.Account, s.root, config.AccountFile)
} }
// Everything is checked before anything is written, so a bad file in a p, err := parser.For(acc)
// batch leaves the folder as it was rather than half uploaded. if err != nil {
var write []uploadFile return nil, badRequest("%v", err)
var same []string
seen := map[string]bool{}
for _, f := range req.Files {
if err := checkStatementName(acc, f.Name); err != nil {
return nil, err
}
if seen[f.Name] {
return nil, badRequest("%s is in the upload twice", f.Name)
}
seen[f.Name] = true
existing, err := os.ReadFile(filepath.Join(acc.Dir, f.Name))
switch {
case err == nil && bytes.Equal(existing, f.Data):
same = append(same, f.Name)
case err == nil:
// A statement is the source of truth for what it already
// imported; replacing it under the same name is not an upload's
// decision to make.
return nil, &apiError{http.StatusConflict, fmt.Sprintf(
"%s/%s already exists with different contents; rename the file or remove the old one first",
acc.Slug, f.Name)}
case !errors.Is(err, fs.ErrNotExist):
return nil, err
default:
write = append(write, f)
}
}
for _, f := range write {
if err := writeStatement(acc.Dir, f); err != nil {
return nil, err
}
} }
namer, _ := p.(parser.Namer)
out, err := s.importAll(false) // Each file is staged as a dotfile — invisible to import — so a parser
// that names its statements can read it. Everything is then checked
// before anything is moved into place, so a bad file in a batch leaves
// the folder as it was rather than half uploaded.
type staged struct {
orig, name, tmp string
data []byte
named bool // the parser chose name, from the statement
}
var batch []*staged
defer func() {
for _, f := range batch {
if f.tmp != "" {
os.Remove(f.tmp)
}
}
}()
for _, f := range req.Files {
if err := checkPlainName(f.Name); err != nil {
return nil, err
}
tmp, err := stageStatement(acc.Dir, f.Data)
if err != nil { if err != nil {
return nil, err return nil, err
} }
st := &staged{orig: f.Name, name: f.Name, tmp: tmp, data: f.Data}
batch = append(batch, st)
if namer != nil {
stem, err := namer.StatementName(tmp)
if err != nil {
return nil, badRequest("%s: %v", f.Name, err)
}
if stem != "" {
st.name, st.named = stem+strings.ToLower(filepath.Ext(f.Name)), true
}
}
}
var write []*staged
var same, renamed []string
claimed := map[string][]byte{}
for _, f := range batch {
base, n := f.name, 2
resolve:
for {
if err := checkStatementName(acc, f.name); err != nil {
return nil, err
}
existing, inBatch := claimed[f.name]
var err error
if !inBatch {
existing, err = os.ReadFile(filepath.Join(acc.Dir, f.name))
if err != nil && !errors.Is(err, fs.ErrNotExist) {
return nil, err
}
}
switch {
case !inBatch && err != nil: // free
claimed[f.name] = f.data
write = append(write, f)
break resolve
case bytes.Equal(existing, f.data):
same = append(same, f.orig)
break resolve
case f.named:
// A name the parser chose can be taken by a different
// statement of the same date — a reissue — so it is
// numbered, as rename_izpiski.py did, rather than refused.
f.name = fmt.Sprintf("%s_%d%s", strings.TrimSuffix(base, filepath.Ext(base)), n, filepath.Ext(base))
n++
case inBatch:
return nil, badRequest("%s is in the upload twice", f.orig)
default:
// A statement is the source of truth for what it already
// imported; replacing it under the same name is not an
// upload's decision to make.
return nil, &apiError{http.StatusConflict, fmt.Sprintf(
"%s/%s already exists with different contents; rename the file or remove the old one first",
acc.Slug, f.name)}
}
}
}
for _, f := range write {
path := filepath.Join(acc.Dir, f.name)
if err := os.Rename(f.tmp, path); err != nil {
return nil, fmt.Errorf("write %s: %w", path, err)
}
f.tmp = ""
if f.name != f.orig {
renamed = append(renamed, f.orig+" → "+f.name)
}
}
msg := fmt.Sprintf("uploaded %d file(s) to %s", len(write), acc.Slug) msg := fmt.Sprintf("uploaded %d file(s) to %s", len(write), acc.Slug)
if len(same) > 0 { if len(same) > 0 {
msg += fmt.Sprintf(" (%d already there)", len(same)) msg += fmt.Sprintf(" (%d already there)", len(same))
} }
out.Status = msg + " · " + out.Status if len(renamed) > 0 {
return out, nil msg += ", named by statement date: " + strings.Join(renamed, ", ")
}
if len(write) > 0 {
msg += " · press Import to read them"
}
return status{msg}, nil
}
// checkPlainName refuses anything that is not a plain file name, before the
// file is so much as staged.
func checkPlainName(name string) error {
if name == "" || name != filepath.Base(name) || strings.ContainsAny(name, "/\\\x00") ||
name == "." || name == ".." {
return badRequest("%q is not a plain file name", name)
}
return nil
} }
// checkStatementName refuses any name the importer would not read back as a // checkStatementName refuses any name the importer would not read back as a
// statement of this account, and anything that is not a plain file name. // statement of this account, and anything that is not a plain file name.
func checkStatementName(acc *config.Account, name string) error { func checkStatementName(acc *config.Account, name string) error {
if name == "" || name != filepath.Base(name) || strings.ContainsAny(name, "/\\\x00") || if err := checkPlainName(name); err != nil {
name == "." || name == ".." { return err
return badRequest("%q is not a plain file name", name)
} }
if strings.HasPrefix(name, ".") || name == config.AccountFile { if strings.HasPrefix(name, ".") || name == config.AccountFile {
return badRequest("%s would be ignored by import (dotfiles and %s are not statements)", return badRequest("%s would be ignored by import (dotfiles and %s are not statements)",
@@ -1294,29 +1488,257 @@ func checkStatementName(acc *config.Account, name string) error {
return nil return nil
} }
// writeStatement writes through a dotfile and renames it into place, so a // stageStatement writes an upload to a dotfile in the account folder. Import
// skips dotfiles, so it is invisible until renamed into place — and a
// concurrent `money import` never reads half a statement. // concurrent `money import` never reads half a statement.
func writeStatement(dir string, f uploadFile) error { func stageStatement(dir string, data []byte) (string, error) {
path := filepath.Join(dir, f.Name)
tmp, err := os.CreateTemp(dir, ".upload-*") tmp, err := os.CreateTemp(dir, ".upload-*")
if err != nil { if err != nil {
return fmt.Errorf("write %s: %w", path, err) return "", fmt.Errorf("write to %s: %w", dir, err)
} }
defer os.Remove(tmp.Name()) // a no-op once renamed if _, err := tmp.Write(data); err != nil {
if _, err := tmp.Write(f.Data); err != nil {
tmp.Close() tmp.Close()
return fmt.Errorf("write %s: %w", path, err) os.Remove(tmp.Name())
return "", fmt.Errorf("write %s: %w", tmp.Name(), err)
} }
if err := tmp.Close(); err != nil { if err := tmp.Close(); err != nil {
return fmt.Errorf("write %s: %w", path, err) os.Remove(tmp.Name())
return "", fmt.Errorf("write %s: %w", tmp.Name(), err)
} }
if err := os.Chmod(tmp.Name(), 0o644); err != nil { if err := os.Chmod(tmp.Name(), 0o644); err != nil {
return err os.Remove(tmp.Name())
return "", err
} }
if err := os.Rename(tmp.Name(), path); err != nil { return tmp.Name(), nil
return fmt.Errorf("write %s: %w", path, err)
} }
return nil
type fileRow struct {
Account string `json:"account"`
Name string `json:"name"`
Size int64 `json:"size"`
// Modified is the file's mtime, YYYY-MM-DD HH:MM in local time; blank for
// a file that is gone from disk.
Modified string `json:"modified"`
// Status is "imported", "changed" (on disk differs from what was
// imported), "new" (not imported yet, or its import failed) or "missing"
// (imported, then removed from disk; its rows stay in the index until it
// is rebuilt).
Status string `json:"status"`
ImportedAt string `json:"importedAt"`
// Rows is how many transactions the statement holds; Added how many of
// them it was the first to bring in, which overlap with another statement
// can make fewer.
Rows int `json:"rows"`
Added int `json:"added"`
}
// fileList is every statement on disk next to what the index recorded about
// it. The folders are the source of truth, so they decide what is listed, and
// a file the index remembers but the disk no longer holds is called out: its
// rows would not survive a rebuild.
func (s *Server) fileList(*http.Request) (any, error) {
recorded, err := s.db.SourceFiles()
if err != nil {
return nil, err
}
byPath := map[string]store.SourceFileInfo{}
for _, f := range recorded {
byPath[f.Path] = f
}
accounts, err := config.LoadAccounts(s.root)
if err != nil {
return nil, err
}
out := []fileRow{}
onDisk := map[string]bool{}
for _, acc := range accounts {
paths, err := importer.StatementFiles(acc)
if err != nil {
return nil, err
}
for _, path := range paths {
rel, err := filepath.Rel(s.root, path)
if err != nil {
return nil, err
}
onDisk[rel] = true
row := fileRow{Account: acc.Slug, Name: filepath.Base(path), Status: "new"}
if info, err := os.Stat(path); err == nil {
row.Size, row.Modified = info.Size(), info.ModTime().Format("2006-01-02 15:04")
}
if rec, ok := byPath[rel]; ok {
row.ImportedAt, row.Rows, row.Added, row.Status = rec.ImportedAt, rec.Rows, rec.Added, "imported"
if sum, err := importer.Checksum(path); err != nil {
return nil, err
} else if sum != rec.SHA256 {
row.Status = "changed"
}
}
out = append(out, row)
}
}
for _, rec := range recorded {
if !onDisk[rec.Path] {
out = append(out, fileRow{
Account: rec.AccountSlug, Name: filepath.Base(rec.Path), Status: "missing",
ImportedAt: rec.ImportedAt, Rows: rec.Rows, Added: rec.Added,
})
}
}
sort.SliceStable(out, func(i, j int) bool {
if out[i].Account != out[j].Account {
return out[i].Account < out[j].Account
}
return out[i].Name < out[j].Name
})
return map[string]any{"files": out}, nil
}
// serveFile opens a statement in the browser. Only a file import would read
// is served — it is looked up in the account's statement list, never joined
// onto a path — so nothing else under the data root can be fetched.
//
// A statement is whatever the bank sent, and it is served from this origin,
// where a script could drive the API; so nothing is ever rendered as a page.
// Text opens inline as text/plain under a sandboxing CSP, and anything that is
// neither text nor PDF downloads. A PDF opens inline without the sandbox: the
// browsers' viewers refuse to run under one, and they render it in their own
// isolated viewer rather than in this origin's DOM.
func (s *Server) serveFile(w http.ResponseWriter, r *http.Request) {
s.mu.RLock()
defer s.mu.RUnlock()
fail := func(code int, msg string) {
writeJSON(w, code, map[string]string{"error": msg})
}
accounts, err := config.LoadAccounts(s.root)
if err != nil {
fail(http.StatusInternalServerError, err.Error())
return
}
account, name := r.PathValue("account"), r.PathValue("name")
var path string
for _, acc := range accounts {
if acc.Slug != account {
continue
}
paths, err := importer.StatementFiles(acc)
if err != nil {
fail(http.StatusInternalServerError, err.Error())
return
}
for _, p := range paths {
if filepath.Base(p) == name {
path = p
}
}
}
if path == "" {
fail(http.StatusNotFound, fmt.Sprintf("no statement %s/%s", account, name))
return
}
disposition := "attachment"
switch strings.ToLower(filepath.Ext(name)) {
case ".pdf":
w.Header().Set("Content-Type", "application/pdf")
disposition = "inline"
case ".csv", ".txt", ".tsv":
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
w.Header().Set("Content-Security-Policy", "sandbox")
disposition = "inline"
default:
w.Header().Set("Content-Type", "application/octet-stream")
w.Header().Set("Content-Security-Policy", "sandbox")
}
w.Header().Set("Content-Disposition", mime.FormatMediaType(disposition, map[string]string{"filename": name}))
w.Header().Set("X-Content-Type-Options", "nosniff")
w.Header().Set("Cache-Control", "no-store")
http.ServeFile(w, r, path)
}
type removeFileReq struct {
Account string `json:"account"`
Name string `json:"name"`
}
// removeFile takes a statement out of the data: the file is deleted and its
// transactions leave the index. A file already gone from disk is only
// forgotten by the index. The deletion is permanent — the page says so before
// asking — so nothing here keeps a copy.
//
// It does not import. Rows the file shared with an overlapping statement went
// with it, and ForgetSourceFile marks the account's other statements so the
// next Import re-reads them and restores those rows; until then they show as
// changed. Pairing is re-derived here, though: it reads no statement, and a
// leg whose partner just went should not stay counted as a transfer.
func (s *Server) removeFile(r *http.Request) (any, error) {
var req removeFileReq
if err := decode(r, &req); err != nil {
return nil, err
}
if err := checkPlainName(req.Name); err != nil {
return nil, err
}
rel := filepath.Join(req.Account, req.Name)
// The file is found in the account's statement list, never by joining the
// request onto a path, exactly as serveFile does.
var path string
accounts, err := config.LoadAccounts(s.root)
if err != nil {
return nil, err
}
for _, acc := range accounts {
if acc.Slug != req.Account {
continue
}
paths, err := importer.StatementFiles(acc)
if err != nil {
return nil, err
}
for _, p := range paths {
if filepath.Base(p) == req.Name {
path = p
}
}
}
if path != "" {
if err := os.Remove(path); err != nil {
return nil, fmt.Errorf("remove %s: %w", path, err)
}
}
dropped, err := s.db.ForgetSourceFile(req.Account, rel)
if err != nil {
return nil, err
}
if path == "" && dropped == 0 {
known, err := s.db.SourceFiles()
if err != nil {
return nil, err
}
if !slices.ContainsFunc(known, func(f store.SourceFileInfo) bool { return f.Path == rel }) {
return nil, &apiError{http.StatusNotFound, fmt.Sprintf("no statement %s", rel)}
}
}
_, unpaired, err := s.links.Link(s.db)
if err != nil {
return nil, err
}
verb := "deleted"
if path == "" {
verb = "forgot"
}
msg := fmt.Sprintf("%s %s, %d transaction(s) dropped", verb, rel, dropped)
if unpaired > 0 {
msg += fmt.Sprintf(" · %d transfer leg(s) unpaired", unpaired)
}
if dropped > 0 {
msg += " · press Import to restore any of them another statement also holds"
}
return status{msg}, nil
} }
// retag is `money retag`: both halves of what rules.toml decides, re-derived // retag is `money retag`: both halves of what rules.toml decides, re-derived
internal/web/server_test.go
+89 -1
View File
@@ -44,7 +44,7 @@ func newTestServer(t *testing.T, rulesToml string, txns ...fixtureTxn) (*Server,
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
src, err := db.SourceFile(id, slug+"/st.csv", "sha", "2026-01-01T00:00:00Z") src, err := db.SourceFile(id, slug+"/st.csv", "sha", "2026-01-01T00:00:00Z", 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -426,3 +426,91 @@ to_desc = "*FROM CHECKING*"
} }
} }
} }
// A ⚠ on the transfers screen opens onto the legs behind it: which side each
// is missing, and what that side would have to be.
func TestTransferListNamesTheMissingLegs(t *testing.T) {
_, h := newTestServer(t, `
[[transfer]]
from_account = "checking"
from_desc = "*TO SAVINGS*"
to_account = "savings"
to_desc = "*FROM CHECKING*"
`,
fixtureTxn{"checking", "2026-02-01", "TO SAVINGS", -1000},
fixtureTxn{"savings", "2026-02-02", "FROM CHECKING", 1000},
fixtureTxn{"checking", "2026-02-20", "TO SAVINGS", -2500},
fixtureTxn{"savings", "2026-01-10", "FROM CHECKING", 700},
)
var list struct {
Transfers []transferRow
Unpaired int
}
call(t, h, "GET", "/api/transfers", nil, http.StatusOK, &list)
legs := list.Transfers[0].Legs
if list.Unpaired != 2 || len(legs) != 2 {
t.Fatalf("unpaired = %d, legs = %+v; want the two lone legs", list.Unpaired, legs)
}
newest, oldest := legs[0], legs[1]
if newest.Movement != "checking → ?" || newest.Missing != "arriving" ||
newest.Want != "+25.00 in savings matching *FROM CHECKING*, dated 2026-02-15 to 2026-02-25" {
t.Errorf("newest leg = %+v", newest)
}
if oldest.Movement != "? → savings" || oldest.Missing != "leaving" ||
oldest.Want != "-7.00 in checking matching *TO SAVINGS*, dated 2026-01-05 to 2026-01-15" {
t.Errorf("oldest leg = %+v", oldest)
}
}
// The tags screen lists each tag once, with the transactions carrying it and
// every rule that writes it — a shadowed one at zero — and never the
// transfer label, which no rule wrote.
func TestTagListGroupsRulesByTag(t *testing.T) {
_, h := newTestServer(t, `
[[rule]]
match = "*LIDL*"
tag = "groceries"
[[rule]]
match = "*KAUFLAND*"
tag = "groceries"
[[rule]]
match = "*LIDL SOFIA*"
tag = "groceries"
[[rule]]
match = "*ZARA*"
tag = "clothes"
[[transfer]]
from_account = "checking"
from_desc = "*TO SAVINGS*"
to_account = "savings"
to_desc = "*FROM CHECKING*"
`,
fixtureTxn{"checking", "2026-02-01", "LIDL SOFIA", -1000},
fixtureTxn{"checking", "2026-02-02", "KAUFLAND", -500},
fixtureTxn{"checking", "2026-02-03", "TO SAVINGS", -100},
fixtureTxn{"savings", "2026-02-03", "FROM CHECKING", 100},
)
var res struct{ Tags []tagEntry }
call(t, h, "GET", "/api/tags", nil, http.StatusOK, &res)
if len(res.Tags) != 2 || res.Tags[0].Tag != "clothes" || res.Tags[1].Tag != "groceries" {
t.Fatalf("tags = %+v, want clothes and groceries only", res.Tags)
}
clothes, groceries := res.Tags[0], res.Tags[1]
if clothes.Transactions != 0 || len(clothes.Rules) != 1 {
t.Errorf("clothes = %+v, want its rule and no transactions", clothes)
}
if groceries.Transactions != 2 || len(groceries.Rules) != 3 {
t.Fatalf("groceries = %+v, want 2 transactions from 3 rules", groceries)
}
usage := map[string]int{}
for _, r := range groceries.Rules {
usage[r.Pattern] = r.Usage
}
if usage["*LIDL*"] != 0 || usage["*LIDL SOFIA*"] != 1 || usage["*KAUFLAND*"] != 1 {
t.Errorf("usage = %v, want *LIDL* shadowed by *LIDL SOFIA*", usage)
}
}
internal/web/static/app.js
+180 -102
View File
@@ -12,6 +12,7 @@ const VIEWS = [
{ id: 'rules', title: 'Rules', mount: mountRules }, { id: 'rules', title: 'Rules', mount: mountRules },
{ id: 'transfer', title: 'Transfer builder', mount: mountTransferBuilder }, { id: 'transfer', title: 'Transfer builder', mount: mountTransferBuilder },
{ id: 'transfers', title: 'Transfers', mount: mountTransfers }, { id: 'transfers', title: 'Transfers', mount: mountTransfers },
{ id: 'tags', title: 'Tags', mount: mountTags },
]; ];
const state = { const state = {
@@ -41,7 +42,9 @@ function blankTransfer() {
// --- plumbing ------------------------------------------------------------- // --- plumbing -------------------------------------------------------------
// h builds an element. Text always goes in as a text node, never as HTML, // h builds an element. Text always goes in as a text node, never as HTML,
// since descriptions come straight off bank statements. // since descriptions come straight off bank statements. Children flatten all
// the way down: a map that yields a group of rows — the report's transfers
// and their fee — would otherwise be stringified into the page.
function h(tag, attrs, ...children) { function h(tag, attrs, ...children) {
const el = document.createElement(tag); const el = document.createElement(tag);
for (const [k, v] of Object.entries(attrs || {})) { for (const [k, v] of Object.entries(attrs || {})) {
@@ -51,7 +54,7 @@ function h(tag, attrs, ...children) {
else if (k === 'value') el.value = v; else if (k === 'value') el.value = v;
else el.setAttribute(k, v === true ? '' : v); else el.setAttribute(k, v === true ? '' : v);
} }
for (const c of children.flat()) { for (const c of children.flat(Infinity)) {
if (c === null || c === undefined || c === false) continue; if (c === null || c === undefined || c === false) continue;
el.append(c instanceof Node ? c : document.createTextNode(String(c))); el.append(c instanceof Node ? c : document.createTextNode(String(c)));
} }
@@ -172,7 +175,7 @@ function renderNav() {
nav.replaceChildren(...VIEWS.map((v, i) => h('a', { nav.replaceChildren(...VIEWS.map((v, i) => h('a', {
href: '#' + v.id, href: '#' + v.id,
class: v.id === state.view ? 'active' : null, class: v.id === state.view ? 'active' : null,
}, h('kbd', {}, String(i + 1)), v.title))); }, v.title)));
} }
function go(id) { function go(id) {
@@ -186,8 +189,8 @@ function go(id) {
function show() { function show() {
const id = location.hash.slice(1) || 'accounts'; const id = location.hash.slice(1) || 'accounts';
const view = VIEWS.find((v) => v.id === id) || VIEWS[0]; const view = VIEWS.find((v) => v.id === id) || VIEWS[0];
// Leaving the builder mid-edit abandons the edit, as esc does: a new rule // Leaving the builder mid-edit abandons the edit, as Cancel does: a new
// must not start out as a copy of the one being edited. // rule must not start out as a copy of the one being edited.
if (view.id !== 'rule' && state.rule.editing) state.rule = blankRule(); if (view.id !== 'rule' && state.rule.editing) state.rule = blankRule();
state.view = view.id; state.view = view.id;
renderNav(); renderNav();
@@ -203,35 +206,30 @@ async function refreshAll() {
// --- import and retag ----------------------------------------------------- // --- import and retag -----------------------------------------------------
function runImport(force) { // runImport is `money import`, or with force `money import --force`: every
return importing(() => api('POST', '/api/import', { force: !!force })); // statement re-read, including the ones the checksum would skip.
} async function runImport(force) {
if (state.busy) return;
// importing runs a request that ends in an import — the Import button, or an
// upload — and reports it the same way. It answers whether the request
// succeeded; per-file failures inside the import still count as success.
async function importing(request) {
if (state.busy) return false;
state.busy = true; state.busy = true;
const btn = document.getElementById('import'); const buttons = ['import', 'reread'].map((id) => document.getElementById(id));
btn.disabled = true; const btn = buttons[force ? 1 : 0];
btn.textContent = 'Importing…'; const label = btn.textContent;
for (const b of buttons) b.disabled = true;
btn.textContent = force ? 'Re-reading…' : 'Importing…';
setStatus('importing… parsing PDF statements can take a while'); setStatus('importing… parsing PDF statements can take a while');
try { try {
const res = await request(); const res = await api('POST', '/api/import', { force: !!force });
state.status = res.status; state.status = res.status;
state.error = res.failed ? `${res.failed} file(s) failed to import` : ''; state.error = res.failed ? `${res.failed} file(s) failed to import` : '';
renderBanners(); renderBanners();
showImportDetails(res); showImportDetails(res);
await refreshAll(); await refreshAll();
return true;
} catch (e) { } catch (e) {
setError(e); setError(e);
return false;
} finally { } finally {
state.busy = false; state.busy = false;
btn.disabled = false; for (const b of buttons) b.disabled = false;
btn.textContent = 'Import'; btn.textContent = label;
} }
} }
@@ -264,13 +262,15 @@ async function retag() {
function mountAccounts(main) { function mountAccounts(main) {
const body = h('div'); const body = h('div');
const files = h('div');
const upload = h('div'); const upload = h('div');
main.append(h('h2', {}, 'Accounts'), body, upload); main.append(h('h2', {}, 'Accounts'), body, files, upload);
async function refresh() { async function refresh() {
if (!state.overview) await loadOverview(); if (!state.overview) await loadOverview();
const o = state.overview; const o = state.overview;
upload.replaceChildren(uploader(o)); upload.replaceChildren(uploader(o));
api('GET', '/api/files').then((res) => files.replaceChildren(fileList(res.files))).catch(setError);
if (!o.accounts.length) { if (!o.accounts.length) {
// An account.toml is not enough on its own: folders reach the index // An account.toml is not enough on its own: folders reach the index
// only through an import, so say that rather than show nothing. // only through an import, so say that rather than show nothing.
@@ -293,6 +293,82 @@ function mountAccounts(main) {
return { refresh }; return { refresh };
} }
const FILE_STATUS = {
imported: ['✓', '', 'imported'],
changed: ['⚠', 'warn', 'changed'],
new: ['•', 'warn', 'not imported'],
missing: ['✗', 'neg', 'gone from disk'],
};
// fileList shows the statements in every account folder beside what the index
// recorded about each, and opens one on click. The folders decide what is
// listed; the index only says how far each file has got.
function fileList(list) {
const panel = h('div', { class: 'panel files' });
if (!list.length) {
panel.append(h('div', { class: 'empty' }, 'No statement files yet.'));
return h('div', {}, h('h3', { class: 'section' }, 'Statements'), panel);
}
const pending = list.filter((f) => f.status !== 'imported').length;
panel.append(h('table', {},
h('thead', {}, h('tr', {}, h('th', {}, 'Account'), h('th', {}, 'File'), h('th', { class: 'num' }, 'Size'),
h('th', {}, 'Modified'), h('th', {}, ''), h('th', {}, 'Status'),
h('th', { class: 'num', title: 'Transactions the file holds, and how many of them it was the first to bring in — an overlapping statement imported earlier already holds the rest' }, 'Transactions'),
h('th', {}, 'Imported'), h('th', {}, ''))),
h('tbody', {}, list.map((f) => {
const [mark, cls, text] = FILE_STATUS[f.status] || ['', '', f.status];
return h('tr', {},
h('td', {}, f.account),
h('td', { class: 'desc' }, f.status === 'missing' ? h('span', { class: 'muted' }, f.name) : h('a', {
href: `/api/files/${encodeURIComponent(f.account)}/${encodeURIComponent(f.name)}`,
target: '_blank', rel: 'noopener', title: 'Open this statement',
}, f.name)),
h('td', { class: 'num' }, f.status === 'missing' ? '' : formatSize(f.size)),
h('td', { class: 'muted' }, f.modified),
h('td', { class: 'mark ' + cls }, mark),
h('td', { class: cls || 'muted' }, text),
h('td', { class: 'num' }, f.status === 'new' ? '' : `${f.rows} ${f.rows === 1 ? 'row' : 'rows'} · ${f.added} new`),
h('td', { class: 'muted' }, localTime(f.importedAt)),
h('td', { class: 'actions' }, h('button', {
type: 'button', class: 'danger', onclick: () => removeFile(f),
}, f.status === 'missing' ? 'Forget' : 'Delete')));
}))));
return h('div', {}, h('h3', { class: 'section' }, 'Statements ',
h('span', { class: 'sub' }, `· ${list.length} file(s)` + (pending ? ` · ${pending} need attention` : ''))), panel);
}
// localTime shows the index's UTC import time in the same local
// YYYY-MM-DD HH:MM that the server gives the files' modified times.
function localTime(iso) {
if (!iso) return '';
const d = new Date(iso);
if (isNaN(d)) return iso;
const p = (n) => String(n).padStart(2, '0');
return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
}
// removeFile deletes a statement for good. It does not import: rows another
// statement also holds come back at the next Import, so the question asked
// here is only about what this file alone brought in.
function removeFile(f) {
const where = `${f.account}/${f.name}`;
const rows = f.status === 'new' ? 'It has not been imported, so no transactions change.'
: `The ${f.added} transaction(s) it brought in leave the index; any another statement also holds come back at the next Import.`;
const question = f.status === 'missing'
? `Forget ${where}? The file is already gone from disk. ${rows}`
: `Delete ${where} permanently? The file is removed from disk and cannot be restored from here. ${rows}`;
if (!confirm(question)) return;
api('POST', '/api/files/delete', { account: f.account, name: f.name })
.then((res) => { setStatus(res.status); return refreshAll(); })
.catch(setError);
}
function formatSize(bytes) {
if (bytes < 1024) return `${bytes} B`;
if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)} KB`;
return `${(bytes / 1024 / 1024).toFixed(1)} MB`;
}
// uploader puts statement files into an account folder and imports them. The // uploader puts statement files into an account folder and imports them. The
// folder is where they belong: the index is rebuilt from it, so a statement // folder is where they belong: the index is rebuilt from it, so a statement
// that lived only in the index would be lost the next time it is deleted. // that lived only in the index would be lost the next time it is deleted.
@@ -316,7 +392,7 @@ function uploader(o) {
onchange: (e) => choose(e.target.files), onchange: (e) => choose(e.target.files),
}); });
const chosen = h('div', { class: 'chosen muted' }, 'No files chosen'); const chosen = h('div', { class: 'chosen muted' }, 'No files chosen');
const send = h('button', { type: 'button', class: 'primary', disabled: true, onclick: submit }, 'Upload and import'); const send = h('button', { type: 'button', class: 'primary', disabled: true, onclick: submit }, 'Upload');
const zone = h('div', { const zone = h('div', {
class: 'dropzone', class: 'dropzone',
tabindex: 0, tabindex: 0,
@@ -343,10 +419,11 @@ function uploader(o) {
account: account.value, account: account.value,
files: await Promise.all(files.map(async (f) => ({ name: f.name, data: await base64(f) }))), files: await Promise.all(files.map(async (f) => ({ name: f.name, data: await base64(f) }))),
}; };
if (await importing(() => api('POST', '/api/upload', payload))) { const res = await api('POST', '/api/upload', payload);
picker.value = ''; picker.value = '';
choose([]); choose([]);
} setStatus(res.status);
await refreshAll();
} catch (e) { } catch (e) {
setError(e); setError(e);
} finally { } finally {
@@ -358,7 +435,7 @@ function uploader(o) {
h('div', { class: 'toolbar' }, h('label', {}, 'Account ', account), send), h('div', { class: 'toolbar' }, h('label', {}, 'Account ', account), send),
zone, picker, chosen, zone, picker, chosen,
h('div', { class: 'hint muted' }, h('div', { class: 'hint muted' },
'Files are saved into the account folder, next to the statements already there, and imported. ' + 'Files are saved into the account folder, next to the statements already there; press Import to read them. ' +
'A file with the same name and different contents is refused rather than replaced.')); 'A file with the same name and different contents is refused rather than replaced.'));
return panel; return panel;
} }
@@ -386,7 +463,7 @@ function scopeToolbar(onChange) {
select.value = state.filter.account; select.value = state.filter.account;
const search = h('input', { const search = h('input', {
type: 'search', id: 'search', placeholder: 'Filter by description ( / )', type: 'search', id: 'search', placeholder: 'Filter by description',
value: state.filter.search, value: state.filter.search,
oninput: debounce((e) => { state.filter.search = e.target.value.trim(); onChange(); }, 200), oninput: debounce((e) => { state.filter.search = e.target.value.trim(); onChange(); }, 200),
}); });
@@ -395,7 +472,7 @@ function scopeToolbar(onChange) {
onchange: (e) => { state.filter.untagged = e.target.checked; onChange(); }, onchange: (e) => { state.filter.untagged = e.target.checked; onChange(); },
}); });
return h('div', { class: 'toolbar' }, select, search, return h('div', { class: 'toolbar' }, select, search,
h('label', { class: 'check', title: 'No tag and not a matched transfer leg (u)' }, untagged, 'Untagged only')); h('label', { class: 'check', title: 'No tag and not a matched transfer leg' }, untagged, 'Untagged only'));
} }
// --- transactions --------------------------------------------------------- // --- transactions ---------------------------------------------------------
@@ -498,7 +575,7 @@ function mountReport(main) {
// An empty period is not an empty index, and the default window is the // An empty period is not an empty index, and the default window is the
// one most likely to be empty: last month's statement may not be in yet. // one most likely to be empty: last month's statement may not be in yet.
content = h('div', { class: 'panel empty' }, period.bounded && !data.indexEmpty content = h('div', { class: 'panel empty' }, period.bounded && !data.indexEmpty
? `Nothing in ${period.name}.\n\nChoose another period (← →), or import.` ? `Nothing in ${period.name}.\n\nChoose another period, or import.`
: 'Nothing to report yet.\n\nImport some statements first.'); : 'Nothing to report yet.\n\nImport some statements first.');
} else { } else {
const order = data.orders.find((o) => o.name === data.order); const order = data.orders.find((o) => o.name === data.order);
@@ -538,21 +615,7 @@ function mountReport(main) {
} catch (e) { setError(e); } } catch (e) { setError(e); }
} }
refresh(); refresh();
return { return { refresh };
refresh,
key(e, typing) {
if (typing || !data || e.ctrlKey || e.metaKey || e.altKey) return false;
if (e.key === 'ArrowLeft') { setPeriod(data.period - 1); return true; }
if (e.key === 'ArrowRight') { setPeriod(data.period + 1); return true; }
if (e.key === 's') {
const i = data.orders.findIndex((o) => o.name === data.order);
state.report.sort = data.orders[(i + 1) % data.orders.length].name;
refresh();
return true;
}
return false;
},
};
} }
// --- form helpers --------------------------------------------------------- // --- form helpers ---------------------------------------------------------
@@ -639,8 +702,8 @@ function mountRuleBuilder(main) {
} }
preview.replaceChildren(h('table', {}, preview.replaceChildren(h('table', {},
h('thead', {}, h('tr', {}, h('th', {}, ''), h('thead', {}, h('tr', {}, h('th', {}, ''),
h('th', { class: 'sortable', onclick: toggle, title: 'Sort by name / by count (ctrl+s)' }, descTitle), h('th', { class: 'sortable', onclick: toggle, title: 'Sort by name / by count' }, descTitle),
h('th', { class: 'num sortable', onclick: toggle, title: 'Sort by name / by count (ctrl+s)' }, 'N' + (byCount ? ' ↓' : '')))), h('th', { class: 'num sortable', onclick: toggle, title: 'Sort by name / by count' }, 'N' + (byCount ? ' ↓' : '')))),
h('tbody', {}, res.rows.map((row) => h('tr', { h('tbody', {}, res.rows.map((row) => h('tr', {
class: 'clickable', class: 'clickable',
title: 'Use this description as the glob', title: 'Use this description as the glob',
@@ -685,23 +748,7 @@ function mountRuleBuilder(main) {
inputs.match.focus(); inputs.match.focus();
refreshNow(); refreshNow();
return { return { refresh: refreshNow };
refresh: refreshNow,
form: true,
key(e) {
if (e.key === 's' && e.ctrlKey) {
state.ruleSort = state.ruleSort === 'count' ? 'name' : 'count';
refreshNow();
return true;
}
if (e.key === 'Escape' && editing) {
state.rule = blankRule();
go('rules');
return true;
}
return false;
},
};
} }
// --- rules ---------------------------------------------------------------- // --- rules ----------------------------------------------------------------
@@ -865,7 +912,7 @@ function mountTransferBuilder(main) {
inputs.fromAccount.focus(); inputs.fromAccount.focus();
refreshNow(); refreshNow();
return { refresh: refreshNow, form: true }; return { refresh: refreshNow };
} }
// --- transfers ------------------------------------------------------------ // --- transfers ------------------------------------------------------------
@@ -887,6 +934,9 @@ function mountTransfers(main) {
h('button', { type: 'button', onclick: () => refresh().then(() => setStatus('pairing refreshed')) }, 'Refresh pairing')), h('button', { type: 'button', onclick: () => refresh().then(() => setStatus('pairing refreshed')) }, 'Refresh pairing')),
body); body);
let defs = []; let defs = [];
let unpaired = 0;
// Which ⚠ rows are open, by position, so a refresh does not fold them away.
const open = new Set();
async function del(positions, question) { async function del(positions, question) {
if (!confirm(question)) return; if (!confirm(question)) return;
@@ -895,6 +945,7 @@ function mountTransfers(main) {
positions, expect: positions.map((p) => transferExpect(defs[p])), positions, expect: positions.map((p) => transferExpect(defs[p])),
}); });
setStatus(res.status); setStatus(res.status);
open.clear(); // positions shift under a delete
await refreshAll(); await refreshAll();
} catch (e) { setError(e); } } catch (e) { setError(e); }
} }
@@ -905,8 +956,13 @@ function mountTransfers(main) {
res = await api('GET', '/api/transfers'); res = await api('GET', '/api/transfers');
} catch (e) { setError(e); return; } } catch (e) { setError(e); return; }
defs = res.transfers; defs = res.transfers;
title.replaceChildren('Transfers ', h('span', { class: 'sub' }, res.unpaired unpaired = res.unpaired;
? `· ${defs.length} definitions · ${res.unpaired} leg(s) unpaired` draw();
}
function draw() {
title.replaceChildren('Transfers ', h('span', { class: 'sub' }, unpaired
? `· ${defs.length} definitions · ${unpaired} leg(s) unpaired — open a ⚠ row to see them`
: `· ${defs.length} definitions · every leg paired`)); : `· ${defs.length} definitions · every leg paired`));
// Only definitions catching nothing at all are pruned. One with unpaired // Only definitions catching nothing at all are pruned. One with unpaired
// legs is doing something, and deleting it would hide the problem. // legs is doing something, and deleting it would hide the problem.
@@ -926,9 +982,17 @@ function mountTransfers(main) {
h('th', {}, 'Note'), h('th', {}, ''))), h('th', {}, 'Note'), h('th', {}, ''))),
h('tbody', {}, defs.map((d) => { h('tbody', {}, defs.map((d) => {
let mark = '', cls = 'mark', tip = null; let mark = '', cls = 'mark', tip = null;
if (d.orphaned > 0) [mark, cls, tip] = ['⚠', 'mark warn', 'Catches legs it cannot pair']; if (d.orphaned > 0) [mark, cls, tip] = [open.has(d.pos) ? '▾' : '⚠', 'mark warn', 'Show the legs it cannot pair'];
else if (d.paired === 0) [mark, cls, tip] = ['✗', 'mark neg', 'Matches nothing at all']; else if (d.paired === 0) [mark, cls, tip] = ['✗', 'mark neg', 'Matches nothing at all'];
return h('tr', {}, const toggle = () => {
if (open.has(d.pos)) open.delete(d.pos); else open.add(d.pos);
draw();
};
return [h('tr', {
class: d.orphaned > 0 ? 'clickable' : null,
title: d.orphaned > 0 ? 'Show the legs it cannot pair' : null,
onclick: d.orphaned > 0 ? (e) => { if (!e.target.closest('button')) toggle(); } : null,
},
h('td', { class: 'num muted' }, d.pos + 1), h('td', { class: 'num muted' }, d.pos + 1),
h('td', { class: cls, title: tip }, mark), h('td', { class: cls, title: tip }, mark),
h('td', {}, d.fromAccount, ' ', h('span', { style: 'font-family: var(--mono)' }, d.fromDesc)), h('td', {}, d.fromAccount, ' ', h('span', { style: 'font-family: var(--mono)' }, d.fromDesc)),
@@ -940,50 +1004,64 @@ function mountTransfers(main) {
h('td', { class: 'actions' }, h('button', { h('td', { class: 'actions' }, h('button', {
type: 'button', class: 'danger', type: 'button', class: 'danger',
onclick: () => del([d.pos], `Delete transfer ${d.pos + 1} (${d.fromAccount} → ${d.toAccount}), ${d.paired} matched?`), onclick: () => del([d.pos], `Delete transfer ${d.pos + 1} (${d.fromAccount} → ${d.toAccount}), ${d.paired} matched?`),
}, 'Delete'))); }, 'Delete'))),
open.has(d.pos) && d.orphaned > 0 ? h('tr', { class: 'legs' }, h('td', { colspan: 9 }, legsTable(d))) : null];
}))))); })))));
} }
// legsTable lists a definition's unpaired legs: which side each is missing,
// and what that side would have had to look like to pair.
function legsTable(d) {
return h('table', { class: 'sub' },
h('thead', {}, h('tr', {}, h('th', {}, 'Date'), h('th', { class: 'num' }, 'Amount'), h('th', {}, 'Movement'),
h('th', {}, 'Description'), h('th', {}, 'Missing'), h('th', {}, 'Would pair with'))),
h('tbody', {}, d.legs.map((l) => h('tr', {},
h('td', {}, l.date), h('td', { class: 'num' }, l.amount), h('td', {}, l.movement),
h('td', { class: 'desc' }, l.description), h('td', { class: 'warn' }, l.missing + ' leg'),
h('td', { class: 'desc muted' }, l.want)))));
}
refresh(); refresh();
return { refresh }; return { refresh };
} }
// --- keyboard ------------------------------------------------------------- // --- tags -----------------------------------------------------------------
// Single-key shortcuts, where they do not fight the browser. A builder is a // mountTags lists every distinct tag with how many transactions carry it and
// form, so outside of chords its keys belong to the field being typed in. // the rules that write it, numbered by file position as on the rules screen.
document.addEventListener('keydown', (e) => { function mountTags(main) {
const t = e.target; const title = h('h2');
const typing = t instanceof HTMLInputElement || t instanceof HTMLSelectElement || t instanceof HTMLTextAreaElement; const body = h('div');
if (current && current.key && current.key(e, typing)) { main.append(title, body);
e.preventDefault();
async function refresh() {
let tags;
try {
tags = (await api('GET', '/api/tags')).tags;
} catch (e) { setError(e); return; }
title.replaceChildren('Tags ', h('span', { class: 'sub' }, `· ${tags.length} tags`));
if (!tags.length) {
body.replaceChildren(h('div', { class: 'panel empty' }, 'No tags yet.\n\nA tag comes from a rule: build one on the rule builder.'));
return; return;
} }
if (typing || e.ctrlKey || e.metaKey || e.altKey) return; body.replaceChildren(h('div', { class: 'panel' }, h('table', {},
h('thead', {}, h('tr', {}, h('th', {}, 'Tag'), h('th', { class: 'num' }, 'Txns'), h('th', {}, 'Rules'))),
if (e.key >= '1' && e.key <= String(VIEWS.length)) { h('tbody', {}, tags.map((t) => h('tr', {},
go(VIEWS[Number(e.key) - 1].id); h('td', { class: t.transactions ? null : 'muted' }, t.tag),
} else if (e.key === '/') { h('td', { class: 'num' + (t.transactions ? '' : ' muted') }, t.transactions),
if (state.view !== 'txns' && state.view !== 'report') go('txns'); h('td', { class: 'desc' }, t.rules.length
setTimeout(() => { const s = document.getElementById('search'); if (s) s.focus(); }); ? t.rules.map((r) => h('span', { class: 'tag-rule' + (r.usage ? '' : ' muted') },
} else if (e.key === 'u') { h('span', { class: 'muted' }, `#${r.pos + 1} `),
state.filter.untagged = !state.filter.untagged; h('span', { class: 'mono' }, r.pattern),
if (state.view === 'txns' || state.view === 'report') show(); r.account ? h('span', { class: 'muted' }, ` on ${r.account}`) : null,
else go('txns'); ` (${r.usage})`))
} else if (e.key === 'a') { : h('span', { class: 'warn' }, 'no rule writes it — Retag clears it'))))))));
state.filter.account = ''; }
if (state.view === 'txns' || state.view === 'report') show(); refresh();
} else if (e.key === 'i') { return { refresh };
runImport(false);
} else if (e.key === 'r') {
retag();
} else {
return;
} }
e.preventDefault();
});
document.getElementById('import').addEventListener('click', (e) => runImport(e.shiftKey)); document.getElementById('import').addEventListener('click', () => runImport(false));
document.getElementById('import').title += ' (shift-click re-parses unchanged files too)'; document.getElementById('reread').addEventListener('click', () => runImport(true));
document.getElementById('retag').addEventListener('click', retag); document.getElementById('retag').addEventListener('click', retag);
window.addEventListener('hashchange', show); window.addEventListener('hashchange', show);
internal/web/static/icon.svg
+8
View File
@@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
<rect width="32" height="32" rx="7" fill="#4b46c8"/>
<g fill="#fff">
<rect x="7" y="8" width="18" height="4" rx="2"/>
<rect x="7" y="14" width="11" height="4" rx="2"/>
<rect x="7" y="20" width="15" height="4" rx="2"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 309 B

internal/web/static/index.html
+2
View File
@@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>money</title> <title>money</title>
<link rel="icon" href="icon.svg" type="image/svg+xml">
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
</head> </head>
<body> <body>
@@ -12,6 +13,7 @@
<nav id="nav" aria-label="Screens"></nav> <nav id="nav" aria-label="Screens"></nav>
<div class="actions"> <div class="actions">
<button type="button" id="retag" title="Re-apply rules.toml: retag everything and re-pair transfers">Retag</button> <button type="button" id="retag" title="Re-apply rules.toml: retag everything and re-pair transfers">Retag</button>
<button type="button" id="reread" title="Re-read every statement, including ones unchanged since they were imported">Re-read all</button>
<button type="button" id="import" class="primary" title="Import new statements from every account folder">Import</button> <button type="button" id="import" class="primary" title="Import new statements from every account folder">Import</button>
</div> </div>
</header> </header>
internal/web/static/style.css
+10 -1
View File
@@ -68,7 +68,6 @@ button, input, select { font: inherit; color: inherit; }
} }
#nav a:hover { color: var(--text); background: var(--row-hover); } #nav a:hover { color: var(--text); background: var(--row-hover); }
#nav a.active { color: var(--accent); background: var(--accent-soft); font-weight: 600; } #nav a.active { color: var(--accent); background: var(--accent-soft); font-weight: 600; }
#nav kbd { font-family: var(--mono); font-size: 11px; opacity: .6; margin-right: 4px; }
.actions { display: flex; gap: 8px; } .actions { display: flex; gap: 8px; }
button { button {
@@ -145,6 +144,11 @@ tr.total td { font-weight: 600; border-top: 1px solid var(--border); }
tr.excluded td { color: var(--muted); } tr.excluded td { color: var(--muted); }
tr.excluded.first td { border-top: 1px dashed var(--border); } tr.excluded.first td { border-top: 1px dashed var(--border); }
td.actions { text-align: right; } td.actions { text-align: right; }
.mono { font-family: var(--mono); }
.tag-rule { display: inline-block; margin-right: 14px; white-space: nowrap; }
tr.legs > td { padding: 0 10px 10px 36px; background: var(--bg); }
tr.legs:hover { background: none; }
table.sub th { background: var(--bg); font-weight: 500; color: var(--muted); }
td.actions button { padding: 1px 8px; font-size: 12px; } td.actions button { padding: 1px 8px; font-size: 12px; }
.empty { padding: 32px 16px; color: var(--muted); white-space: pre-line; text-align: center; } .empty { padding: 32px 16px; color: var(--muted); white-space: pre-line; text-align: center; }
@@ -176,6 +180,11 @@ td.actions button { padding: 1px 8px; font-size: 12px; }
.kept { font-size: 12px; color: var(--muted); font-family: var(--mono); } .kept { font-size: 12px; color: var(--muted); font-family: var(--mono); }
.preview { max-height: calc(100vh - 170px); } .preview { max-height: calc(100vh - 170px); }
h3.section { font-size: 14px; font-weight: 600; margin: 20px 0 8px; }
h3.section .sub { color: var(--muted); font-weight: 400; }
.files a { color: var(--accent); text-decoration: none; }
.files a:hover { text-decoration: underline; }
.upload { margin-top: 16px; padding: 14px; overflow: visible; } .upload { margin-top: 16px; padding: 14px; overflow: visible; }
.upload h3 { font-size: 14px; margin: 0 0 10px; } .upload h3 { font-size: 14px; margin: 0 0 10px; }
.upload .toolbar { margin-bottom: 10px; } .upload .toolbar { margin-bottom: 10px; }
internal/web/upload_test.go
+290 -14
View File
@@ -1,7 +1,9 @@
package web package web
import ( import (
"errors"
"fmt" "fmt"
"io/fs"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"
@@ -23,10 +25,30 @@ func init() {
parser.Register("webtest", func(acc *config.Account) (parser.Parser, error) { parser.Register("webtest", func(acc *config.Account) (parser.Parser, error) {
return csvParser{digits: acc.Digits()}, nil return csvParser{digits: acc.Digits()}, nil
}) })
parser.Register("webnamed", func(acc *config.Account) (parser.Parser, error) {
return namingParser{csvParser{digits: acc.Digits()}}, nil
})
} }
type csvParser struct{ digits int } type csvParser struct{ digits int }
// namingParser is csvParser for a bank whose downloads are named unhelpfully:
// it names a statement after its first date, as nlb does after the statement
// date, and says nothing for a statement with no rows.
type namingParser struct{ csvParser }
func (namingParser) StatementName(path string) (string, error) {
body, err := os.ReadFile(path)
if err != nil {
return "", err
}
lines := strings.Split(strings.TrimSpace(string(body)), "\n")
if len(lines) < 2 {
return "", nil
}
return "stmt_" + strings.Split(lines[1], ",")[0], nil
}
func (p csvParser) Parse(path string, _ *config.Account) ([]parser.RawTxn, error) { func (p csvParser) Parse(path string, _ *config.Account) ([]parser.RawTxn, error) {
body, err := os.ReadFile(path) body, err := os.ReadFile(path)
if err != nil { if err != nil {
@@ -81,32 +103,38 @@ const checkingTOML = "currency = \"EUR\"\nparser = \"webtest\"\n"
const statement = "date,description,amount\n2026-02-01,LIDL SOFIA,-12.50\n2026-02-03,SALARY,1000.00\n" const statement = "date,description,amount\n2026-02-01,LIDL SOFIA,-12.50\n2026-02-03,SALARY,1000.00\n"
func TestUploadSavesAndImports(t *testing.T) { // An upload only saves: the file waits on the statements list as new until
// the user presses Import.
func TestUploadSavesWithoutImporting(t *testing.T) {
dir, h := newUploadServer(t, checkingTOML) dir, h := newUploadServer(t, checkingTOML)
req := uploadReq{Account: "checking", Files: []uploadFile{{Name: "2026-02.csv", Data: []byte(statement)}}} req := uploadReq{Account: "checking", Files: []uploadFile{{Name: "2026-02.csv", Data: []byte(statement)}}}
var res importJSON var res status
call(t, h, "POST", "/api/upload", req, http.StatusOK, &res) call(t, h, "POST", "/api/upload", req, http.StatusOK, &res)
if !strings.Contains(res.Status, "uploaded 1 file(s) to checking") || !strings.Contains(res.Status, "2 new") { if res.Status != "uploaded 1 file(s) to checking · press Import to read them" {
t.Errorf("status = %q", res.Status) t.Errorf("status = %q", res.Status)
} }
if got, err := os.ReadFile(filepath.Join(dir, "2026-02.csv")); err != nil || string(got) != statement { if got, err := os.ReadFile(filepath.Join(dir, "2026-02.csv")); err != nil || string(got) != statement {
t.Errorf("file on disk = %q, %v", got, err) t.Errorf("file on disk = %q, %v", got, err)
} }
var txns struct{ Rows []txnRow } if got := descriptions(t, h); got != "" {
call(t, h, "GET", "/api/transactions", nil, http.StatusOK, &txns) t.Errorf("upload imported %s; it should only save", got)
if len(txns.Rows) != 2 { }
t.Errorf("index holds %d rows, want the 2 uploaded", len(txns.Rows)) var files struct{ Files []fileRow }
call(t, h, "GET", "/api/files", nil, http.StatusOK, &files)
if len(files.Files) != 1 || files.Files[0].Status != "new" {
t.Errorf("files = %+v, want the upload waiting as new", files.Files)
} }
// The same file again is not an error, and adds nothing. call(t, h, "POST", "/api/import", importReq{}, http.StatusOK, nil)
call(t, h, "POST", "/api/upload", req, http.StatusOK, &res) if got := descriptions(t, h); got != "SALARY,LIDL SOFIA" {
if !strings.Contains(res.Status, "uploaded 0 file(s)") || !strings.Contains(res.Status, "1 already there") { t.Errorf("after Import the index holds %s", got)
t.Errorf("re-upload status = %q", res.Status)
} }
call(t, h, "GET", "/api/transactions", nil, http.StatusOK, &txns)
if len(txns.Rows) != 2 { // The same file again is not an error, and saves nothing.
t.Errorf("re-upload left %d rows, want 2", len(txns.Rows)) call(t, h, "POST", "/api/upload", req, http.StatusOK, &res)
if res.Status != "uploaded 0 file(s) to checking (1 already there)" {
t.Errorf("re-upload status = %q", res.Status)
} }
} }
@@ -164,3 +192,251 @@ func TestUploadRefusesMultipart(t *testing.T) {
t.Errorf("status %d, want %d", w.Code, http.StatusUnsupportedMediaType) t.Errorf("status %d, want %d", w.Code, http.StatusUnsupportedMediaType)
} }
} }
// The statements list is the folders, each beside what the index recorded:
// imported, changed since, not imported yet, and gone from disk.
func TestFileListStatuses(t *testing.T) {
dir, h := newUploadServer(t, checkingTOML)
write := func(name, body string) {
t.Helper()
if err := os.WriteFile(filepath.Join(dir, name), []byte(body), 0o644); err != nil {
t.Fatal(err)
}
}
write("a.csv", statement)
write("b.csv", "date,description,amount\n2026-03-01,ZARA,-40.00\n")
write("c.csv", "date,description,amount\n2026-04-01,KAUFLAND,-9.00\n")
call(t, h, "POST", "/api/import", importReq{}, http.StatusOK, nil)
write("b.csv", "date,description,amount\n2026-03-01,ZARA,-41.00\n")
if err := os.Remove(filepath.Join(dir, "c.csv")); err != nil {
t.Fatal(err)
}
write("d.csv", statement)
write(".hidden.csv", statement)
var res struct{ Files []fileRow }
call(t, h, "GET", "/api/files", nil, http.StatusOK, &res)
got := map[string]fileRow{}
var names []string
for _, f := range res.Files {
got[f.Name] = f
names = append(names, f.Name)
}
if strings.Join(names, " ") != "a.csv b.csv c.csv d.csv" {
t.Fatalf("files = %v, want the four statements and nothing import would skip", names)
}
for name, want := range map[string]string{"a.csv": "imported", "b.csv": "changed", "c.csv": "missing", "d.csv": "new"} {
if got[name].Status != want {
t.Errorf("%s status = %q, want %q", name, got[name].Status, want)
}
}
if got["a.csv"].Rows != 2 || got["a.csv"].Added != 2 || got["c.csv"].Rows != 1 || got["c.csv"].Added != 1 ||
got["a.csv"].ImportedAt == "" {
t.Errorf("a.csv = %+v, c.csv = %+v", got["a.csv"], got["c.csv"])
}
if got["a.csv"].Size != int64(len(statement)) {
t.Errorf("a.csv size = %d, want %d", got["a.csv"].Size, len(statement))
}
}
// Only a file import would read is served, and never as a page.
func TestServeFileServesOnlyStatements(t *testing.T) {
dir, h := newUploadServer(t, checkingTOML)
for name, body := range map[string]string{"a.csv": statement, "page.html": "<script>alert(1)</script>", ".secret": "x"} {
if err := os.WriteFile(filepath.Join(dir, name), []byte(body), 0o644); err != nil {
t.Fatal(err)
}
}
get := func(path string) *httptest.ResponseRecorder {
w := httptest.NewRecorder()
h.ServeHTTP(w, httptest.NewRequest("GET", path, nil))
return w
}
w := get("/api/files/checking/a.csv")
if w.Code != http.StatusOK || w.Body.String() != statement {
t.Fatalf("a.csv: %d %q", w.Code, w.Body.String())
}
if ct := w.Header().Get("Content-Type"); ct != "text/plain; charset=utf-8" {
t.Errorf("a.csv content type = %q", ct)
}
w = get("/api/files/checking/page.html")
if w.Code != http.StatusOK || w.Header().Get("Content-Type") != "application/octet-stream" ||
w.Header().Get("Content-Security-Policy") != "sandbox" ||
!strings.HasPrefix(w.Header().Get("Content-Disposition"), "attachment") {
t.Errorf("page.html served as %d %v, want a sandboxed download", w.Code, w.Header())
}
for _, path := range []string{
"/api/files/checking/" + config.AccountFile,
"/api/files/checking/.secret",
"/api/files/checking/..%2F" + config.RulesFile,
"/api/files/nope/a.csv",
} {
if w := get(path); w.Code != http.StatusNotFound {
t.Errorf("%s: status %d, want 404", path, w.Code)
}
}
}
// A parser that names its statements decides the stored name, so the bank's
// "download (3).pdf" lands as something that sorts by date. A reissue of the
// same date is numbered rather than refused, and a statement that does not
// say keeps the name it came with.
func TestUploadNamesStatementsTheParserCanName(t *testing.T) {
dir, h := newUploadServer(t, "currency = \"EUR\"\nparser = \"webnamed\"\n")
upload := func(files ...uploadFile) string {
t.Helper()
var res status
call(t, h, "POST", "/api/upload", uploadReq{Account: "checking", Files: files}, http.StatusOK, &res)
return res.Status
}
reissue := "date,description,amount\n2026-02-01,LIDL SOFIA,-12.50\n2026-02-04,ZARA,-30.00\n"
other := "date,description,amount\n2026-03-01,KAUFLAND,-9.00\n"
status := upload(uploadFile{Name: "download (3).csv", Data: []byte(statement)})
if !strings.Contains(status, "download (3).csv → stmt_2026-02-01.csv") {
t.Errorf("status = %q, want the rename named", status)
}
// The same statement downloaded again is recognised under its new name.
if status := upload(uploadFile{Name: "download (4).csv", Data: []byte(statement)}); !strings.Contains(status, "1 already there") {
t.Errorf("second download: status = %q", status)
}
// A different statement of the same date, and two of one date in a batch.
upload(uploadFile{Name: "x.csv", Data: []byte(reissue)},
uploadFile{Name: "y.csv", Data: []byte(reissue + "2026-02-05,BOLT,-4.00\n")},
uploadFile{Name: "Z.CSV", Data: []byte(other)}, // a chosen name is lowercase
uploadFile{Name: "empty.csv", Data: []byte("date,description,amount\n")})
entries, err := os.ReadDir(dir)
if err != nil {
t.Fatal(err)
}
var names []string
for _, e := range entries {
names = append(names, e.Name())
}
want := config.AccountFile + " empty.csv stmt_2026-02-01.csv stmt_2026-02-01_2.csv stmt_2026-02-01_3.csv stmt_2026-03-01.csv"
if strings.Join(names, " ") != want {
t.Errorf("folder = %v, want %s", names, want)
}
}
func writeFile(t *testing.T, path, body string) {
t.Helper()
if err := os.WriteFile(path, []byte(body), 0o644); err != nil {
t.Fatal(err)
}
}
func descriptions(t *testing.T, h http.Handler) string {
t.Helper()
var txns struct{ Rows []txnRow }
call(t, h, "GET", "/api/transactions", nil, http.StatusOK, &txns)
var out []string
for _, r := range txns.Rows {
out = append(out, r.Description)
}
return strings.Join(out, ",")
}
// Removing a statement deletes the file and takes out what it brought in. A
// row an overlapping statement also holds was stored under the file imported
// first; the next Import brings it back from the other one.
func TestRemoveFileKeepsWhatAnotherStatementHolds(t *testing.T) {
dir, h := newUploadServer(t, checkingTOML)
writeFile(t, filepath.Join(dir, "a.csv"), "date,description,amount\n2026-01-30,ONLY IN A,-1.00\n2026-02-01,SHARED,-2.00\n")
writeFile(t, filepath.Join(dir, "b.csv"), "date,description,amount\n2026-02-01,SHARED,-2.00\n2026-02-03,ONLY IN B,-3.00\n")
call(t, h, "POST", "/api/import", importReq{}, http.StatusOK, nil)
// Each holds two rows; b.csv was imported second, so its shared row
// stayed with a.csv and it brought in only one.
var before struct{ Files []fileRow }
call(t, h, "GET", "/api/files", nil, http.StatusOK, &before)
if f := before.Files; len(f) != 2 || f[0].Rows != 2 || f[0].Added != 2 || f[1].Rows != 2 || f[1].Added != 1 {
t.Errorf("files = %+v, want a.csv 2 rows · 2 new and b.csv 2 rows · 1 new", f)
}
var res status
call(t, h, "POST", "/api/files/delete", removeFileReq{Account: "checking", Name: "a.csv"}, http.StatusOK, &res)
if !strings.HasPrefix(res.Status, "deleted checking/a.csv, 2 transaction(s) dropped") {
t.Errorf("status = %q", res.Status)
}
// Deleting does not import, so the shared row is gone for now, and b.csv
// says it is due to be read again.
if got := descriptions(t, h); got != "ONLY IN B" {
t.Errorf("index holds %s right after the delete, want only b's own row", got)
}
var files struct{ Files []fileRow }
call(t, h, "GET", "/api/files", nil, http.StatusOK, &files)
if len(files.Files) != 1 || files.Files[0].Status != "changed" {
t.Errorf("files = %+v, want b.csv marked to be re-read", files.Files)
}
call(t, h, "POST", "/api/import", importReq{}, http.StatusOK, nil)
if got := descriptions(t, h); got != "ONLY IN B,SHARED" {
t.Errorf("after Import the index holds %s, want the shared row restored from b", got)
}
if _, err := os.Stat(filepath.Join(dir, "a.csv")); !errors.Is(err, fs.ErrNotExist) {
t.Errorf("a.csv is still on disk: %v", err)
}
if entries, _ := os.ReadDir(dir); len(entries) != 2 {
t.Errorf("folder holds %d entries, want account.toml and b.csv only", len(entries))
}
call(t, h, "GET", "/api/files", nil, http.StatusOK, &files)
if len(files.Files) != 1 || files.Files[0].Name != "b.csv" || files.Files[0].Status != "imported" {
t.Errorf("files = %+v, want only b.csv, imported", files.Files)
}
}
// A removed leg takes its transfer pairing with it, and the other leg is left
// unpaired — which is the truth once one side is gone.
func TestRemoveFileUnpairsItsTransfers(t *testing.T) {
dir, h := newUploadServer(t, checkingTOML)
writeFile(t, filepath.Join(filepath.Dir(dir), config.RulesFile), `
[[transfer]]
from_account = "checking"
from_desc = "*OUT*"
to_account = "checking"
to_desc = "*IN*"
`)
writeFile(t, filepath.Join(dir, "out.csv"), "date,description,amount\n2026-02-01,MOVE OUT,-5.00\n")
writeFile(t, filepath.Join(dir, "in.csv"), "date,description,amount\n2026-02-02,MOVE IN,5.00\n")
call(t, h, "POST", "/api/import", importReq{}, http.StatusOK, nil)
var res status
call(t, h, "POST", "/api/files/delete", removeFileReq{Account: "checking", Name: "in.csv"}, http.StatusOK, &res)
if !strings.Contains(res.Status, "1 transfer leg(s) unpaired") {
t.Errorf("status = %q, want the remaining leg reported unpaired", res.Status)
}
}
// A file already gone from disk is forgotten by the index; a name the index
// never had is not found.
func TestRemoveFileForgetsAMissingOne(t *testing.T) {
dir, h := newUploadServer(t, checkingTOML)
writeFile(t, filepath.Join(dir, "a.csv"), statement)
call(t, h, "POST", "/api/import", importReq{}, http.StatusOK, nil)
if err := os.Remove(filepath.Join(dir, "a.csv")); err != nil {
t.Fatal(err)
}
var res status
call(t, h, "POST", "/api/files/delete", removeFileReq{Account: "checking", Name: "a.csv"}, http.StatusOK, &res)
if !strings.HasPrefix(res.Status, "forgot checking/a.csv, 2 transaction(s) dropped") {
t.Errorf("status = %q", res.Status)
}
if got := descriptions(t, h); got != "" {
t.Errorf("index still holds %s", got)
}
call(t, h, "POST", "/api/files/delete", removeFileReq{Account: "checking", Name: "a.csv"}, http.StatusNotFound, nil)
call(t, h, "POST", "/api/files/delete", removeFileReq{Account: "checking", Name: "../rules.toml"}, http.StatusBadRequest, nil)
if _, err := os.Stat(filepath.Join(dir, config.AccountFile)); err != nil {
t.Fatal(err)
}
call(t, h, "POST", "/api/files/delete", removeFileReq{Account: "checking", Name: config.AccountFile}, http.StatusNotFound, nil)
}