The boolean transfer flag went two commits ago because a one-sided verdict let half a movement vanish and left the report unbalanced. This is what replaces it: a [[transfer]] block names both legs, and only a matched pair is dropped from the report -- both legs together, never one. Legs pair within five days, nearest date first, and a transaction belongs to at most one transfer, so the first definition to claim a leg keeps it, exactly as the first matching rule keeps a tag. The pairing is derived state like the tags: Engine.Link rewrites the whole transfers table from rules.toml, which is why retag re-derives both halves of what that file decides, and why it runs over the whole index rather than a filtered view -- pairing inside one would let a movement count as a transfer in one report and not in another. An unmatched leg is not a transfer and keeps counting, surfaced as a warning instead. Within one currency the amount is the evidence and must be the exact opposite. Across currencies it is not checked at all: there are no rates here, so the two numbers are unrelated and the dates carry the pairing alone. tolerance_pct is the one exception, per definition, for a route where the bank takes a fee and the two statements genuinely disagree. It defaults to zero and belongs on the one definition that charges; a global or default tolerance would loosen every route that does not. The difference it admits is not forgiven -- the pair leaves the report entirely, so a fee hidden inside one would be spending that appears nowhere. Pair.Fee is what left less what arrived, and report.Excluded carries it out per currency alongside the legs. It counts only pairs whose legs are both in view, for the same reason it counts legs and not transfers: half a pair cannot say what the other half received. The screens: - 6 builds a definition against the index as you type, showing the pairs it would form and the legs it would catch but leave unpaired. Six fields need more room than the rule builder's four, so the form sheds its spacing, then its hints, then the borders on unfocused fields. - 7 lists every definition with what it pairs. Two counts, because they mean different things: an unpaired leg is a definition doing something and not finishing it, no pairs at all is dead weight. Tol names the tolerance, blank where amounts must agree. - 3 grows a (transfers) row under TOTAL, and a fees row beneath it, or the report silently disagrees with the account balances. Two things that are not part of transfers but are the same day's work: - ls --uniq lists each account and description once, normalised the way a glob sees them, which is the shape of "what still needs a rule?" -- fifty visits to one shop are one pattern to write, not fifty rows to read. - The rule builder's preview now filters to what the glob matches instead of marking matches in a full list. The count carries the context the rows no longer can: 2 of 7, measured against everything still in view. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
299 lines
7.5 KiB
Go
299 lines
7.5 KiB
Go
// Package importer walks the data root, extracts transactions from every
|
|
// statement file, and inserts the ones not already in the index.
|
|
package importer
|
|
|
|
import (
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"sort"
|
|
"strings"
|
|
"time"
|
|
|
|
"git.petrovv.com/nikola/money/internal/config"
|
|
"git.petrovv.com/nikola/money/internal/glob"
|
|
"git.petrovv.com/nikola/money/internal/model"
|
|
"git.petrovv.com/nikola/money/internal/parser"
|
|
"git.petrovv.com/nikola/money/internal/rules"
|
|
"git.petrovv.com/nikola/money/internal/store"
|
|
"git.petrovv.com/nikola/money/internal/transfers"
|
|
)
|
|
|
|
// FileResult is what happened to one statement file.
|
|
type FileResult struct {
|
|
Account string
|
|
Path string // relative to the data root
|
|
Parsed int
|
|
New int
|
|
Skipped int // already present, i.e. deduplicated
|
|
Err error
|
|
// Warnings are non-fatal notes: rows the parser deliberately dropped, and
|
|
// breaks in the statement's balance chain.
|
|
Warnings []string
|
|
}
|
|
|
|
// Result summarises a whole import run.
|
|
type Result struct {
|
|
Files []FileResult
|
|
Retagged int
|
|
// Paired and Unpaired are the state of the transfer pairing after the
|
|
// import: how many movements were matched, and how many legs a definition
|
|
// caught without finding the other side.
|
|
Paired int
|
|
Unpaired int
|
|
}
|
|
|
|
// Total counts new rows across every file.
|
|
func (r Result) Total() (parsed, added, skipped int) {
|
|
for _, f := range r.Files {
|
|
parsed += f.Parsed
|
|
added += f.New
|
|
skipped += f.Skipped
|
|
}
|
|
return
|
|
}
|
|
|
|
// Errs collects per-file failures. One unreadable statement must not abort the
|
|
// whole run, so errors are reported rather than returned.
|
|
func (r Result) Errs() []FileResult {
|
|
var out []FileResult
|
|
for _, f := range r.Files {
|
|
if f.Err != nil {
|
|
out = append(out, f)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// Options tunes an import run.
|
|
type Options struct {
|
|
// Force reimports statement files whose contents are unchanged. Without
|
|
// it, files with a matching checksum are skipped entirely.
|
|
Force bool
|
|
}
|
|
|
|
// Run imports every account under root into db and then applies the rules and
|
|
// the transfer definitions. Both are derived from rules.toml and both are
|
|
// recomputed over the whole index, since a statement imported now can complete
|
|
// a transfer whose other leg arrived months ago.
|
|
func Run(root string, db *store.DB, accounts []*config.Account, engine *rules.Engine,
|
|
links *transfers.Engine, opts Options) (Result, error) {
|
|
var res Result
|
|
for _, acc := range accounts {
|
|
accountID, err := db.UpsertAccount(model.Account{
|
|
Slug: acc.Slug,
|
|
Name: acc.Name,
|
|
Currency: acc.Currency,
|
|
MinorDigits: acc.Digits(),
|
|
})
|
|
if err != nil {
|
|
return res, err
|
|
}
|
|
|
|
p, err := parser.For(acc)
|
|
if err != nil {
|
|
// A misconfigured account is worth reporting, but the other
|
|
// accounts should still import.
|
|
res.Files = append(res.Files, FileResult{Account: acc.Slug, Path: acc.Slug, Err: err})
|
|
continue
|
|
}
|
|
|
|
files, err := statementFiles(acc)
|
|
if err != nil {
|
|
return res, err
|
|
}
|
|
for _, path := range files {
|
|
fr := importFile(root, db, acc, accountID, p, engine, path, opts)
|
|
res.Files = append(res.Files, fr)
|
|
}
|
|
}
|
|
|
|
n, err := engine.Retag(db)
|
|
if err != nil {
|
|
return res, err
|
|
}
|
|
res.Retagged = n
|
|
|
|
paired, unpaired, err := links.Link(db)
|
|
if err != nil {
|
|
return res, err
|
|
}
|
|
res.Paired, res.Unpaired = paired, unpaired
|
|
return res, nil
|
|
}
|
|
|
|
func importFile(root string, db *store.DB, acc *config.Account, accountID int64,
|
|
p parser.Parser, engine *rules.Engine, path string, opts Options) FileResult {
|
|
|
|
rel, err := filepath.Rel(root, path)
|
|
if err != nil {
|
|
rel = path
|
|
}
|
|
fr := FileResult{Account: acc.Slug, Path: rel}
|
|
|
|
sum, err := checksum(path)
|
|
if err != nil {
|
|
fr.Err = err
|
|
return fr
|
|
}
|
|
if !opts.Force {
|
|
prev, seen, err := db.SourceFileSHA(accountID, rel)
|
|
if err != nil {
|
|
fr.Err = err
|
|
return fr
|
|
}
|
|
if seen && prev == sum {
|
|
return fr // unchanged since last import; nothing to do
|
|
}
|
|
}
|
|
|
|
txns, err := p.Parse(path, acc)
|
|
if err != nil {
|
|
fr.Err = err
|
|
return fr
|
|
}
|
|
fr.Parsed = len(txns)
|
|
|
|
if w, ok := p.(parser.Warner); ok {
|
|
fr.Warnings = append(fr.Warnings, w.Warnings()...)
|
|
}
|
|
fr.Warnings = append(fr.Warnings, checkBalances(txns, acc.Digits())...)
|
|
|
|
sourceID, err := db.SourceFile(accountID, rel, sum, time.Now().UTC().Format(time.RFC3339))
|
|
if err != nil {
|
|
fr.Err = err
|
|
return fr
|
|
}
|
|
|
|
// Identical lines within one statement (two coffees on the same day) are
|
|
// distinguished by their ordinal, so both survive; the same line seen
|
|
// again in an overlapping statement gets the same fingerprint and is
|
|
// deduplicated.
|
|
seen := map[string]int{}
|
|
for _, t := range txns {
|
|
key := fingerprintKey(t)
|
|
ordinal := seen[key]
|
|
seen[key]++
|
|
|
|
txn := model.Transaction{
|
|
AccountID: accountID,
|
|
SourceFileID: sourceID,
|
|
Fingerprint: fingerprint(key, ordinal),
|
|
Date: t.Date,
|
|
Description: t.Description,
|
|
AmountMinor: t.AmountMinor,
|
|
Type: t.Type,
|
|
BalanceMinor: t.BalanceMinor,
|
|
}
|
|
txn.RuleTag = engine.ApplyTxn(acc.Slug, txn)
|
|
added, err := db.InsertTransaction(txn)
|
|
if err != nil {
|
|
fr.Err = err
|
|
return fr
|
|
}
|
|
if added {
|
|
fr.New++
|
|
} else {
|
|
fr.Skipped++
|
|
}
|
|
}
|
|
return fr
|
|
}
|
|
|
|
// checkBalances verifies that each reported balance is the previous one plus
|
|
// the transaction amount, which is what the original extraction scripts did.
|
|
// A break means a row was missed or misparsed, so it is worth saying out loud
|
|
// even though the import still proceeds.
|
|
func checkBalances(txns []parser.RawTxn, digits int) []string {
|
|
var warnings []string
|
|
var prev *parser.RawTxn
|
|
|
|
for i := range txns {
|
|
t := &txns[i]
|
|
if t.BalanceMinor == nil {
|
|
continue // this statement does not report running balances
|
|
}
|
|
if prev != nil {
|
|
expected := *prev.BalanceMinor + t.AmountMinor
|
|
if expected != *t.BalanceMinor {
|
|
warnings = append(warnings, fmt.Sprintf(
|
|
"balance chain breaks at %s %q: statement says %s, previous balance plus amount is %s",
|
|
t.Date, truncate(t.Description, 40),
|
|
model.FormatMinor(*t.BalanceMinor, digits),
|
|
model.FormatMinor(expected, digits)))
|
|
}
|
|
}
|
|
prev = t
|
|
}
|
|
return warnings
|
|
}
|
|
|
|
func truncate(s string, n int) string {
|
|
r := []rune(s)
|
|
if len(r) <= n {
|
|
return s
|
|
}
|
|
return string(r[:n]) + "…"
|
|
}
|
|
|
|
func fingerprintKey(t parser.RawTxn) string {
|
|
return strings.Join([]string{
|
|
t.Date,
|
|
fmt.Sprintf("%d", t.AmountMinor),
|
|
model.NormalizeDescription(t.Description),
|
|
}, "\x00")
|
|
}
|
|
|
|
func fingerprint(key string, ordinal int) string {
|
|
sum := sha256.Sum256([]byte(fmt.Sprintf("%s\x00%d", key, ordinal)))
|
|
return hex.EncodeToString(sum[:])
|
|
}
|
|
|
|
// statementFiles lists the files in an account folder that should be parsed:
|
|
// every regular file except account.toml and dotfiles, narrowed by the
|
|
// account's optional include globs.
|
|
func statementFiles(acc *config.Account) ([]string, error) {
|
|
entries, err := os.ReadDir(acc.Dir)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("read account dir %s: %w", acc.Dir, err)
|
|
}
|
|
var out []string
|
|
for _, e := range entries {
|
|
name := e.Name()
|
|
if e.IsDir() || strings.HasPrefix(name, ".") || name == config.AccountFile {
|
|
continue
|
|
}
|
|
if len(acc.Include) > 0 && !matchAny(acc.Include, name) {
|
|
continue
|
|
}
|
|
out = append(out, filepath.Join(acc.Dir, name))
|
|
}
|
|
sort.Strings(out)
|
|
return out, nil
|
|
}
|
|
|
|
func matchAny(patterns []string, name string) bool {
|
|
for _, p := range patterns {
|
|
if glob.Match(p, name) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func checksum(path string) (string, error) {
|
|
f, err := os.Open(path)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
defer f.Close()
|
|
h := sha256.New()
|
|
if _, err := io.Copy(h, f); err != nil {
|
|
return "", err
|
|
}
|
|
return hex.EncodeToString(h.Sum(nil)), nil
|
|
}
|