slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: Allow multiline comments in csv rules

Browse Source
This commit is contained in:
Malte Brandy 2021-09-16 23:40:05 +02:00 committed by Simon Michael
parent b79a8473f7
commit e31eb58ada
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -920,10 +920,11 @@ transactionFromCsvRecord sourcepos rules record = t
] ]
code = maybe "" singleline $ fieldval "code" code = maybe "" singleline $ fieldval "code"
description = maybe "" singleline $ fieldval "description" description = maybe "" singleline $ fieldval "description"
comment = maybe "" singleline $ fieldval "comment" comment = maybe "" unescapeNewlines $ fieldval "comment"
precomment = maybe "" singleline $ fieldval "precomment" precomment = maybe "" unescapeNewlines $ fieldval "precomment"
singleline = T.unwords . filter (not . T.null) . map T.strip . T.lines singleline = T.unwords . filter (not . T.null) . map T.strip . T.lines
unescapeNewlines = T.intercalate "\n" . T.splitOn "\\n"
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- 3. Generate the postings for which an account has been assigned -- 3. Generate the postings for which an account has been assigned
@ -931,7 +932,7 @@ transactionFromCsvRecord sourcepos rules record = t
p1IsVirtual = (accountNamePostingType <$> fieldval "account1") == Just VirtualPosting p1IsVirtual = (accountNamePostingType <$> fieldval "account1") == Just VirtualPosting
ps = [p | n <- [1..maxpostings] ps = [p | n <- [1..maxpostings]
,let comment = fromMaybe "" $ fieldval ("comment"<> T.pack (show n)) ,let comment = maybe "" unescapeNewlines $ fieldval ("comment"<> T.pack (show n))
,let currency = fromMaybe "" (fieldval ("currency"<> T.pack (show n)) <|> fieldval "currency") ,let currency = fromMaybe "" (fieldval ("currency"<> T.pack (show n)) <|> fieldval "currency")
,let mamount = getAmount rules record currency p1IsVirtual n ,let mamount = getAmount rules record currency p1IsVirtual n
,let mbalance = getBalance rules record currency n ,let mbalance = getBalance rules record currency n

2
hledger/hledger.m4.md
View File

@ -3803,7 +3803,7 @@ Assigning to `date` sets the [transaction date](#simple-dates).
`commentN`, where N is a number, sets the Nth posting's comment. `commentN`, where N is a number, sets the Nth posting's comment.
Tips: Tips:
- Only single-line comments can be assigned. - You can assign multi-line comments by writing literal `\n` in the code. A comment starting with `\n` will begin on a new line.
- Comments can contain [tags](#tags), as usual. - Comments can contain [tags](#tags), as usual.
#### account field #### account field