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

imp: areg: clearer, more consistent error messages

Browse Source
This commit is contained in:
Simon Michael 2022-01-30 08:43:41 -10:00
parent 45127dc5f5
commit 9c872c2d9c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hledger/Hledger/Cli/Commands/Aregister.hs
View File

@ -69,11 +69,12 @@ aregistermode = hledgerCommandMode
aregister :: CliOpts -> Journal -> IO () aregister :: CliOpts -> Journal -> IO ()
aregister opts@CliOpts{rawopts_=rawopts,reportspec_=rspec} j = do aregister opts@CliOpts{rawopts_=rawopts,reportspec_=rspec} j = do
-- the first argument specifies the account, any remaining arguments are a filter query -- the first argument specifies the account, any remaining arguments are a filter query
let help = "aregister needs an ACCTPAT argument to select an account"
(apat,querystring) <- case listofstringopt "args" rawopts of (apat,querystring) <- case listofstringopt "args" rawopts of
[] -> fail "aregister needs an account, please provide an account name or pattern" [] -> error' $ help <> ".\nPlease provide an account name or a (case-insensitive, infix, regexp) pattern."
(a:as) -> return (a, map T.pack as) (a:as) -> return (a, map T.pack as)
let let
acct = fromMaybe (error' $ show apat++" did not match any account") -- PARTIAL: acct = fromMaybe (error' $ help <> ",\nbut " ++ show apat++" did not match any account.") -- PARTIAL:
. firstMatch $ journalAccountNamesDeclaredOrImplied j . firstMatch $ journalAccountNamesDeclaredOrImplied j
firstMatch = case toRegexCI $ T.pack apat of firstMatch = case toRegexCI $ T.pack apat of
Right re -> find (regexMatchText re) Right re -> find (regexMatchText re)