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

comments

Browse Source
This commit is contained in:
Simon Michael 2019-01-16 13:58:04 -08:00
parent 99f397da5d
commit c5ae8e6891
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-lib/Hledger/Read/Common.hs
View File

@ -291,6 +291,8 @@ parseAndFinaliseJournal parser iopts f txt = do
Right j -> return j Right j -> return j
Left e -> throwError e Left e -> throwError e
-- Like parseAndFinaliseJournal but takes a (non-Erroring) JournalParser.
-- Used for timeclock/timedot. XXX let them use parseAndFinaliseJournal instead
parseAndFinaliseJournal' :: JournalParser IO ParsedJournal -> InputOpts parseAndFinaliseJournal' :: JournalParser IO ParsedJournal -> InputOpts
-> FilePath -> Text -> ExceptT String IO Journal -> FilePath -> Text -> ExceptT String IO Journal
parseAndFinaliseJournal' parser iopts f txt = do parseAndFinaliseJournal' parser iopts f txt = do

2
hledger-ui/Hledger/UI/Main.hs
View File

@ -71,7 +71,7 @@ main = do
| otherwise = withJournalDoUICommand opts runBrickUi | otherwise = withJournalDoUICommand opts runBrickUi
-- TODO fix nasty duplication of withJournalDo -- TODO fix nasty duplication of withJournalDo
-- | hledger-ui's version of withJournalDo. Enables --auto and --forecast. -- | hledger-ui's version of withJournalDo, which turns on --auto and --forecast.
withJournalDoUICommand :: UIOpts -> (UIOpts -> Journal -> IO ()) -> IO () withJournalDoUICommand :: UIOpts -> (UIOpts -> Journal -> IO ()) -> IO ()
withJournalDoUICommand uopts@UIOpts{cliopts_=copts@CliOpts{inputopts_=iopts,reportopts_=ropts}} cmd = do withJournalDoUICommand uopts@UIOpts{cliopts_=copts@CliOpts{inputopts_=iopts,reportopts_=ropts}} cmd = do
let copts' = copts{inputopts_=iopts{auto_=True}, reportopts_=ropts{forecast_=True}} let copts' = copts{inputopts_=iopts{auto_=True}, reportopts_=ropts{forecast_=True}}