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

lib: defaultJournalSafely wasn't very safe; now catches error calls

Browse Source
This commit is contained in:
Simon Michael 2025-04-25 15:21:11 -10:00
parent bf40d28c8b
commit f0f048326e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hledger-lib/Hledger/Read.hs
View File

@ -196,8 +196,13 @@ defaultJournalSafely = defaultJournalSafelyWith definputopts
-- | Read the default journal file specified by the environment, -- | Read the default journal file specified by the environment,
-- with the given input options, or return an error message. -- with the given input options, or return an error message.
defaultJournalSafelyWith :: InputOpts -> IO (Either String Journal) defaultJournalSafelyWith :: InputOpts -> IO (Either String Journal)
defaultJournalSafelyWith iopts = defaultJournalPath >>= runExceptT . readJournalFile iopts defaultJournalSafelyWith iopts = (do
f <- defaultJournalPath
runExceptT $ readJournalFile iopts f
) `C.catches` [ -- XXX
C.Handler (\(e :: C.ErrorCall) -> return $ Left $ rstrip $ show e)
,C.Handler (\(e :: C.IOException) -> return $ Left $ rstrip $ show e)
]
-- | Get the default journal file path specified by the environment. -- | Get the default journal file path specified by the environment.
-- Like ledger, we look first for the LEDGER_FILE environment -- Like ledger, we look first for the LEDGER_FILE environment
-- variable, and if that does not exist, for the legacy LEDGER -- variable, and if that does not exist, for the legacy LEDGER
@ -256,6 +261,8 @@ readJournal iopts@InputOpts{strict_, _defer} mpath hdl = do
-- | Read a Journal from this file, or from stdin if the file path is -, -- | Read a Journal from this file, or from stdin if the file path is -,
-- with strict checks if enabled, or return an error message. -- with strict checks if enabled, or return an error message.
-- XXX or, calls error if the file does not exist.
--
-- (Note strict checks are disabled temporarily here when this is called by readJournalFiles). -- (Note strict checks are disabled temporarily here when this is called by readJournalFiles).
-- The file path can have a READER: prefix. -- The file path can have a READER: prefix.
-- --
@ -364,7 +371,7 @@ readJournalFiles' = orDieTrying . readJournalFiles definputopts
orDieTrying :: MonadIO m => ExceptT String m a -> m a orDieTrying :: MonadIO m => ExceptT String m a -> m a
orDieTrying a = either (liftIO . fail) return =<< runExceptT a orDieTrying a = either (liftIO . fail) return =<< runExceptT a
-- | If the specified journal file does not exist (and is not "-"), give a helpful error and quit. -- | If the specified journal file does not exist (and is not "-"), call error with an informative message.
-- (Using "journal file" generically here; it could be in any of hledger's supported formats.) -- (Using "journal file" generically here; it could be in any of hledger's supported formats.)
requireJournalFileExists :: FilePath -> IO () requireJournalFileExists :: FilePath -> IO ()
requireJournalFileExists "-" = return () requireJournalFileExists "-" = return ()