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

Implement getting separator from rules

Browse Source
This commit is contained in:
Aleksandar Dimitrov 2020-01-02 18:09:57 +01:00 committed by Simon Michael
parent 32ccc3a2b2
commit b524a088c7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,14 @@ parse iopts f t = do
-- better preemptively reverse them once more. XXX inefficient -- better preemptively reverse them once more. XXX inefficient
pj' = journalReverse pj pj' = journalReverse pj
getSeparatorFromRules :: Char -> CsvRules -> Char
getSeparatorFromRules defaultSeparator rules =
maybe defaultSeparator id (getSeparator <$> getDirective "separator" rules)
where getSeparator :: String -> Char
getSeparator "SPACE" = ' '
getSeparator "TAB" = '\t'
getSeparator x = head x
-- | Read a Journal from the given CSV data (and filename, used for error -- | Read a Journal from the given CSV data (and filename, used for error
-- messages), or return an error. Proceed as follows: -- messages), or return an error. Proceed as follows:
-- @ -- @
@ -148,7 +156,7 @@ readJournalFromCsv separator mrulesfile csvfile csvdata =
records <- (either throwerr id . records <- (either throwerr id .
dbg2 "validateCsv" . validateCsv rules skiplines . dbg2 "validateCsv" . validateCsv rules skiplines .
dbg2 "parseCsv") dbg2 "parseCsv")
`fmap` parseCsv separator parsecfilename csvdata `fmap` parseCsv (getSeparatorFromRules separator rules) parsecfilename csvdata
dbg1IO "first 3 csv records" $ take 3 records dbg1IO "first 3 csv records" $ take 3 records
-- identify header lines -- identify header lines