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

csv: fix parse error printing, broken since 1.11 (#1038)

Browse Source
This commit is contained in:
Simon Michael 2019-06-06 23:10:31 -07:00
parent 9760126cb2
commit 90af360792
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,9 +75,6 @@ type Record = [Field]
type Field = String type Field = String
data CSVError = CSVError (ParseErrorBundle BL.ByteString CassavaMP.ConversionError)
deriving Show
reader :: Reader reader :: Reader
reader = Reader reader = Reader
{rFormat = "csv" {rFormat = "csv"
@ -112,7 +109,7 @@ readJournalFromCsv :: Char -> Maybe FilePath -> FilePath -> Text -> IO (Either S
readJournalFromCsv _ Nothing "-" _ = return $ Left "please use --rules-file when reading CSV from stdin" readJournalFromCsv _ Nothing "-" _ = return $ Left "please use --rules-file when reading CSV from stdin"
readJournalFromCsv separator mrulesfile csvfile csvdata = readJournalFromCsv separator mrulesfile csvfile csvdata =
handle (\e -> return $ Left $ show (e :: IOException)) $ do handle (\e -> return $ Left $ show (e :: IOException)) $ do
let throwerr = throw.userError let throwerr = throw . userError
-- parse rules -- parse rules
let rulesfile = fromMaybe (rulesFileFor csvfile) mrulesfile let rulesfile = fromMaybe (rulesFileFor csvfile) mrulesfile
@ -180,19 +177,17 @@ readJournalFromCsv separator mrulesfile csvfile csvdata =
return $ Right nulljournal{jtxns=txns''} return $ Right nulljournal{jtxns=txns''}
parseCsv :: Char -> FilePath -> Text -> IO (Either CSVError CSV) parseCsv :: Char -> FilePath -> Text -> IO (Either String CSV)
parseCsv separator filePath csvdata = parseCsv separator filePath csvdata =
case filePath of case filePath of
"-" -> liftM (parseCassava separator "(stdin)") T.getContents "-" -> liftM (parseCassava separator "(stdin)") T.getContents
_ -> return $ parseCassava separator filePath csvdata _ -> return $ parseCassava separator filePath csvdata
parseCassava :: Char -> FilePath -> Text -> Either CSVError CSV parseCassava :: Char -> FilePath -> Text -> Either String CSV
parseCassava separator path content = parseCassava separator path content =
case parseResult of either (Left . errorBundlePretty) (Right . parseResultToCsv) <$>
Left msg -> Left $ CSVError msg CassavaMP.decodeWith (decodeOptions separator) Cassava.NoHeader path $
Right a -> Right a BL.fromStrict $ T.encodeUtf8 content
where parseResult = fmap parseResultToCsv $ CassavaMP.decodeWith (decodeOptions separator) Cassava.NoHeader path lazyContent
lazyContent = BL.fromStrict $ T.encodeUtf8 content
decodeOptions :: Char -> Cassava.DecodeOptions decodeOptions :: Char -> Cassava.DecodeOptions
decodeOptions separator = Cassava.defaultDecodeOptions { decodeOptions separator = Cassava.defaultDecodeOptions {
@ -214,8 +209,8 @@ printCSV records = unlined (printRecord `map` records)
unlined = concat . intersperse "\n" unlined = concat . intersperse "\n"
-- | Return the cleaned up and validated CSV data (can be empty), or an error. -- | Return the cleaned up and validated CSV data (can be empty), or an error.
validateCsv :: Int -> Either CSVError CSV -> Either String [CsvRecord] validateCsv :: Int -> Either String CSV -> Either String [CsvRecord]
validateCsv _ (Left e) = Left $ show e validateCsv _ (Left err) = Left err
validateCsv numhdrlines (Right rs) = validate $ drop numhdrlines $ filternulls rs validateCsv numhdrlines (Right rs) = validate $ drop numhdrlines $ filternulls rs
where where
filternulls = filter (/=[""]) filternulls = filter (/=[""])