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

;fix: recognise another case of text decoding failure

Browse Source
This commit is contained in:
Simon Michael 2025-05-29 12:25:06 -10:00
parent 39f178f710
commit 4587eccdf4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger-lib/Hledger/Utils/IO.hs
View File

@ -291,19 +291,25 @@ exitWithErrorMessage msg = printError msg >> exitFailure
-- --
exitOnError :: IO () -> IO () exitOnError :: IO () -> IO ()
exitOnError = flip catches exitOnError = flip catches
[Handler (\(e::UnicodeException) -> exitUnicode e) [-- Handler (\(e::SomeException) -> error' $ pshow e), -- debug
Handler (\(e::UnicodeException) -> exitUnicode e)
,Handler (\(e::IOException) -> if isUnicodeError e then exitUnicode e else exitOther e) ,Handler (\(e::IOException) -> if isUnicodeError e then exitUnicode e else exitOther e)
,Handler (\(e::ErrorCall) -> exitOther e) ,Handler (\(e::ErrorCall) -> exitOther e)
] ]
where where
-- Many decoding failures do not produce a UnicodeException, unfortunately.
-- So this fragile hack detects them from the error message.
-- But there are many variant wordings and they probably change over time.
-- It's not ideal.
isUnicodeError :: Exception e => e -> Bool isUnicodeError :: Exception e => e -> Bool
isUnicodeError ex = any (`isInfixOf` msg) unicodeerrorpatterns isUnicodeError ex = any (`isInfixOf` msg) unicodeerrorpatterns
where where
msg = map toLower $ show ex msg = map toLower $ show ex
unicodeerrorpatterns = [ -- keep updated unicodeerrorpatterns = [
"illegal byte sequence" "illegal byte sequence"
, "invalid byte sequence" , "invalid byte sequence"
, "cannot decode byte sequence"
, "invalid character" , "invalid character"
, "invalid or incomplete multibyte" , "invalid or incomplete multibyte"
, "mkTextEncoding: invalid argument" , "mkTextEncoding: invalid argument"