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

add: also accept . at date prompt to quit

Browse Source
This commit is contained in:
Simon Michael 2014-03-01 11:11:01 -08:00
parent e50c2a4259
commit 1051f10826
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hledger/Hledger/Cli/Add.hs
View File

@ -80,8 +80,8 @@ showHelp = hPutStr stderr $ unlines [
,"An optional (CODE) may follow transaction dates." ,"An optional (CODE) may follow transaction dates."
,"An optional ; COMMENT may follow descriptions or amounts." ,"An optional ; COMMENT may follow descriptions or amounts."
,"If you make a mistake, enter < at any prompt to restart the transaction." ,"If you make a mistake, enter < at any prompt to restart the transaction."
,"To finish and save a transaction, enter . when prompted." ,"To end a transaction, enter . when prompted."
,"To end, press control-d or control-c." ,"To quit, enter . at a date prompt or press control-d or control-c."
] ]
-- | Loop reading transactions from the console, prompting, validating -- | Loop reading transactions from the console, prompting, validating
@ -98,7 +98,7 @@ getAndAddTransactions es@EntryState{..} = (do
j <- if debug_ esOpts > 0 j <- if debug_ esOpts > 0
then hPrintf stderr "Skipping journal add due to debug mode.\n" >> return esJournal then hPrintf stderr "Skipping journal add due to debug mode.\n" >> return esJournal
else journalAddTransaction esJournal esOpts t >> hPrintf stderr "Saved.\n" else journalAddTransaction esJournal esOpts t >> hPrintf stderr "Saved.\n"
hPrintf stderr "Starting the next transaction (or ctrl-D/ctrl-C to end)\n" hPrintf stderr "Starting the next transaction (. or ctrl-D/ctrl-C to quit)\n"
getAndAddTransactions es{esJournal=j, esDefDate=tdate t} getAndAddTransactions es{esJournal=j, esDefDate=tdate t}
) )
`E.catch` (\(_::RestartTransactionException) -> `E.catch` (\(_::RestartTransactionException) ->
@ -154,6 +154,7 @@ dateAndCodeWizard EntryState{..} = do
parser (parseSmartDateAndCode esToday) $ parser (parseSmartDateAndCode esToday) $
withCompletion (dateCompleter def) $ withCompletion (dateCompleter def) $
defaultTo' def $ nonEmpty $ defaultTo' def $ nonEmpty $
maybeExit $
maybeRestartTransaction $ maybeRestartTransaction $
-- maybeShowHelp $ -- maybeShowHelp $
line $ printf "Date%s: " (showDefault def) line $ printf "Date%s: " (showDefault def)
@ -270,6 +271,8 @@ amountAndCommentWizard EntryState{..} = do
-- when (isJust mdefaultcommodityapplied) $ -- when (isJust mdefaultcommodityapplied) $
-- liftIO $ hPutStrLn stderr $ printf "using default commodity (%s)" (fromJust mdefaultcommodityapplied) -- liftIO $ hPutStrLn stderr $ printf "using default commodity (%s)" (fromJust mdefaultcommodityapplied)
maybeExit = parser (\s -> if s=="." then throw UnexpectedEOF else Just s)
maybeRestartTransaction = parser (\s -> if s=="<" then throw RestartTransactionException else Just s) maybeRestartTransaction = parser (\s -> if s=="<" then throw RestartTransactionException else Just s)
-- maybeShowHelp :: Wizard Haskeline String -> Wizard Haskeline String -- maybeShowHelp :: Wizard Haskeline String -> Wizard Haskeline String