hledger 1.3.1 → 1.4

raw patch · 70 files changed

+5781/−4346 lines, 70 filesdep +Diffdep +utility-htdep −ghc-primdep −old-localedep −shakespeare-textdep ~ansi-terminaldep ~hledger-libdep ~megaparsecPVP ok

version bump matches the API change (PVP)

Dependencies added: Diff, utility-ht

Dependencies removed: ghc-prim, old-locale, shakespeare-text

Dependency ranges changed: ansi-terminal, hledger-lib, megaparsec, shakespeare, time

API changes (from Hackage documentation)

Files

• CHANGES +76/−0
• Hledger/Cli.hs +3/−418
• Hledger/Cli/Accounts.hs +0/−67
• Hledger/Cli/Add.hs +0/−449
• Hledger/Cli/Balance.hs +0/−545
• Hledger/Cli/Balancesheet.hs +0/−47
• Hledger/Cli/Cashflow.hs +0/−48
• Hledger/Cli/CliOptions.hs +57/−43
• Hledger/Cli/Commands.hs +636/−0
• Hledger/Cli/Commands/Accounts.hs +67/−0
• Hledger/Cli/Commands/Activity.hs +58/−0
• Hledger/Cli/Commands/Add.hs +455/−0
• Hledger/Cli/Commands/Balance.hs +553/−0
• Hledger/Cli/Commands/Balancesheet.hs +47/−0
• Hledger/Cli/Commands/Balancesheetequity.hs +40/−0
• Hledger/Cli/Commands/Cashflow.hs +48/−0
• Hledger/Cli/Commands/Checkdates.hs +85/−0
• Hledger/Cli/Commands/Checkdupes.hs +49/−0
• Hledger/Cli/Commands/Equity.hs +85/−0
• Hledger/Cli/Commands/Help.hs +84/−0
• Hledger/Cli/Commands/Import.hs +60/−0
• Hledger/Cli/Commands/Incomestatement.hs +47/−0
• Hledger/Cli/Commands/Prices.hs +84/−0
• Hledger/Cli/Commands/Print.hs +180/−0
• Hledger/Cli/Commands/Printunique.hs +47/−0
• Hledger/Cli/Commands/Register.hs +204/−0
• Hledger/Cli/Commands/Registermatch.hs +96/−0
• Hledger/Cli/Commands/Rewrite.hs +276/−0
• Hledger/Cli/Commands/Stats.hs +112/−0
• Hledger/Cli/Commands/Tags.hs +34/−0
• Hledger/Cli/CompoundBalanceCommand.hs +230/−96
• Hledger/Cli/DocFiles.hs +14/−4
• Hledger/Cli/Help.hs +0/−42
• Hledger/Cli/Histogram.hs +0/−59
• Hledger/Cli/Incomestatement.hs +0/−47
• Hledger/Cli/Info.hs +0/−41
• Hledger/Cli/Main.hs +83/−256
• Hledger/Cli/Man.hs +0/−41
• Hledger/Cli/Print.hs +0/−180
• Hledger/Cli/Register.hs +0/−204
• Hledger/Cli/Stats.hs +0/−112
• Hledger/Cli/Tests.hs +0/−71
• Hledger/Cli/Utils.hs +10/−33
• README.md +2/−1
• Text/Tabular/AsciiWide.hs +2/−2
• doc/hledger.1 +264/−159
• doc/hledger.1.info +452/−352
• doc/hledger.1.txt +392/−304
• doc/other/hledger-api.1 +2/−17
• doc/other/hledger-api.1.info +5/−14
• doc/other/hledger-api.1.txt +3/−8
• doc/other/hledger-ui.1 +16/−23
• doc/other/hledger-ui.1.info +32/−32
• doc/other/hledger-ui.1.txt +103/−99
• doc/other/hledger-web.1 +16/−23
• doc/other/hledger-web.1.info +20/−20
• doc/other/hledger-web.1.txt +26/−22
• doc/other/hledger_csv.5 +52/−19
• doc/other/hledger_csv.5.info +116/−35
• doc/other/hledger_csv.5.txt +48/−19
• doc/other/hledger_journal.5 +32/−23
• doc/other/hledger_journal.5.info +155/−137
• doc/other/hledger_journal.5.txt +89/−79
• doc/other/hledger_timeclock.5 +1/−1
• doc/other/hledger_timeclock.5.info +2/−2
• doc/other/hledger_timeclock.5.txt +1/−1
• doc/other/hledger_timedot.5 +26/−16
• doc/other/hledger_timedot.5.info +26/−22
• doc/other/hledger_timedot.5.txt +26/−22
• hledger.cabal +52/−91

@@ -2,6 +2,82 @@ See also the project change log.  +# 1.4 (2017/9/30)++* cli: a @FILE argument reads flags & args from FILE, one per line++* cli: reorganized commands list, added some new command aliases:+  accounts: a+  balance:  b+  print:    p, txns+  register: r++* cli: accept -NUM as a shortcut for --depth=NUM (eg: -2)++* cli: improve command-line help for --date2 (#604)++* cli: make --help and -h the same, drop --man and --info for now (#579)++* help: offers multiple formats, accepts topic substrings.+  The separate info/man commands have been dropped. help now+  chooses an appropriate documentation format as follows: +  - it uses info if available, +  - otherwise man if available, +  - otherwise $PAGER if defined, +  - otherwise less if available, +  - otherwise it prints on stdout+  - (and it always prints on stdout when piped). +  You can override this with the `--info`/`--man`/`--pager`/`--cat` flags.+  (#579)++* bal/bs/cf/is: --sort-amount/-S sorts by largest amount instead of+  account name++* bs/cf/is: support --output-file and --output-format=txt|csv+  The CSV output should be reasonably ok for dragging into a+  spreadsheet and reformatting.++* bal/bs/cf/is: consistent double space between columns, consistent+  single final blank line.  Previously, amounts wider than the column+  headings would be separated by only a single space.++* bs/is: don't let an empty subreport disable the grand totals (fixes #588)++* cf: exclude asset accounts with ":fixed" in their name (Christian G. Warden, Simon Michael, #584)++* new balancesheetequity command: like balancesheet but also shows+  equity accounts (Nicholas Niro)++* new import command: adds new transactions seen in one or more input+  files to the main journal file++* print: --new shows only transactions added since last time+  (saves state in .latest.JOURNALFILE file)++* new tags command: lists tags in matched transactions++* most addons formerly shipped in bin/ are now builtin commands. These+  include: check-dates, check-dupes, equity, prices, print-unique,+  register-match, rewrite.++* refactor: new Commands module and subdirectory.+  Builtin commands are now gathered more tightly in a single module,+  Hledger.Cli.Commands, facilitating change.  The legacy "convert"+  command has been dropped.++* refactor: BalanceView -> CompoundBalanceCommand++* deps: drop support for directory < 1.2++* deps: allow ansi-terminal 0.7++* deps: drop oldtime flag, require time 1.5+++* deps: simplify shakespeare bounds++* deps: remove ghc < 7.6 support++ # 1.3.1 (2017/8/25)  * bs/is: don't let an empty subreport disable the grand totals (#588)

@@ -10,20 +10,8 @@ {-# LANGUAGE OverloadedStrings #-}  module Hledger.Cli (-                     module Hledger.Cli.Accounts,-                     module Hledger.Cli.Add,-                     module Hledger.Cli.Balance,-                     module Hledger.Cli.Balancesheet,-                     module Hledger.Cli.Cashflow,-                     module Hledger.Cli.Help,-                     module Hledger.Cli.Histogram,-                     module Hledger.Cli.Incomestatement,-                     module Hledger.Cli.Info,-                     module Hledger.Cli.Man,-                     module Hledger.Cli.Print,-                     module Hledger.Cli.Register,-                     module Hledger.Cli.Stats,                      module Hledger.Cli.CliOptions,+                     module Hledger.Cli.Commands,                      module Hledger.Cli.DocFiles,                      module Hledger.Cli.Utils,                      module Hledger.Cli.Version,@@ -32,416 +20,13 @@                      module System.Console.CmdArgs.Explicit               ) where-import Data.Monoid ((<>))-import Data.Text (Text)-import qualified Data.Text as T-import Data.Time.Calendar import System.Console.CmdArgs.Explicit hiding (Name) -- don't clash with hledger-ui-import Test.HUnit  import Hledger-import Hledger.Cli.Accounts-import Hledger.Cli.Add-import Hledger.Cli.Balance-import Hledger.Cli.Balancesheet-import Hledger.Cli.Cashflow-import Hledger.Cli.Histogram-import Hledger.Cli.Help-import Hledger.Cli.Incomestatement-import Hledger.Cli.Info-import Hledger.Cli.Man-import Hledger.Cli.Print-import Hledger.Cli.Register-import Hledger.Cli.Stats import Hledger.Cli.CliOptions+import Hledger.Cli.Commands import Hledger.Cli.DocFiles import Hledger.Cli.Utils import Hledger.Cli.Version --tests_Hledger_Cli :: Test-tests_Hledger_Cli = TestList- [-    tests_Hledger-   -- ,tests_Hledger_Cli_Add-   ,tests_Hledger_Cli_Balance-   ,tests_Hledger_Cli_Balancesheet-   ,tests_Hledger_Cli_Cashflow-   -- ,tests_Hledger_Cli_Histogram-   ,tests_Hledger_Cli_Incomestatement-   ,tests_Hledger_Cli_CliOptions-   -- ,tests_Hledger_Cli_Print-   ,tests_Hledger_Cli_Register-   -- ,tests_Hledger_Cli_Stats---   ,"apply account directive" ~: -      let ignoresourcepos j = j{jtxns=map (\t -> t{tsourcepos=nullsourcepos}) (jtxns j)} in-      let sameParse str1 str2 = do j1 <- readJournal Nothing Nothing True Nothing str1 >>= either error' (return . ignoresourcepos)-                                   j2 <- readJournal Nothing Nothing True Nothing str2 >>= either error' (return . ignoresourcepos)-                                   j1 `is` j2{jlastreadtime=jlastreadtime j1, jfiles=jfiles j1} --, jparsestate=jparsestate j1}-      in sameParse-                           ("2008/12/07 One\n  alpha  $-1\n  beta  $1\n" <>-                            "apply account outer\n2008/12/07 Two\n  aigh  $-2\n  bee  $2\n" <>-                            "apply account inner\n2008/12/07 Three\n  gamma  $-3\n  delta  $3\n" <>-                            "end apply account\n2008/12/07 Four\n  why  $-4\n  zed  $4\n" <>-                            "end apply account\n2008/12/07 Five\n  foo  $-5\n  bar  $5\n"-                           )-                           ("2008/12/07 One\n  alpha  $-1\n  beta  $1\n" <>-                            "2008/12/07 Two\n  outer:aigh  $-2\n  outer:bee  $2\n" <>-                            "2008/12/07 Three\n  outer:inner:gamma  $-3\n  outer:inner:delta  $3\n" <>-                            "2008/12/07 Four\n  outer:why  $-4\n  outer:zed  $4\n" <>-                            "2008/12/07 Five\n  foo  $-5\n  bar  $5\n"-                           )--   ,"apply account directive should preserve \"virtual\" posting type" ~: do-      j <- readJournal Nothing Nothing True Nothing "apply account test\n2008/12/07 One\n  (from)  $-1\n  (to)  $1\n" >>= either error' return-      let p = head $ tpostings $ head $ jtxns j-      assertBool "" $ paccount p == "test:from"-      assertBool "" $ ptype p == VirtualPosting--   ,"account aliases" ~: do-      j <- readJournal Nothing Nothing True Nothing "!alias expenses = equity:draw:personal\n1/1\n (expenses:food)  1\n" >>= either error' return-      let p = head $ tpostings $ head $ jtxns j-      assertBool "" $ paccount p == "equity:draw:personal:food"--  ,"ledgerAccountNames" ~:-    ledgerAccountNames ledger7 `is`-     ["assets","assets:cash","assets:checking","assets:saving","equity","equity:opening balances",-      "expenses","expenses:food","expenses:food:dining","expenses:phone","expenses:vacation",-      "liabilities","liabilities:credit cards","liabilities:credit cards:discover"]--  -- ,"journalCanonicaliseAmounts" ~:-  --  "use the greatest precision" ~:-  --   (map asprecision $ journalAmountAndPriceCommodities $ journalCanonicaliseAmounts $ journalWithAmounts ["1","2.00"]) `is` [2,2]--  -- don't know what this should do-  -- ,"elideAccountName" ~: do-  --    (elideAccountName 50 "aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa"-  --     `is` "aa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa")-  --    (elideAccountName 20 "aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa"-  --     `is` "aa:aa:aaaaaaaaaaaaaa")--  ,"default year" ~: do-    j <- readJournal Nothing Nothing True Nothing defaultyear_journal_txt >>= either error' return-    tdate (head $ jtxns j) `is` fromGregorian 2009 1 1-    return ()--  ,"show dollars" ~: showAmount (usd 1) ~?= "$1.00"--  ,"show hours" ~: showAmount (hrs 1) ~?= "1.00h"-- ]----- fixtures/test data---- date1 = parsedate "2008/11/26"--- t1 = LocalTime date1 midday--{--samplejournal = readJournal' sample_journal_str--sample_journal_str = unlines- ["; A sample journal file."- ,";"- ,"; Sets up this account tree:"- ,"; assets"- ,";   bank"- ,";     checking"- ,";     saving"- ,";   cash"- ,"; expenses"- ,";   food"- ,";   supplies"- ,"; income"- ,";   gifts"- ,";   salary"- ,"; liabilities"- ,";   debts"- ,""- ,"2008/01/01 income"- ,"    assets:bank:checking  $1"- ,"    income:salary"- ,""- ,"2008/06/01 gift"- ,"    assets:bank:checking  $1"- ,"    income:gifts"- ,""- ,"2008/06/02 save"- ,"    assets:bank:saving  $1"- ,"    assets:bank:checking"- ,""- ,"2008/06/03 * eat & shop"- ,"    expenses:food      $1"- ,"    expenses:supplies  $1"- ,"    assets:cash"- ,""- ,"2008/12/31 * pay off"- ,"    liabilities:debts  $1"- ,"    assets:bank:checking"- ,""- ,""- ,";final comment"- ]--}--defaultyear_journal_txt :: Text-defaultyear_journal_txt = T.unlines- ["Y2009"- ,""- ,"01/01 A"- ,"    a  $1"- ,"    b"- ]---- write_sample_journal = writeFile "sample.journal" sample_journal_str---- entry2_str = unlines---  ["2007/01/27 * joes diner"---  ,"    expenses:food:dining                      $10.00"---  ,"    expenses:gifts                            $10.00"---  ,"    assets:checking                          $-20.00"---  ,""---  ]---- entry3_str = unlines---  ["2007/01/01 * opening balance"---  ,"    assets:cash                                $4.82"---  ,"    equity:opening balances"---  ,""---  ,"2007/01/01 * opening balance"---  ,"    assets:cash                                $4.82"---  ,"    equity:opening balances"---  ,""---  ,"2007/01/28 coopportunity"---  ,"  expenses:food:groceries                 $47.18"---  ,"  assets:checking"---  ,""---  ]---- periodic_entry1_str = unlines---  ["~ monthly from 2007/2/2"---  ,"  assets:saving            $200.00"---  ,"  assets:checking"---  ,""---  ]---- periodic_entry2_str = unlines---  ["~ monthly from 2007/2/2"---  ,"  assets:saving            $200.00         ;auto savings"---  ,"  assets:checking"---  ,""---  ]---- periodic_entry3_str = unlines---  ["~ monthly from 2007/01/01"---  ,"    assets:cash                                $4.82"---  ,"    equity:opening balances"---  ,""---  ,"~ monthly from 2007/01/01"---  ,"    assets:cash                                $4.82"---  ,"    equity:opening balances"---  ,""---  ]---- journal1_str = unlines---  [""---  ,"2007/01/27 * joes diner"---  ,"  expenses:food:dining                    $10.00"---  ,"  expenses:gifts                          $10.00"---  ,"  assets:checking                        $-20.00"---  ,""---  ,""---  ,"2007/01/28 coopportunity"---  ,"  expenses:food:groceries                 $47.18"---  ,"  assets:checking                        $-47.18"---  ,""---  ,""---  ]---- journal2_str = unlines---  [";comment"---  ,"2007/01/27 * joes diner"---  ,"  expenses:food:dining                    $10.00"---  ,"  assets:checking                        $-47.18"---  ,""---  ]---- journal3_str = unlines---  ["2007/01/27 * joes diner"---  ,"  expenses:food:dining                    $10.00"---  ,";intra-entry comment"---  ,"  assets:checking                        $-47.18"---  ,""---  ]---- journal4_str = unlines---  ["!include \"somefile\""---  ,"2007/01/27 * joes diner"---  ,"  expenses:food:dining                    $10.00"---  ,"  assets:checking                        $-47.18"---  ,""---  ]---- journal5_str = ""---- journal6_str = unlines---  ["~ monthly from 2007/1/21"---  ,"    expenses:entertainment  $16.23        ;netflix"---  ,"    assets:checking"---  ,""---  ,"; 2007/01/01 * opening balance"---  ,";     assets:saving                            $200.04"---  ,";     equity:opening balances                         "---  ,""---  ]---- journal7_str = unlines---  ["2007/01/01 * opening balance"---  ,"    assets:cash                                $4.82"---  ,"    equity:opening balances                         "---  ,""---  ,"2007/01/01 * opening balance"---  ,"    income:interest                                $-4.82"---  ,"    equity:opening balances                         "---  ,""---  ,"2007/01/02 * ayres suites"---  ,"    expenses:vacation                        $179.92"---  ,"    assets:checking                                 "---  ,""---  ,"2007/01/02 * auto transfer to savings"---  ,"    assets:saving                            $200.00"---  ,"    assets:checking                                 "---  ,""---  ,"2007/01/03 * poquito mas"---  ,"    expenses:food:dining                       $4.82"---  ,"    assets:cash                                     "---  ,""---  ,"2007/01/03 * verizon"---  ,"    expenses:phone                            $95.11"---  ,"    assets:checking                                 "---  ,""---  ,"2007/01/03 * discover"---  ,"    liabilities:credit cards:discover         $80.00"---  ,"    assets:checking                                 "---  ,""---  ,"2007/01/04 * blue cross"---  ,"    expenses:health:insurance                 $90.00"---  ,"    assets:checking                                 "---  ,""---  ,"2007/01/05 * village market liquor"---  ,"    expenses:food:dining                       $6.48"---  ,"    assets:checking                                 "---  ,""---  ]--journal7 :: Journal-journal7 = nulljournal {jtxns =-          [-           txnTieKnot Transaction {-             tindex=0,-             tsourcepos=nullsourcepos,-             tdate=parsedate "2007/01/01",-             tdate2=Nothing,-             tstatus=Unmarked,-             tcode="*",-             tdescription="opening balance",-             tcomment="",-             ttags=[],-             tpostings=-                 ["assets:cash" `post` usd 4.82-                 ,"equity:opening balances" `post` usd (-4.82)-                 ],-             tpreceding_comment_lines=""-           }-          ,-           txnTieKnot Transaction {-             tindex=0,-             tsourcepos=nullsourcepos,-             tdate=parsedate "2007/02/01",-             tdate2=Nothing,-             tstatus=Unmarked,-             tcode="*",-             tdescription="ayres suites",-             tcomment="",-             ttags=[],-             tpostings=-                 ["expenses:vacation" `post` usd 179.92-                 ,"assets:checking" `post` usd (-179.92)-                 ],-             tpreceding_comment_lines=""-           }-          ,-           txnTieKnot Transaction {-             tindex=0,-             tsourcepos=nullsourcepos,-             tdate=parsedate "2007/01/02",-             tdate2=Nothing,-             tstatus=Unmarked,-             tcode="*",-             tdescription="auto transfer to savings",-             tcomment="",-             ttags=[],-             tpostings=-                 ["assets:saving" `post` usd 200-                 ,"assets:checking" `post` usd (-200)-                 ],-             tpreceding_comment_lines=""-           }-          ,-           txnTieKnot Transaction {-             tindex=0,-             tsourcepos=nullsourcepos,-             tdate=parsedate "2007/01/03",-             tdate2=Nothing,-             tstatus=Unmarked,-             tcode="*",-             tdescription="poquito mas",-             tcomment="",-             ttags=[],-             tpostings=-                 ["expenses:food:dining" `post` usd 4.82-                 ,"assets:cash" `post` usd (-4.82)-                 ],-             tpreceding_comment_lines=""-           }-          ,-           txnTieKnot Transaction {-             tindex=0,-             tsourcepos=nullsourcepos,-             tdate=parsedate "2007/01/03",-             tdate2=Nothing,-             tstatus=Unmarked,-             tcode="*",-             tdescription="verizon",-             tcomment="",-             ttags=[],-             tpostings=-                 ["expenses:phone" `post` usd 95.11-                 ,"assets:checking" `post` usd (-95.11)-                 ],-             tpreceding_comment_lines=""-           }-          ,-           txnTieKnot Transaction {-             tindex=0,-             tsourcepos=nullsourcepos,-             tdate=parsedate "2007/01/03",-             tdate2=Nothing,-             tstatus=Unmarked,-             tcode="*",-             tdescription="discover",-             tcomment="",-             ttags=[],-             tpostings=-                 ["liabilities:credit cards:discover" `post` usd 80-                 ,"assets:checking" `post` usd (-80)-                 ],-             tpreceding_comment_lines=""-           }-          ]-         }--ledger7 :: Ledger-ledger7 = ledgerFromJournal Any journal7+tests_Hledger_Cli = tests_Hledger_Cli_Commands

@@ -1,67 +0,0 @@-{-|--The @accounts@ command lists account names:--- in flat mode (default), it lists the full names of accounts posted to by matched postings,-  clipped to the specified depth, possibly with leading components dropped.--- in tree mode, it shows the indented short names of accounts posted to by matched postings,-  and their parents, to the specified depth.---}--{-# LANGUAGE OverloadedStrings #-}--module Hledger.Cli.Accounts (-  accountsmode- ,accounts- ,tests_Hledger_Cli_Accounts-) where--import Data.List-import Data.Monoid--- import Data.Text (Text)-import qualified Data.Text as T-import System.Console.CmdArgs.Explicit as C-import Test.HUnit--import Hledger-import Prelude hiding (putStrLn)-import Hledger.Utils.UTF8IOCompat (putStrLn)-import Hledger.Cli.CliOptions----- | Command line options for this command.-accountsmode = (defCommandMode $ ["accounts"] ++ aliases) {-  modeHelp = "show account names" `withAliases` aliases- ,modeHelpSuffix = [-    "This command lists the accounts referenced by matched postings (and in tree mode, their parents as well). The accounts can be depth-clipped (--depth N) or have their leading parts trimmed (--drop N)."-   ]- ,modeGroupFlags = C.Group {-     groupUnnamed = [-      flagNone ["tree"] (\opts -> setboolopt "tree" opts) "show short account names, as a tree"-     ,flagNone ["flat"] (\opts -> setboolopt "flat" opts) "show full account names, as a list (default)"-     ,flagReq  ["drop"] (\s opts -> Right $ setopt "drop" s opts) "N" "flat mode: omit N leading account name parts"-     ]-    ,groupHidden = []-    ,groupNamed = [generalflagsgroup1]-    }- }-  where aliases = []---- | The accounts command.-accounts :: CliOpts -> Journal -> IO ()-accounts CliOpts{reportopts_=ropts} j = do-  d <- getCurrentDay-  let q = queryFromOpts d ropts-      nodepthq = dbg1 "nodepthq" $ filterQuery (not . queryIsDepth) q-      depth    = dbg1 "depth" $ queryDepth $ filterQuery queryIsDepth q-      ps = dbg1 "ps" $ journalPostings $ filterJournalPostings nodepthq j-      as = dbg1 "as" $ nub $ filter (not . T.null) $ map (clipAccountName depth) $ sort $ map paccount ps-      as' | tree_ ropts = expandAccountNames as-          | otherwise   = as-      render a | tree_ ropts = T.replicate (2 * (accountNameLevel a - 1)) " " <> accountLeafName a-               | otherwise   = maybeAccountNameDrop ropts a-  mapM_ (putStrLn . T.unpack . render) as'--tests_Hledger_Cli_Accounts = TestList []

@@ -1,449 +0,0 @@-{-|-A history-aware add command to help with data entry.-|-}--{-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-unused-do-bind #-}-{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts, OverloadedStrings #-}--module Hledger.Cli.Add-where--import Prelude ()-import Prelude.Compat-import Control.Exception as E-import Control.Monad-import Control.Monad.Trans.Class-import Control.Monad.State.Strict (evalState, evalStateT)-import Control.Monad.Trans (liftIO)-import Data.Char (toUpper, toLower)-import Data.Functor.Identity (Identity(..))-import Data.List.Compat-import qualified Data.Set as S-import Data.Maybe-import Data.Text (Text)-import qualified Data.Text as T-import Data.Time.Calendar (Day)-import Data.Typeable (Typeable)-import Safe (headDef, headMay)-import System.Console.CmdArgs.Explicit-import System.Console.Haskeline (runInputT, defaultSettings, setComplete)-import System.Console.Haskeline.Completion-import System.Console.Wizard-import System.Console.Wizard.Haskeline-import System.IO ( stderr, hPutStr, hPutStrLn )-import Text.Megaparsec.Compat-import Text.Printf--import Hledger-import Hledger.Cli.CliOptions-import Hledger.Cli.Register (postingsReportAsText)---addmode = (defCommandMode ["add"]) {-  modeHelp = "prompt for transactions and add them to the journal"- ,modeHelpSuffix = ["Defaults come from previous similar transactions; use query patterns to restrict these."]- ,modeGroupFlags = Group {-     groupUnnamed = [-      flagNone ["no-new-accounts"]  (\opts -> setboolopt "no-new-accounts" opts) "don't allow creating new accounts"-     ]-    ,groupHidden = []-    ,groupNamed = [generalflagsgroup2]-    }- }---- | State used while entering transactions.-data EntryState = EntryState {-   esOpts               :: CliOpts           -- ^ command line options-  ,esArgs               :: [String]          -- ^ command line arguments remaining to be used as defaults-  ,esToday              :: Day               -- ^ today's date-  ,esDefDate            :: Day               -- ^ the default date for next transaction-  ,esJournal            :: Journal           -- ^ the journal we are adding to-  ,esSimilarTransaction :: Maybe Transaction -- ^ the most similar historical txn-  ,esPostings           :: [Posting]         -- ^ postings entered so far in the current txn-  } deriving (Show,Typeable)--defEntryState = EntryState {-   esOpts               = defcliopts-  ,esArgs               = []-  ,esToday              = nulldate-  ,esDefDate            = nulldate-  ,esJournal            = nulljournal-  ,esSimilarTransaction = Nothing-  ,esPostings           = []-}--data RestartTransactionException = RestartTransactionException deriving (Typeable,Show)-instance Exception RestartTransactionException---- data ShowHelpException = ShowHelpException deriving (Typeable,Show)--- instance Exception ShowHelpException---- | Read multiple transactions from the console, prompting for each--- field, and append them to the journal file.  If the journal came--- from stdin, this command has no effect.-add :: CliOpts -> Journal -> IO ()-add opts j-    | journalFilePath j == "-" = return ()-    | otherwise = do-        hPrintf stderr "Adding transactions to journal file %s\n" (journalFilePath j)-        showHelp-        today <- getCurrentDay-        let es = defEntryState{esOpts=opts-                              ,esArgs=map (T.unpack . stripquotes . T.pack) $ listofstringopt "args" $ rawopts_ opts-                              ,esToday=today-                              ,esDefDate=today-                              ,esJournal=j-                              }-        getAndAddTransactions es `E.catch` (\(_::UnexpectedEOF) -> putStr "")--showHelp = hPutStr stderr $ unlines [-     "Any command line arguments will be used as defaults."-    ,"Use tab key to complete, readline keys to edit, enter to accept defaults."-    ,"An optional (CODE) may follow transaction dates."-    ,"An optional ; COMMENT may follow descriptions or amounts."-    ,"If you make a mistake, enter < at any prompt to restart the transaction."-    ,"To end a transaction, enter . when prompted."-    ,"To quit, enter . at a date prompt or press control-d or control-c."-    ]---- | Loop reading transactions from the console, prompting, validating--- and appending each one to the journal file, until end of input or--- ctrl-c (then raise an EOF exception).  If provided, command-line--- arguments are used as defaults; otherwise defaults come from the--- most similar recent transaction in the journal.-getAndAddTransactions :: EntryState -> IO ()-getAndAddTransactions es@EntryState{..} = (do-  mt <- runInputT (setComplete noCompletion defaultSettings) (run $ haskeline $ confirmedTransactionWizard es)-  case mt of-    Nothing -> fail "urk ?"-    Just t -> do-      j <- if debug_ esOpts > 0-           then do hPrintf stderr "Skipping journal add due to debug mode.\n"-                   return esJournal-           else do j' <- journalAddTransaction esJournal esOpts t-                   hPrintf stderr "Saved.\n"-                   return j'-      hPrintf stderr "Starting the next transaction (. or ctrl-D/ctrl-C to quit)\n"-      getAndAddTransactions es{esJournal=j, esDefDate=tdate t}-  )-  `E.catch` (\(_::RestartTransactionException) ->-                 hPrintf stderr "Restarting this transaction.\n" >> getAndAddTransactions es)---- confirmedTransactionWizard :: (ArbitraryIO :<: b, OutputLn :<: b, Line :<: b) => EntryState -> Wizard b Transaction--- confirmedTransactionWizard :: EntryState -> Wizard Haskeline Transaction-confirmedTransactionWizard es@EntryState{..} = do-  t <- transactionWizard es-  -- liftIO $ hPrintf stderr {- "Transaction entered:\n%s" -} (show t)-  output $ show t-  y <- let def = "y" in-       retryMsg "Please enter y or n." $-        parser ((fmap ('y' ==)) . headMay . map toLower . strip) $-        defaultTo' def $ nonEmpty $-        maybeRestartTransaction $-        line $ green $ printf "Save this transaction to the journal ?%s: " (showDefault def)-  if y then return t else throw RestartTransactionException--transactionWizard es@EntryState{..} = do-  (date,code)    <- dateAndCodeWizard es-  let es1@EntryState{esArgs=args1} = es{esArgs=drop 1 esArgs, esDefDate=date}-  (desc,comment) <- descriptionAndCommentWizard es1-  let mbaset = similarTransaction es1 desc-  when (isJust mbaset) $ liftIO $ hPrintf stderr "Using this similar transaction for defaults:\n%s" (show $ fromJust mbaset)-  let es2 = es1{esArgs=drop 1 args1, esSimilarTransaction=mbaset}-      balancedPostingsWizard = do-        ps <- postingsWizard es2{esPostings=[]}-        let t = nulltransaction{tdate=date-                               ,tstatus=Unmarked-                               ,tcode=code-                               ,tdescription=desc-                               ,tcomment=comment-                               ,tpostings=ps-                               }-        case balanceTransaction Nothing t of -- imprecise balancing (?)-          Right t' -> return t'-          Left err -> liftIO (hPutStrLn stderr $ "\n" ++ (capitalize err) ++ "please re-enter.") >> balancedPostingsWizard-  balancedPostingsWizard---- Identify the closest recent match for this description in past transactions.-similarTransaction :: EntryState -> Text -> Maybe Transaction-similarTransaction EntryState{..} desc =-  let q = queryFromOptsOnly esToday $ reportopts_ esOpts-      historymatches = transactionsSimilarTo esJournal q desc-      bestmatch | null historymatches = Nothing-                | otherwise           = Just $ snd $ head historymatches-  in bestmatch--dateAndCodeWizard EntryState{..} = do-  let def = headDef (showDate esDefDate) esArgs-  retryMsg "A valid hledger smart date is required. Eg: 2014/2/14, 14, yesterday." $-   parser (parseSmartDateAndCode esToday) $-   withCompletion (dateCompleter def) $-   defaultTo' def $ nonEmpty $-   maybeExit $-   maybeRestartTransaction $-   -- maybeShowHelp $-   line $ green $ printf "Date%s: " (showDefault def)-    where-      parseSmartDateAndCode refdate s = either (const Nothing) (\(d,c) -> return (fixSmartDate refdate d, c)) edc-          where-            edc = runParser (dateandcodep <* eof) "" $ T.pack $ lowercase s-            dateandcodep :: SimpleTextParser (SmartDate, Text)-            dateandcodep = do-                d <- smartdate-                c <- optional codep-                many spacenonewline-                eof-                return (d, T.pack $ fromMaybe "" c)-      -- defday = fixSmartDate today $ fromparse $ (parse smartdate "" . lowercase) defdate-      -- datestr = showDate $ fixSmartDate defday smtdate--descriptionAndCommentWizard EntryState{..} = do-  let def = headDef "" esArgs-  s <- withCompletion (descriptionCompleter esJournal def) $-       defaultTo' def $ nonEmpty $-       maybeRestartTransaction $-       line $ green $ printf "Description%s: " (showDefault def)-  let (desc,comment) = (T.pack $ strip a, T.pack $ strip $ dropWhile (==';') b) where (a,b) = break (==';') s-  return (desc, comment)--postingsWizard es@EntryState{..} = do-  mp <- postingWizard es-  case mp of Nothing -> return esPostings-             Just p  -> postingsWizard es{esArgs=drop 2 esArgs, esPostings=esPostings++[p]}--postingWizard es@EntryState{..} = do-  acct <- accountWizard es-  if acct `elem` [".",""]-  then case (esPostings, postingsBalanced esPostings) of-         ([],_)    -> liftIO (hPutStrLn stderr "Please enter some postings first.") >> postingWizard es-         (_,False) -> liftIO (hPutStrLn stderr "Please enter more postings to balance the transaction.") >> postingWizard es-         (_,True)  -> return Nothing -- no more postings, end of transaction-  else do-    let es1 = es{esArgs=drop 1 esArgs}-    (amt,comment)  <- amountAndCommentWizard es1-    return $ Just nullposting{paccount=T.pack $ stripbrackets acct-                             ,pamount=Mixed [amt]-                             ,pcomment=comment-                             ,ptype=accountNamePostingType $ T.pack acct-                             }--postingsBalanced :: [Posting] -> Bool-postingsBalanced ps = isRight $ balanceTransaction Nothing nulltransaction{tpostings=ps}--accountWizard EntryState{..} = do-  let pnum = length esPostings + 1-      historicalp = maybe Nothing (Just . (!! (pnum-1)) . (++ (repeat nullposting)) . tpostings) esSimilarTransaction-      historicalacct = case historicalp of Just p  -> showAccountName Nothing (ptype p) (paccount p)-                                           Nothing -> ""-      def = headDef historicalacct esArgs-      endmsg | canfinish && null def = " (or . or enter to finish this transaction)"-             | canfinish             = " (or . to finish this transaction)"-             | otherwise             = ""-  retryMsg "A valid hledger account name is required. Eg: assets:cash, expenses:food:eating out." $-   parser (parseAccountOrDotOrNull def canfinish) $-   withCompletion (accountCompleter esJournal def) $-   defaultTo' def $ -- nonEmpty $-   maybeRestartTransaction $-   line $ green $ printf "Account %d%s%s: " pnum (endmsg::String) (showDefault def)-    where-      canfinish = not (null esPostings) && postingsBalanced esPostings-      parseAccountOrDotOrNull :: String -> Bool -> String -> Maybe String-      parseAccountOrDotOrNull _  _ "."       = dbg1 $ Just "." -- . always signals end of txn-      parseAccountOrDotOrNull "" True ""     = dbg1 $ Just ""  -- when there's no default and txn is balanced, "" also signals end of txn-      parseAccountOrDotOrNull def@(_:_) _ "" = dbg1 $ Just def -- when there's a default, "" means use that-      parseAccountOrDotOrNull _ _ s          = dbg1 $ fmap T.unpack $-        either (const Nothing) validateAccount $-          flip evalState esJournal $ runParserT (accountnamep <* eof) "" (T.pack s) -- otherwise, try to parse the input as an accountname-        where-          validateAccount :: Text -> Maybe Text-          validateAccount t | no_new_accounts_ esOpts && not (t `elem` journalAccountNames esJournal) = Nothing-                            | otherwise = Just t-      dbg1 = id -- strace--amountAndCommentWizard EntryState{..} = do-  let pnum = length esPostings + 1-      (mhistoricalp,followedhistoricalsofar) =-          case esSimilarTransaction of-            Nothing                        -> (Nothing,False)-            Just Transaction{tpostings=ps} -> (if length ps >= pnum then Just (ps !! (pnum-1)) else Nothing-                                              ,all (\(a,b) -> pamount a == pamount b) $ zip esPostings ps)-      def = case (esArgs, mhistoricalp, followedhistoricalsofar) of-              (d:_,_,_)                                             -> d-              (_,Just hp,True)                                      -> showamt $ pamount hp-              _  | pnum > 1 && not (isZeroMixedAmount balancingamt) -> showamt balancingamtfirstcommodity-              _                                                     -> ""-  retryMsg "A valid hledger amount is required. Eg: 1, $2, 3 EUR, \"4 red apples\"." $-   parser parseAmountAndComment $-   withCompletion (amountCompleter def) $-   defaultTo' def $ nonEmpty $-   maybeRestartTransaction $-   line $ green $ printf "Amount  %d%s: " pnum (showDefault def)-    where-      parseAmountAndComment s = either (const Nothing) Just $-                                runParser-                                  (evalStateT (amountandcommentp <* eof) nodefcommodityj)-                                  ""-                                  (T.pack s)-      nodefcommodityj = esJournal{jparsedefaultcommodity=Nothing}-      amountandcommentp :: JournalParser Identity (Amount, Text)-      amountandcommentp = do-        a <- amountp-        lift (many spacenonewline)-        c <- T.pack <$> fromMaybe "" `fmap` optional (char ';' >> many anyChar)-        -- eof-        return (a,c)-      balancingamt = negate $ sum $ map pamount realps where realps = filter isReal esPostings-      balancingamtfirstcommodity = Mixed $ take 1 $ amounts balancingamt-      showamt =-        showMixedAmountWithPrecision-                  -- what should this be ?-                  -- 1 maxprecision (show all decimal places or none) ?-                  -- 2 maxprecisionwithpoint (show all decimal places or .0 - avoids some but not all confusion with thousands separators) ?-                  -- 3 canonical precision for this commodity in the journal ?-                  -- 4 maximum precision entered so far in this transaction ?-                  -- 5 3 or 4, whichever would show the most decimal places ?-                  -- I think 1 or 4, whichever would show the most decimal places-                  maxprecisionwithpoint-  ---  -- let -- (amt,comment) = (strip a, strip $ dropWhile (==';') b) where (a,b) = break (==';') amtcmt-      -- a           = fromparse $ runParser (amountp <|> return missingamt) (jparsestate esJournal) "" amt-  --     awithoutjps = fromparse $ runParser (amountp <|> return missingamt) mempty              "" amt-  --     defamtaccepted = Just (showAmount a) == mdefamt-  --     es2 = if defamtaccepted then es1 else es1{esHistoricalPostings=Nothing}-  --     mdefaultcommodityapplied = if acommodity a == acommodity awithoutjps then Nothing else Just $ acommodity a-  -- when (isJust 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)---- maybeShowHelp :: Wizard Haskeline String -> Wizard Haskeline String--- maybeShowHelp wizard = maybe (liftIO showHelp >> wizard) return $---                        parser (\s -> if s=="?" then Nothing else Just s) wizard---- Completion helpers--dateCompleter :: String -> CompletionFunc IO-dateCompleter = completer ["today","tomorrow","yesterday"]--descriptionCompleter :: Journal -> String -> CompletionFunc IO-descriptionCompleter j = completer (map T.unpack $ journalDescriptions j)--accountCompleter :: Journal -> String -> CompletionFunc IO-accountCompleter j = completer (map T.unpack $ journalAccountNamesUsed j)--amountCompleter :: String -> CompletionFunc IO-amountCompleter = completer []---- | Generate a haskeline completion function from the given--- completions and default, that case insensitively completes with--- prefix matches, or infix matches above a minimum length, or--- completes the null string with the default.-completer :: [String] -> String -> CompletionFunc IO-completer completions def = completeWord Nothing "" completionsFor-    where-      simpleCompletion' s = (simpleCompletion s){isFinished=False}-      completionsFor "" = return [simpleCompletion' def]-      completionsFor i  = return (map simpleCompletion' ciprefixmatches)-          where-            ciprefixmatches = [c | c <- completions, i `isPrefixOf` c]-            -- mixed-case completions require haskeline > 0.7.1.2-            -- ciprefixmatches = [c | c <- completions, lowercase i `isPrefixOf` lowercase c]-------------------------------------------------------------------------------------- utilities--defaultTo' = flip defaultTo--withCompletion f = withSettings (setComplete f defaultSettings)--green s = "\ESC[1;32m\STX"++s++"\ESC[0m\STX"--showDefault "" = ""-showDefault s = " [" ++ s ++ "]"---- | Append this transaction to the journal's file and transaction list.-journalAddTransaction :: Journal -> CliOpts -> Transaction -> IO Journal-journalAddTransaction j@Journal{jtxns=ts} opts t = do-  let f = journalFilePath j-  appendToJournalFileOrStdout f $ showTransactionUnelided t-    -- unelided shows all amounts explicitly, in case there's a price, cf #283-  when (debug_ opts > 0) $ do-    putStrLn $ printf "\nAdded transaction to %s:" f-    putStrLn =<< registerFromString (show t)-  return j{jtxns=ts++[t]}---- | Append a string, typically one or more transactions, to a journal--- file, or if the file is "-", dump it to stdout.  Tries to avoid--- excess whitespace.-appendToJournalFileOrStdout :: FilePath -> String -> IO ()-appendToJournalFileOrStdout f s-  | f == "-"  = putStr s'-  | otherwise = appendFile f s'-  where s' = "\n" ++ ensureOneNewlineTerminated s---- | Replace a string's 0 or more terminating newlines with exactly one.-ensureOneNewlineTerminated :: String -> String-ensureOneNewlineTerminated = (++"\n") . reverse . dropWhile (=='\n') . reverse---- | Convert a string of journal data into a register report.-registerFromString :: String -> IO String-registerFromString s = do-  d <- getCurrentDay-  j <- readJournal' $ T.pack s-  return $ postingsReportAsText opts $ postingsReport ropts (queryFromOpts d ropts) j-      where-        ropts = defreportopts{empty_=True}-        opts = defcliopts{reportopts_=ropts}--capitalize :: String -> String-capitalize "" = ""-capitalize (c:cs) = toUpper c : cs---- | Find the most similar and recent transactions matching the given--- transaction description and report query.  Transactions are listed--- with their "relevancy" score, most relevant first.-transactionsSimilarTo :: Journal -> Query -> Text -> [(Double,Transaction)]-transactionsSimilarTo j q desc =-    sortBy compareRelevanceAndRecency-               $ filter ((> threshold).fst)-               [(compareDescriptions desc $ tdescription t, t) | t <- ts]-    where-      compareRelevanceAndRecency (n1,t1) (n2,t2) = compare (n2,tdate t2) (n1,tdate t1)-      ts = filter (q `matchesTransaction`) $ jtxns j-      threshold = 0---- | Return a similarity measure, from 0 to 1, for two transaction--- descriptions.  This is like compareStrings, but first strips out--- any numbers, to improve accuracy eg when there are bank transaction--- ids from imported data.-compareDescriptions :: Text -> Text -> Double-compareDescriptions s t = compareStrings s' t'-    where s' = simplify $ T.unpack s-          t' = simplify $ T.unpack t-          simplify = filter (not . (`elem` ("0123456789" :: String)))---- | Return a similarity measure, from 0 to 1, for two strings.  This--- was based on Simon White's string similarity algorithm--- (http://www.catalysoft.com/articles/StrikeAMatch.html), later found--- to be https://en.wikipedia.org/wiki/S%C3%B8rensen%E2%80%93Dice_coefficient,--- modified to handle short strings better.--- Todo: check out http://nlp.fi.muni.cz/raslan/2008/raslan08.pdf#page=14 .-compareStrings :: String -> String -> Double-compareStrings "" "" = 1-compareStrings (_:[]) "" = 0-compareStrings "" (_:[]) = 0-compareStrings (a:[]) (b:[]) = if toUpper a == toUpper b then 1 else 0-compareStrings s1 s2 = 2 * commonpairs / totalpairs-    where-      pairs1      = S.fromList $ wordLetterPairs $ uppercase s1-      pairs2      = S.fromList $ wordLetterPairs $ uppercase s2-      commonpairs = fromIntegral $ S.size $ S.intersection pairs1 pairs2-      totalpairs  = fromIntegral $ S.size pairs1 + S.size pairs2--wordLetterPairs = concatMap letterPairs . words--letterPairs (a:b:rest) = [a,b] : letterPairs (b:rest)-letterPairs _ = []

@@ -1,545 +0,0 @@-{-|--A ledger-compatible @balance@ command, with additional support for-multi-column reports.--Here is a description/specification for the balance command.  See also-"Hledger.Reports" -> \"Balance reports\".---/Basic balance report/--With no report interval (@--monthly@ etc.), hledger's balance-command emulates ledger's, showing accounts indented according to-hierarchy, along with their total amount posted (including subaccounts).--Here's an example. With @examples/sample.journal@, which defines the following account tree:--@- assets-   bank-     checking-     saving-   cash- expenses-   food-   supplies- income-   gifts-   salary- liabilities-   debts-@--the basic @balance@ command gives this output:--@- $ hledger -f sample.journal balance-                 $-1  assets-                  $1    bank:saving-                 $-2    cash-                  $2  expenses-                  $1    food-                  $1    supplies-                 $-2  income-                 $-1    gifts-                 $-1    salary-                  $1  liabilities:debts----------------------                   0-@--Subaccounts are displayed indented below their parent. Only the account leaf name (the final part) is shown.-(With @--flat@, account names are shown in full and unindented.)--Each account's \"balance\" is the sum of postings in that account and any subaccounts during the report period.-When the report period includes all transactions, this is equivalent to the account's current balance.--The overall total of the highest-level displayed accounts is shown below the line.-(The @--no-total/-N@ flag prevents this.)--/Eliding and omitting/--Accounts which have a zero balance, and no non-zero subaccount-balances, are normally omitted from the report.-(The @--empty/-E@ flag forces such accounts to be displayed.)-Eg, above @checking@ is omitted because it has a zero balance and no subaccounts.--Accounts which have a single subaccount also being displayed, with the same balance,-are normally elided into the subaccount's line.-(The @--no-elide@ flag prevents this.)-Eg, above @bank@ is elided to @bank:saving@ because it has only a-single displayed subaccount (@saving@) and their balance is the same-($1). Similarly, @liabilities@ is elided to @liabilities:debts@.--/Date limiting/--The default report period is that of the whole journal, including all-known transactions. The @--begin\/-b@, @--end\/-e@, @--period\/-p@-options or @date:@/@date2:@ patterns can be used to report only-on transactions before and/or after specified dates.--/Depth limiting/--The @--depth@ option can be used to limit the depth of the balance report.-Eg, to see just the top level accounts (still including their subaccount balances):--@-$ hledger -f sample.journal balance --depth 1-                 $-1  assets-                  $2  expenses-                 $-2  income-                  $1  liabilities----------------------                   0-@--/Account limiting/--With one or more account pattern arguments, the report is restricted-to accounts whose name matches one of the patterns, plus their parents-and subaccounts. Eg, adding the pattern @o@ to the first example gives:--@- $ hledger -f sample.journal balance o-                  $1  expenses:food-                 $-2  income-                 $-1    gifts-                 $-1    salary----------------------                 $-1-@--* The @o@ pattern matched @food@ and @income@, so they are shown.--* @food@'s parent (@expenses@) is shown even though the pattern didn't-  match it, to clarify the hierarchy. The usual eliding rules cause it to be elided here.--* @income@'s subaccounts are also shown.--/Multi-column balance report/--hledger's balance command will show multiple columns when a reporting-interval is specified (eg with @--monthly@), one column for each sub-period.--There are three kinds of multi-column balance report, indicated by the heading:--* A \"period balance\" (or \"flow\") report (the default) shows the change of account-  balance in each period, which is equivalent to the sum of postings in each-  period. Here, checking's balance increased by 10 in Feb:--  > Change of balance (flow):-  >-  >                  Jan   Feb   Mar-  > assets:checking   20    10    -5--* A \"cumulative balance\" report (with @--cumulative@) shows the accumulated ending balance-  across periods, starting from zero at the report's start date.-  Here, 30 is the sum of checking postings during Jan and Feb:--  > Ending balance (cumulative):-  >-  >                  Jan   Feb   Mar-  > assets:checking   20    30    25--* A \"historical balance\" report (with @--historical/-H@) also shows ending balances,-  but it includes the starting balance from any postings before the report start date.-  Here, 130 is the balance from all checking postings at the end of Feb, including-  pre-Jan postings which created a starting balance of 100:--  > Ending balance (historical):-  >-  >                  Jan   Feb   Mar-  > assets:checking  120   130   125--/Eliding and omitting, 2/--Here's a (imperfect?) specification for the eliding/omitting behaviour:--* Each account is normally displayed on its own line.--* An account less deep than the report's max depth, with just one-interesting subaccount, and the same balance as the subaccount, is-non-interesting, and prefixed to the subaccount's line, unless-@--no-elide@ is in effect.--* An account with a zero inclusive balance and less than two interesting-subaccounts is not displayed at all, unless @--empty@ is in effect.--* Multi-column balance reports show full account names with no eliding-  (like @--flat@). Accounts (and periods) are omitted as described below.--/Which accounts to show in balance reports/--By default:--* single-column: accounts with non-zero balance in report period.-                 (With @--flat@: accounts with non-zero balance and postings.)--* periodic:      accounts with postings and non-zero period balance in any period--* cumulative:    accounts with non-zero cumulative balance in any period--* historical:    accounts with non-zero historical balance in any period--With @-E/--empty@:--* single-column: accounts with postings in report period--* periodic:      accounts with postings in report period--* cumulative:    accounts with postings in report period--* historical:    accounts with non-zero starting balance +-                 accounts with postings in report period--/Which periods (columns) to show in balance reports/--An empty period/column is one where no report account has any postings.-A zero period/column is one where no report account has a non-zero period balance.--Currently,--by default:--* single-column: N/A--* periodic:      all periods within the overall report period,-                 except for leading and trailing empty periods--* cumulative:    all periods within the overall report period,-                 except for leading and trailing empty periods--* historical:    all periods within the overall report period,-                 except for leading and trailing empty periods--With @-E/--empty@:--* single-column: N/A--* periodic:      all periods within the overall report period--* cumulative:    all periods within the overall report period--* historical:    all periods within the overall report period--/What to show in empty cells/--An empty periodic balance report cell is one which has no corresponding postings.-An empty cumulative/historical balance report cell is one which has no correponding-or prior postings, ie the account doesn't exist yet.-Currently, empty cells show 0.---}--{-# LANGUAGE OverloadedStrings #-}--module Hledger.Cli.Balance (-  balancemode- ,balance- ,balanceReportAsText- ,balanceReportItemAsText- ,multiBalanceReportAsText- ,renderBalanceReportTable- ,balanceReportAsTable- ,tests_Hledger_Cli_Balance-) where--import Data.List (intercalate)-import Data.Maybe--- import Data.Monoid-import qualified Data.Text as T-import System.Console.CmdArgs.Explicit as C-import Text.CSV-import Test.HUnit-import Text.Printf (printf)-import Text.Tabular as T-import Text.Tabular.AsciiWide--import Hledger-import Hledger.Cli.CliOptions-import Hledger.Cli.Utils----- | Command line options for this command.-balancemode = (defCommandMode $ ["balance"] ++ aliases) { -- also accept but don't show the common bal alias-  modeHelp = "show accounts and balances" `withAliases` aliases- ,modeGroupFlags = C.Group {-     groupUnnamed = [-      flagNone ["change"] (\opts -> setboolopt "change" opts)-        "show balance change in each period (default)"-     ,flagNone ["cumulative"] (\opts -> setboolopt "cumulative" opts)-        "show balance change accumulated across periods (in multicolumn reports)"-     ,flagNone ["historical","H"] (\opts -> setboolopt "historical" opts)-        "show historical ending balance in each period (includes postings before report start date)\n "-     ,flagNone ["tree"] (\opts -> setboolopt "tree" opts) "show accounts as a tree; amounts include subaccounts (default in simple reports)"-     ,flagNone ["flat"] (\opts -> setboolopt "flat" opts) "show accounts as a list; amounts exclude subaccounts except when account is depth-clipped (default in multicolumn reports)\n "-     ,flagNone ["average","A"] (\opts -> setboolopt "average" opts) "show a row average column (in multicolumn reports)"-     ,flagNone ["row-total","T"] (\opts -> setboolopt "row-total" opts) "show a row total column (in multicolumn reports)"-     ,flagNone ["no-total","N"] (\opts -> setboolopt "no-total" opts) "omit the final total row"-     ,flagReq  ["drop"] (\s opts -> Right $ setopt "drop" s opts) "N" "omit N leading account name parts (in flat mode)"-     ,flagNone ["no-elide"] (\opts -> setboolopt "no-elide" opts) "don't squash boring parent accounts (in tree mode)"-     ,flagReq  ["format"] (\s opts -> Right $ setopt "format" s opts) "FORMATSTR" "use this custom line format (in simple reports)"-     ,flagNone ["pretty-tables"] (\opts -> setboolopt "pretty-tables" opts) "use unicode when displaying tables"-     ]-     ++ outputflags-    ,groupHidden = []-    ,groupNamed = [generalflagsgroup1]-    }- }-  where aliases = ["bal"]---- | The balance command, prints a balance report.-balance :: CliOpts -> Journal -> IO ()-balance opts@CliOpts{reportopts_=ropts} j = do-  d <- getCurrentDay-  case lineFormatFromOpts ropts of-    Left err -> error' $ unlines [err]-    Right _ -> do-      let format   = outputFormatFromOpts opts-          interval = interval_ ropts-      -- shenanigans: use single/multiBalanceReport when we must,-      -- ie when there's a report interval, or --historical or -- cumulative.-      -- Otherwise prefer the older balanceReport since it can elide boring parents.-      case interval of-        NoInterval -> do-          let report-                -- For --historical/--cumulative, we must use multiBalanceReport.-                -- (This forces --no-elide.)-                | balancetype_ ropts `elem` [HistoricalBalance, CumulativeChange]-                  = let ropts' | flat_ ropts = ropts-                               | otherwise   = ropts{accountlistmode_=ALTree}-                    in singleBalanceReport ropts' (queryFromOpts d ropts) j-                | otherwise = balanceReport ropts (queryFromOpts d ropts) j-              render = case format of-                "csv" -> \ropts r -> (++ "\n") $ printCSV $ balanceReportAsCsv ropts r-                _     -> balanceReportAsText-          writeOutput opts $ render ropts report-        _ -> do-          let report = multiBalanceReport ropts (queryFromOpts d ropts) j-              render = case format of-                "csv" -> \ropts r -> (++ "\n") $ printCSV $ multiBalanceReportAsCsv ropts r-                _     -> multiBalanceReportAsText-          writeOutput opts $ render ropts report---- single-column balance reports---- | Find the best commodity to convert to when asked to show the--- market value of this commodity on the given date. That is, the one--- in which it has most recently been market-priced, ie the commodity--- mentioned in the most recent applicable historical price directive--- before this date.--- defaultValuationCommodity :: Journal -> Day -> CommoditySymbol -> Maybe CommoditySymbol--- defaultValuationCommodity j d c = mpamount <$> commodityValue j d c---- | Render a single-column balance report as CSV.-balanceReportAsCsv :: ReportOpts -> BalanceReport -> CSV-balanceReportAsCsv opts (items, total) =-  ["account","balance"] :-  [[T.unpack a, showMixedAmountOneLineWithoutPrice b] | (a, _, _, b) <- items]-  ++-  if no_total_ opts-  then []-  else [["total", showMixedAmountOneLineWithoutPrice total]]---- | Render a single-column balance report as plain text.-balanceReportAsText :: ReportOpts -> BalanceReport -> String-balanceReportAsText opts ((items, total)) = unlines $ concat lines ++ t-  where-      fmt = lineFormatFromOpts opts-      lines = case fmt of-                Right fmt -> map (balanceReportItemAsText opts fmt) items-                Left err  -> [[err]]-      t = if no_total_ opts-           then []-           else-             case fmt of-               Right fmt ->-                let-                  -- abuse renderBalanceReportItem to render the total with similar format-                  acctcolwidth = maximum' [T.length fullname | (fullname, _, _, _) <- items]-                  totallines = map rstrip $ renderBalanceReportItem opts fmt (T.replicate (acctcolwidth+1) " ", 0, total)-                  -- with a custom format, extend the line to the full report width;-                  -- otherwise show the usual 20-char line for compatibility-                  overlinewidth | isJust (format_ opts) = maximum' $ map length $ concat lines-                                | otherwise             = defaultTotalFieldWidth-                  overline   = replicate overlinewidth '-'-                in overline : totallines-               Left _ -> []--tests_balanceReportAsText = [-  "balanceReportAsText" ~: do-  -- "unicode in balance layout" ~: do-    j <- readJournal'-      "2009/01/01 * медвежья шкура\n  расходы:покупки  100\n  актив:наличные\n"-    let opts = defreportopts-    balanceReportAsText opts (balanceReport opts (queryFromOpts (parsedate "2008/11/26") opts) j) `is`-      unlines-      ["                -100  актив:наличные"-      ,"                 100  расходы:покупки"-      ,"--------------------"-      ,"                   0"-      ]- ]--{--:r-This implementation turned out to be a bit convoluted but implements the following algorithm for formatting:--- If there is a single amount, print it with the account name directly:-- Otherwise, only print the account name on the last line.--    a         USD 1   ; Account 'a' has a single amount-              EUR -1-    b         USD -1  ; Account 'b' has two amounts. The account name is printed on the last line.--}--- | Render one balance report line item as plain text suitable for console output (or--- whatever string format is specified). Note, prices will not be rendered, and--- differently-priced quantities of the same commodity will appear merged.--- The output will be one or more lines depending on the format and number of commodities.-balanceReportItemAsText :: ReportOpts -> StringFormat -> BalanceReportItem -> [String]-balanceReportItemAsText opts fmt (_, accountName, depth, amt) =-  renderBalanceReportItem opts fmt (-    maybeAccountNameDrop opts accountName,-    depth,-    normaliseMixedAmountSquashPricesForDisplay amt-    )---- | Render a balance report item using the given StringFormat, generating one or more lines of text.-renderBalanceReportItem :: ReportOpts -> StringFormat -> (AccountName, Int, MixedAmount) -> [String]-renderBalanceReportItem opts fmt (acctname, depth, total) =-  lines $-  case fmt of-    OneLine comps       -> concatOneLine      $ render1 comps-    TopAligned comps    -> concatBottomPadded $ render comps-    BottomAligned comps -> concatTopPadded    $ render comps-  where-    render1 = map (renderComponent1 opts (acctname, depth, total))-    render  = map (renderComponent opts (acctname, depth, total))--defaultTotalFieldWidth = 20---- | Render one StringFormat component for a balance report item.-renderComponent :: ReportOpts -> (AccountName, Int, MixedAmount) -> StringFormatComponent -> String-renderComponent _ _ (FormatLiteral s) = s-renderComponent opts (acctname, depth, total) (FormatField ljust min max field) = case field of-  DepthSpacerField -> formatString ljust Nothing max $ replicate d ' '-                      where d = case min of-                                 Just m  -> depth * m-                                 Nothing -> depth-  AccountField     -> formatString ljust min max (T.unpack acctname)-  TotalField       -> fitStringMulti min max True False $ showamt total-    where-      showamt | color_ opts = cshowMixedAmountWithoutPrice-              | otherwise   = showMixedAmountWithoutPrice-  _                -> ""---- | Render one StringFormat component for a balance report item.--- This variant is for use with OneLine string formats; it squashes--- any multi-line rendered values onto one line, comma-and-space separated,--- while still complying with the width spec.-renderComponent1 :: ReportOpts -> (AccountName, Int, MixedAmount) -> StringFormatComponent -> String-renderComponent1 _ _ (FormatLiteral s) = s-renderComponent1 opts (acctname, depth, total) (FormatField ljust min max field) = case field of-  AccountField     -> formatString ljust min max ((intercalate ", " . lines) (indented (T.unpack acctname)))-                      where-                        -- better to indent the account name here rather than use a DepthField component-                        -- so that it complies with width spec. Uses a fixed indent step size.-                        indented = ((replicate (depth*2) ' ')++)-  TotalField       -> fitStringMulti min max True False $ ((intercalate ", " . map strip . lines) (showamt total))-    where-      showamt | color_ opts = cshowMixedAmountWithoutPrice-              | otherwise   = showMixedAmountWithoutPrice -  _                -> ""---- multi-column balance reports---- | Render a multi-column balance report as CSV.-multiBalanceReportAsCsv :: ReportOpts -> MultiBalanceReport -> CSV-multiBalanceReportAsCsv opts (MultiBalanceReport (colspans, items, (coltotals,tot,avg))) =-  ("account" : "short account" : "indent" : map showDateSpan colspans-   ++ (if row_total_ opts then ["total"] else [])-   ++ (if average_ opts then ["average"] else [])-  ) :-  [T.unpack a : T.unpack a' : show i :-   map showMixedAmountOneLineWithoutPrice-   (amts-    ++ (if row_total_ opts then [rowtot] else [])-    ++ (if average_ opts then [rowavg] else []))-  | (a,a',i, amts, rowtot, rowavg) <- items]-  ++-  if no_total_ opts-  then []-  else [["totals", "", ""]-        ++ map showMixedAmountOneLineWithoutPrice (-           coltotals-           ++ (if row_total_ opts then [tot] else [])-           ++ (if average_ opts then [avg] else [])-           )]---- | Render a multi-column balance report as plain text suitable for console output.-multiBalanceReportAsText :: ReportOpts -> MultiBalanceReport -> String-multiBalanceReportAsText opts r =-    printf "%s in %s:" typeStr (showDateSpan $ multiBalanceReportSpan r)-      ++ "\n"-      ++ renderBalanceReportTable opts tabl-  where-    tabl = balanceReportAsTable opts r-    typeStr :: String-    typeStr = case balancetype_ opts of-        PeriodChange -> "Balance changes"-        CumulativeChange -> "Ending balances (cumulative)"-        HistoricalBalance -> "Ending balances (historical)"---- | Given a table representing a multi-column balance report (for example,--- made using 'balanceReportAsTable'), render it in a format suitable for--- console output.-renderBalanceReportTable :: ReportOpts -> Table String String MixedAmount -> String-renderBalanceReportTable (ReportOpts { pretty_tables_ = pretty, color_=usecolor }) = unlines . trimborder . lines-                         . render pretty id (" " ++) showamt-                         . align-  where-    trimborder = ("":) . (++[""]) . drop 1 . init . map (drop 1 . init)-    align (Table l t d) = Table l' t d-      where-        acctswidth = maximum' $ map strWidth (headerContents l)-        l'         = padRightWide acctswidth <$> l-    showamt | usecolor  = cshowMixedAmountOneLineWithoutPrice-            | otherwise = showMixedAmountOneLineWithoutPrice---- | Build a 'Table' from a multi-column balance report.-balanceReportAsTable :: ReportOpts -> MultiBalanceReport -> Table String String MixedAmount-balanceReportAsTable opts (MultiBalanceReport (colspans, items, (coltotals,tot,avg))) =-   addtotalrow $ Table-     (T.Group NoLine $ map Header accts)-     (T.Group NoLine $ map Header colheadings)-     (map rowvals items)-  where-    mkDate = case balancetype_ opts of-       PeriodChange -> showDateSpan-       _            -> maybe "" (showDate . prevday) . spanEnd-    colheadings = map mkDate colspans-                  ++ (if row_total_ opts then ["  Total"] else [])-                  ++ (if average_ opts then ["Average"] else [])-    accts = map renderacct items-    renderacct (a,a',i,_,_,_)-      | tree_ opts = replicate ((i-1)*2) ' ' ++ T.unpack a'-      | otherwise  = T.unpack $ maybeAccountNameDrop opts a-    rowvals (_,_,_,as,rowtot,rowavg) = as-                             ++ (if row_total_ opts then [rowtot] else [])-                             ++ (if average_ opts then [rowavg] else [])-    addtotalrow | no_total_ opts = id-                | otherwise      = (+----+ (row "" $-                                    coltotals-                                    ++ (if row_total_ opts && not (null coltotals) then [tot] else [])-                                    ++ (if average_ opts && not (null coltotals)   then [avg] else [])-                                    ))---- | Figure out the overall date span of a multicolumn balance report.-multiBalanceReportSpan :: MultiBalanceReport -> DateSpan-multiBalanceReportSpan (MultiBalanceReport ([], _, _))       = DateSpan Nothing Nothing-multiBalanceReportSpan (MultiBalanceReport (colspans, _, _)) = DateSpan (spanStart $ head colspans) (spanEnd $ last colspans)---tests_Hledger_Cli_Balance = TestList-  tests_balanceReportAsText

@@ -1,47 +0,0 @@-{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}-{-|--The @balancesheet@ command prints a simple balance sheet.---}--module Hledger.Cli.Balancesheet (-  balancesheetmode- ,balancesheet- ,tests_Hledger_Cli_Balancesheet-) where--import Data.String.Here-import System.Console.CmdArgs.Explicit-import Test.HUnit--import Hledger-import Hledger.Cli.CliOptions-import Hledger.Cli.CompoundBalanceCommand--balancesheetSpec = CompoundBalanceCommandSpec {-  cbcname     = "balancesheet",-  cbcaliases  = ["bs"],-  cbchelp     = [here|-This command displays a simple balance sheet, showing historical ending-balances of asset and liability accounts (ignoring any report begin date). -It assumes that these accounts are under a top-level `asset` or `liability`-account (case insensitive, plural forms also  allowed).-  |],-  cbctitle    = "Balance Sheet",-  cbcqueries  = [ ("Assets"     , journalAssetAccountQuery),-                 ("Liabilities", journalLiabilityAccountQuery)-               ],-  cbctype     = HistoricalBalance-}--balancesheetmode :: Mode RawOpts-balancesheetmode = compoundBalanceCommandMode balancesheetSpec--balancesheet :: CliOpts -> Journal -> IO ()-balancesheet = compoundBalanceCommand balancesheetSpec--tests_Hledger_Cli_Balancesheet :: Test-tests_Hledger_Cli_Balancesheet = TestList- [- ]

@@ -1,48 +0,0 @@-{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}-{-|--The @cashflow@ command prints a simplified cashflow statement.  It just-shows the change in all "cash" accounts for the period (without the-traditional segmentation into operating, investing, and financing-cash flows.)---}--module Hledger.Cli.Cashflow (-  cashflowmode- ,cashflow- ,tests_Hledger_Cli_Cashflow-) where--import Data.String.Here-import System.Console.CmdArgs.Explicit-import Test.HUnit--import Hledger-import Hledger.Cli.CliOptions-import Hledger.Cli.CompoundBalanceCommand--cashflowSpec = CompoundBalanceCommandSpec {-  cbcname     = "cashflow",-  cbcaliases  = ["cf"],-  cbchelp     = [here|-This command displays a simple cashflow statement, showing changes-in "cash" accounts. It assumes that these accounts are under a top-level -`asset` account (case insensitive, plural forms also allowed) and do not -contain `receivable` or `A/R` in their name. -  |],-  cbctitle    = "Cashflow Statement",-  cbcqueries  = [("Cash flows", journalCashAccountQuery)],-  cbctype     = PeriodChange-}--cashflowmode :: Mode RawOpts-cashflowmode = compoundBalanceCommandMode cashflowSpec--cashflow :: CliOpts -> Journal -> IO ()-cashflow = compoundBalanceCommand cashflowSpec--tests_Hledger_Cli_Cashflow :: Test-tests_Hledger_Cli_Cashflow = TestList- [- ]

@@ -15,6 +15,8 @@   inputflags,   reportflags,   outputflags,+  outputFormatFlag,+  outputFileFlag,   generalflagsgroup1,   generalflagsgroup2,   generalflagsgroup3,@@ -25,6 +27,8 @@   argsFlag,   showModeUsage,   withAliases,+  likelyExecutablesInPath,+  hledgerExecutablesInPath,    -- * CLI options   CliOpts(..),@@ -47,6 +51,7 @@   outputFormatFromOpts,   defaultWidth,   widthFromOpts,+  replaceNumericFlags,   -- | For register:   registerWidthsFromOpts,   maybeAccountNameDrop,@@ -58,8 +63,12 @@   topicForMode,    -- * Tests-  tests_Hledger_Cli_CliOptions+  tests_Hledger_Cli_CliOptions, +--  -- * Convenience re-exports+--  module Data.String.Here,+--  module System.Console.CmdArgs.Explicit,+--  module Test.HUnit ) where @@ -67,6 +76,7 @@ import Prelude.Compat import qualified Control.Exception as C import Control.Monad (when)+import Data.Char import Data.Default #if !MIN_VERSION_base(4,8,0) import Data.Functor.Compat ((<$>))@@ -76,6 +86,7 @@ import Data.List.Split (splitOneOf) import Data.Ord import Data.Maybe+--import Data.String.Here -- import Data.Text (Text) import qualified Data.Text as T import Safe@@ -102,10 +113,7 @@ -- | Common help flags: --help, --debug, --version... helpflags :: [Flag RawOpts] helpflags = [-  flagNone ["h"]    (setboolopt "h")    "show general usage (or after CMD, command usage)"- ,flagNone ["help"] (setboolopt "help") "show this program's manual as plain text (or after an addon CMD, the add-on's manual)"- ,flagNone ["man"]  (setboolopt "man")  "show this program's manual with man"- ,flagNone ["info"] (setboolopt "info") "show this program's manual with info"+  flagNone ["help","h"] (setboolopt "help") "show general usage (or after CMD, command usage)"  -- ,flagNone ["browse-args"] (setboolopt "browse-args") "use a web UI to select options and build up a command line"  ,flagReq  ["debug"]    (\s opts -> Right $ setopt "debug" s opts) "[N]" "show debug output (levels 1-9, default: 1)"  ,flagNone ["version"] (setboolopt "version") "show version information"@@ -137,23 +145,22 @@  ,flagNone ["quarterly","Q"] (setboolopt "quarterly") "multiperiod/multicolumn report by quarter"  ,flagNone ["yearly","Y"]    (setboolopt "yearly") "multiperiod/multicolumn report by year"  ,flagReq  ["period","p"]    (\s opts -> Right $ setopt "period" s opts) "PERIODEXP" "set start date, end date, and/or report interval all at once (overrides the flags above)"- ,flagNone ["date2"]         (setboolopt "date2") "show, and make -b/-e/-p/date: match, secondary dates instead"+ ,flagNone ["date2"]         (setboolopt "date2") "match the secondary date instead (see command help for other effects)"   ,flagNone ["unmarked","U"]  (setboolopt "unmarked") "include only unmarked postings/txns (can combine with -P or -C)"  ,flagNone ["pending","P"]   (setboolopt "pending") "include only pending postings/txns"  ,flagNone ["cleared","C"]   (setboolopt "cleared") "include only cleared postings/txns"  ,flagNone ["real","R"]      (setboolopt "real") "include only non-virtual postings"- ,flagReq  ["depth"]         (\s opts -> Right $ setopt "depth" s opts) "N" "hide accounts/postings deeper than N"+ ,flagReq  ["depth"]         (\s opts -> Right $ setopt "depth" s opts) "NUM" "(or -NUM): hide accounts/postings deeper than this"  ,flagNone ["empty","E"]     (setboolopt "empty") "show items with zero amount, normally hidden"  ,flagNone ["cost","B"]      (setboolopt "cost") "convert amounts to their cost at transaction time (using the transaction price, if any)"  ,flagNone ["value","V"]     (setboolopt "value") "convert amounts to their market value on the report end date (using the most recent applicable market price, if any)"  ]  -- | Common output-related flags: --output-file, --output-format...-outputflags = [-   flagReq  ["output-format","O"] (\s opts -> Right $ setopt "output-format" s opts) "FMT" "select the output format. Supported formats:\ntxt, csv."-  ,flagReq  ["output-file","o"]   (\s opts -> Right $ setopt "output-file" s opts) "FILE" "write output to FILE. A file extension matching one of the above formats selects that format."-  ]+outputflags = [outputFormatFlag, outputFileFlag]+outputFormatFlag = flagReq  ["output-format","O"] (\s opts -> Right $ setopt "output-format" s opts) "FMT" "select the output format. Supported formats:\ntxt, csv."+outputFileFlag   = flagReq  ["output-file","o"]   (\s opts -> Right $ setopt "output-file" s opts) "FILE" "write output to FILE. A file extension matching one of the above formats selects that format."  argsFlag :: FlagHelp -> Arg RawOpts argsFlag desc = flagArg (\s opts -> Right $ setopt "args" s opts) desc@@ -200,7 +207,7 @@   ,modeGroupFlags  = Group {      groupNamed   = []     ,groupUnnamed = [-       flagNone ["h"] (setboolopt "h") "Show usage."+       flagNone ["help"] (setboolopt "help") "Show usage."       -- ,flagNone ["help"] (setboolopt "help") "Show long help."       ]     ,groupHidden  = []             --  flags not displayed in the usage@@ -246,11 +253,10 @@         preamble = unlines $ reverse $ dropWhile null $ reverse preamblels         postamblelines = dropWhile null $ drop 1 postamblels --- | Build a cmdarg mode suitable for a hledger add-on command,+-- | Build a cmdarg mode for a hledger command, -- from a help template and flag/argument specifications. -- Reduces boilerplate a little, though the complicated cmdargs -- flag and argument specs are still required.--- See the addons in bin/ for examples of usage. hledgerCommandMode :: HelpTemplate -> [Flag RawOpts] -> [(Help, [Flag RawOpts])]    -> [Flag RawOpts] -> ([Arg RawOpts], Maybe (Arg RawOpts)) -> Mode RawOpts hledgerCommandMode tmpl ungroupedflags groupedflags hiddenflags args =@@ -336,11 +342,10 @@      rawopts_         :: RawOpts     ,command_         :: String     ,file_            :: [FilePath]-    ,rules_file_      :: Maybe FilePath+    ,inputopts_       :: InputOpts+    ,reportopts_      :: ReportOpts     ,output_file_     :: Maybe FilePath     ,output_format_   :: Maybe String-    ,alias_           :: [String]-    ,ignore_assertions_ :: Bool     ,debug_           :: Int            -- ^ debug level, set by @--debug[=N]@. See also 'Hledger.Utils.debugLevel'.     ,no_new_accounts_ :: Bool           -- add     ,width_           :: Maybe String   -- ^ the --width value provided, if any@@ -348,7 +353,6 @@                                         -- 1. the COLUMNS env var, if set                                         -- 2. the width reported by the terminal, if supported                                         -- 3. the default (80)-    ,reportopts_      :: ReportOpts  } deriving (Show, Data, Typeable)  instance Default CliOpts where def = defcliopts@@ -365,9 +369,7 @@     def     def     def-    def     defaultWidth-    def  -- | Convert possibly encoded option values to regular unicode strings. decodeRawOpts :: RawOpts -> RawOpts@@ -377,12 +379,21 @@ defaultWidth :: Int defaultWidth = 80 +-- | Replace any numeric flags (eg -2) with their long form (--depth 2),+-- as I'm guessing cmdargs doesn't support this directly.  +replaceNumericFlags :: [String] -> [String]+replaceNumericFlags = map replace+  where+    replace ('-':ds) | not (null ds) && all isDigit ds = "--depth="++ds+    replace s = s+ -- | Parse raw option string values to the desired final data types. -- Any relative smart dates will be converted to fixed dates based on -- today's date. Parsing failures will raise an error. -- Also records the terminal width, if supported. rawOptsToCliOpts :: RawOpts -> IO CliOpts rawOptsToCliOpts rawopts = checkCliOpts <$> do+  let iopts = rawOptsToInputOpts rawopts   ropts <- rawOptsToReportOpts rawopts   mcolumns <- readMay <$> getEnvSafe "COLUMNS"   mtermwidth <-@@ -397,16 +408,14 @@               rawopts_         = rawopts              ,command_         = stringopt "command" rawopts              ,file_            = map (T.unpack . stripquotes . T.pack) $ listofstringopt "file" rawopts-             ,rules_file_      = maybestringopt "rules-file" rawopts+             ,inputopts_       = iopts+             ,reportopts_      = ropts              ,output_file_     = maybestringopt "output-file" rawopts              ,output_format_   = maybestringopt "output-format" rawopts-             ,alias_           = map (T.unpack . stripquotes . T.pack) $ listofstringopt "alias" rawopts              ,debug_           = intopt "debug" rawopts-             ,ignore_assertions_ = boolopt "ignore-assertions" rawopts              ,no_new_accounts_ = boolopt "no-new-accounts" rawopts -- add              ,width_           = maybestringopt "width" rawopts              ,available_width_ = availablewidth-             ,reportopts_      = ropts              }  -- | Do final validation of processed opts, raising an error if there is trouble.@@ -424,6 +433,7 @@ -- and returns a CliOpts. Or, with --help or -h present, it prints  -- long or short help, and exits the program.  -- When --debug is present, also prints some debug output.+-- Note this is not used by the main hledger executable. -- -- The help texts are generated from the mode. -- Long help includes the full usage description generated by cmdargs@@ -443,12 +453,12 @@ -- getHledgerCliOpts :: Mode RawOpts -> IO CliOpts getHledgerCliOpts mode' = do-  args' <- getArgs+  args' <- getArgs >>= expandArgsAt   let rawopts = either usageError decodeRawOpts $ process mode' args'   opts <- rawOptsToCliOpts rawopts   debugArgs args' opts-  when ("help" `inRawOpts` rawopts_ opts) $ putStr longhelp  >> exitSuccess-  when ("h"    `inRawOpts` rawopts_ opts) $ putStr shorthelp >> exitSuccess+  when ("help" `inRawOpts` rawopts_ opts) $ putStr shorthelp >> exitSuccess+  -- when ("help" `inRawOpts` rawopts_ opts) $ putStr longhelp  >> exitSuccess   return opts   where     longhelp = showModeUsage mode'@@ -457,7 +467,7 @@         (reverse $ dropWhile null $ reverse $ takeWhile (not . ("flags:" `isInfixOf`)) $ lines longhelp)         ++         [""-        ,"  See --help for full detail, including common hledger options."+        ,"  See also hledger -h for general hledger options."         ]     -- | Print debug info about arguments and options if --debug is present.     debugArgs :: [String] -> CliOpts -> IO ()@@ -475,7 +485,7 @@ -- | Get the account name aliases from options, if any. aliasesFromOpts :: CliOpts -> [AccountAlias] aliasesFromOpts = map (\a -> fromparse $ runParser accountaliasp ("--alias "++quoteIfNeeded a) $ T.pack a)-                  . alias_+                  . aliases_ . inputopts_  -- | Get the (tilde-expanded, absolute) journal file path from -- 1. options, 2. an environment variable, or 3. the default.@@ -539,7 +549,7 @@ rulesFilePathFromOpts :: CliOpts -> IO (Maybe FilePath) rulesFilePathFromOpts opts = do   d <- getCurrentDirectory-  maybe (return Nothing) (fmap Just . expandPath d) $ rules_file_ opts+  maybe (return Nothing) (fmap Just . expandPath d) $ mrules_file_ $ inputopts_ opts  -- | Get the width in characters to use for console output. -- This comes from the --width option, or the COLUMNS environment@@ -636,23 +646,27 @@ compiledExts = ["",".com",".exe"]   --- | Get the sorted unique filenames of all hledger-* executables in--- the current user's PATH. Currently these are: files in any of the--- PATH directories, named hledger-*, with either no extension (and no--- periods in the name) or one of the addonExtensions.  Limitations:--- we do not currently check that the file is really a file (not eg a--- directory) or whether it has execute permission.-hledgerExecutablesInPath :: IO [String]-hledgerExecutablesInPath = do+-- | Get all sorted unique filenames in the current user's PATH. +-- We do not currently filter out non-file objects or files without execute permission.+likelyExecutablesInPath :: IO [String]+likelyExecutablesInPath = do   pathdirs <- splitOneOf "[:;]" `fmap` getEnvSafe "PATH"   pathfiles <- concat `fmap` mapM getDirectoryContentsSafe pathdirs-  return $ nub $ sort $ filter isHledgerExeName pathfiles-  -- XXX should exclude directories and files without execute permission.+  return $ nub $ sort pathfiles+  -- exclude directories and files without execute permission.   -- These will do a stat for each hledger-*, probably ok.   -- But they need paths, not just filenames-  -- hledgerexes  <- filterM doesFileExist hledgernamed-  -- hledgerexes' <- filterM isExecutable hledgerexes-  -- return hledgerexes+  -- exes'  <- filterM doesFileExist exe'+  -- exes'' <- filterM isExecutable exes'+  -- return exes''++-- | Get the sorted unique filenames of all hledger-* executables in+-- the current user's PATH. These are files in any of the PATH directories,+-- named hledger-*, with either no extension (and no periods in the name) +-- or one of the addonExtensions. +-- We do not currently filter out non-file objects or files without execute permission.+hledgerExecutablesInPath :: IO [String]+hledgerExecutablesInPath = filter isHledgerExeName <$> likelyExecutablesInPath  -- isExecutable f = getPermissions f >>= (return . executable) 

@@ -0,0 +1,636 @@+{-|+hledger's built-in commands, and helpers for printing the commands list.+-}++{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands (+   findCommand+  ,builtinCommands+  ,builtinCommandNames+  ,printCommandsList+  ,tests_Hledger_Cli_Commands+  ,module Hledger.Cli.Commands.Accounts+  ,module Hledger.Cli.Commands.Activity+  ,module Hledger.Cli.Commands.Add+  ,module Hledger.Cli.Commands.Balance+  ,module Hledger.Cli.Commands.Balancesheet+  ,module Hledger.Cli.Commands.Balancesheetequity+  ,module Hledger.Cli.Commands.Cashflow+  ,module Hledger.Cli.Commands.Checkdates+  ,module Hledger.Cli.Commands.Checkdupes+  ,module Hledger.Cli.Commands.Equity+  ,module Hledger.Cli.Commands.Help+  ,module Hledger.Cli.Commands.Import+  ,module Hledger.Cli.Commands.Incomestatement+  ,module Hledger.Cli.Commands.Prices+  ,module Hledger.Cli.Commands.Print+  ,module Hledger.Cli.Commands.Printunique+  ,module Hledger.Cli.Commands.Register+  ,module Hledger.Cli.Commands.Registermatch+  ,module Hledger.Cli.Commands.Rewrite+  ,module Hledger.Cli.Commands.Stats+  ,module Hledger.Cli.Commands.Tags+) +where++import Control.Monad+import Data.List+import Data.List.Split (splitOn)+import Data.Monoid ((<>))+import Data.String.Here+import Data.Text (Text)+import qualified Data.Text as T+import Data.Time.Calendar+import System.Console.CmdArgs.Explicit as C+import System.Exit+import Test.HUnit++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.Version+import Hledger.Cli.Commands.Accounts+import Hledger.Cli.Commands.Activity+import Hledger.Cli.Commands.Add+import Hledger.Cli.Commands.Balance+import Hledger.Cli.Commands.Balancesheet+import Hledger.Cli.Commands.Balancesheetequity+import Hledger.Cli.Commands.Cashflow+import Hledger.Cli.Commands.Checkdates+import Hledger.Cli.Commands.Checkdupes+import Hledger.Cli.Commands.Equity+import Hledger.Cli.Commands.Help+import Hledger.Cli.Commands.Import+import Hledger.Cli.Commands.Incomestatement+import Hledger.Cli.Commands.Prices+import Hledger.Cli.Commands.Print+import Hledger.Cli.Commands.Printunique+import Hledger.Cli.Commands.Register+import Hledger.Cli.Commands.Registermatch+import Hledger.Cli.Commands.Rewrite+import Hledger.Cli.Commands.Stats+import Hledger.Cli.Commands.Tags+++-- | The cmdargs subcommand mode and IO action for each builtin command.+-- Command actions take parsed CLI options and a (lazy) finalised journal.+builtinCommands :: [(Mode RawOpts, CliOpts -> Journal -> IO ())]+builtinCommands = [+   (accountsmode           , accounts)+  ,(activitymode           , activity)+  ,(addmode                , add)+  ,(balancemode            , balance)+  ,(balancesheetmode       , balancesheet)+  ,(balancesheetequitymode , balancesheetequity)+  ,(cashflowmode           , cashflow)+  ,(checkdatesmode         , checkdates)+  ,(checkdupesmode         , checkdupes)+  ,(equitymode             , equity)+  ,(helpmode               , help')+  ,(importmode             , importcmd)+  ,(incomestatementmode    , incomestatement)+  ,(pricesmode             , prices)+  ,(printmode              , print')+  ,(printuniquemode        , printunique)+  ,(registermode           , register)+  ,(registermatchmode      , registermatch)+  ,(rewritemode            , rewrite)+  ,(statsmode              , stats)+  ,(tagsmode               , tags)+  ,(testmode               , testcmd)+  ]++-- | All names and aliases of builtin commands.+builtinCommandNames :: [String]+builtinCommandNames = concatMap (modeNames . fst) builtinCommands++-- | Look up a builtin command's mode and action by exact command name or alias. +findCommand :: String -> Maybe (Mode RawOpts, CliOpts -> Journal -> IO ()) +findCommand cmdname = find (elem cmdname . modeNames . fst) builtinCommands ++-- | A template for the commands list, containing entries (indented lines)+-- for all known and some hypothetical builtin and addon commands.+-- These will be filtered based on the commands found at runtime,  +-- except those beginning with "hledger", which are not filtered. +-- PROGVERSION is replaced with the program name and version.+-- OTHER is replaced with an entry for each unknown addon command found. +--  +-- The command descriptions here should be kept synced with +-- each command's builtin help and with hledger manual's command list.+--+commandsList :: String+commandsList = [here|+-------------------------------------------------------------------------------+PROGVERSION, commands available:++Data entry:+ add                      add transactions using console ui+ iadd                     add transactions using curses ui+ import                   add new transactions from one or more import files+ edit                     open a text editor on some part of the journal++Statements:+ balancesheet (bs)        show a simple balance sheet with net worth+ balancesheetequity (bse) show a detailed balance sheet with equity+ cashflow (cf)            show a cashflow statement+ incomestatement (is)     show an income statement++Basic reports:+ accounts (a)             show account names+ activity                 show a chart of posting counts per interval+ aregister (ar, areg)     show transactions in a single account+ balance (b, bal)         show account balance changes or ending balances+ prices                   show market price records+ print (p, txns)          show transactions/journal entries+ register (r, reg)        show postings to one or more accounts+ stats                    show journal statistics+ tags                     show tag names++UIs:+ ui                       start curses ui+ web                      start web ui++Generating data:+ equity                   generate balance-resetting transactions+ interest                 generate interest transactions+ rewrite                  generate automated postings on matched transactions++Other/experimental:+ api                      start web api server+ autosync                 download/deduplicate/convert OFX data+ budget                   add automated postings/txns/bucket accts+ chart                    generate simple balance pie charts+ check                    check more powerful balance assertions+ check-dates              check transactions are ordered by date+ check-dupes              check for accounts with the same leaf name+ diff                     compare account transactions in two journal files+ irr                      calculate internal rate of return of an investment+ print-unique             show only transactions with unique descriptions+ register-match           show best matching transaction for a description+ test                     run self tests+OTHER+Help:+ help                     show any of the hledger manuals in various formats+ hledger CMD -h           show command usage+ hledger -h               show general usage+-------------------------------------------------------------------------------+|]++-- | Print the commands list, modifying the template above based on+-- the currently available addons. Missing addons will be removed, and+-- extra addons will be added under Misc.+printCommandsList :: [String] -> IO ()+printCommandsList addonsFound =+  putStr $+  regexReplace "PROGVERSION" (prognameandversion) $+  regexReplace "OTHER" (unlines $ map (' ':) unknownCommandsFound) $+  -- regexReplace "COUNT" (show cmdcount) $+  unlines $ concatMap adjustline $ lines $+  cmdlist+  where+    cmdlist = commandsList+    -- cmdcount = length $ commandsFromCommandsList cmdlist+    commandsFound = builtinCommandNames ++ addonsFound+    unknownCommandsFound = addonsFound \\ knownCommands++    adjustline l | " hledger " `isPrefixOf` l = [l]+    adjustline (' ':l) | not $ w `elem` commandsFound = []+      where w = takeWhile (not . (`elem` ['|',' '])) l+    adjustline l = [l]++knownCommands :: [String]+knownCommands = sort $ commandsFromCommandsList commandsList++-- | Extract the command names from a commands list like the above:+-- the first word (or words separated by |) of lines beginning with a space.+commandsFromCommandsList :: String -> [String]+commandsFromCommandsList s =+  concatMap (splitOn "|") [w | ' ':l <- lines s, let w:_ = words l]++++-- The test command, defined here so it can access other commands' tests.++testmode = (defCommandMode ["test"]) {+  modeHelp = "run built-in self-tests"+ ,modeArgs = ([], Just $ argsFlag "[REGEXPS]")+ ,modeGroupFlags = Group {+     groupUnnamed = []+    ,groupHidden = [+        flagNone ["tree"] (\opts -> setboolopt "tree" opts) "show tests hierarchically"+       ,flagNone ["flat"] (\opts -> setboolopt "flat" opts) "show tests as a flat list"+      ]+    ,groupNamed = [generalflagsgroup3]+    }+ }++-- | Run some or all hledger-lib and hledger unit tests, and exit with success or failure.+testcmd :: CliOpts -> Journal -> IO ()+testcmd opts _ = do+  let ts = +        (if tree_ $ reportopts_ opts then matchedTestsTree else matchedTestsFlat) +          opts tests_Hledger_Cli_Commands+  results <- liftM (fst . flip (,) 0) $ runTestTT ts+  if errors results > 0 || failures results > 0+    then exitFailure+    else exitWith ExitSuccess++-- | All or pattern-matched tests, as a flat list to show simple names.+matchedTestsFlat opts = TestList . +  filter (matchesAccount (queryFromOpts nulldate $ reportopts_ opts) . T.pack . testName) . +  flattenTests++-- | All or pattern-matched tests, in the original suites to show hierarchical names.+matchedTestsTree opts = +  filterTests (matchesAccount (queryFromOpts nulldate $ reportopts_ opts) . T.pack . testName) +++-- collected hledger-lib + hledger unit tests++tests_Hledger_Cli_Commands :: Test+tests_Hledger_Cli_Commands = TestList [+   tests_Hledger+  ,tests_Hledger_Cli_CliOptions+  -- ,tests_Hledger_Cli_Commands_Activity+  -- ,tests_Hledger_Cli_Commands_Add+  ,tests_Hledger_Cli_Commands_Balance+  ,tests_Hledger_Cli_Commands_Balancesheet+  ,tests_Hledger_Cli_Commands_Cashflow+  ,tests_Hledger_Cli_Commands_Incomestatement+  ,tests_Hledger_Cli_Commands_Print+  ,tests_Hledger_Cli_Commands_Register+  -- ,tests_Hledger_Cli_Commands_Stats++  -- some more tests easiest to define here:+  +  ,"apply account directive" ~: +    let ignoresourcepos j = j{jtxns=map (\t -> t{tsourcepos=nullsourcepos}) (jtxns j)} in+    let sameParse str1 str2 = do j1 <- readJournal Nothing Nothing True Nothing str1 >>= either error' (return . ignoresourcepos)+                                 j2 <- readJournal Nothing Nothing True Nothing str2 >>= either error' (return . ignoresourcepos)+                                 j1 `is` j2{jlastreadtime=jlastreadtime j1, jfiles=jfiles j1} --, jparsestate=jparsestate j1}+    in sameParse+                         ("2008/12/07 One\n  alpha  $-1\n  beta  $1\n" <>+                          "apply account outer\n2008/12/07 Two\n  aigh  $-2\n  bee  $2\n" <>+                          "apply account inner\n2008/12/07 Three\n  gamma  $-3\n  delta  $3\n" <>+                          "end apply account\n2008/12/07 Four\n  why  $-4\n  zed  $4\n" <>+                          "end apply account\n2008/12/07 Five\n  foo  $-5\n  bar  $5\n"+                         )+                         ("2008/12/07 One\n  alpha  $-1\n  beta  $1\n" <>+                          "2008/12/07 Two\n  outer:aigh  $-2\n  outer:bee  $2\n" <>+                          "2008/12/07 Three\n  outer:inner:gamma  $-3\n  outer:inner:delta  $3\n" <>+                          "2008/12/07 Four\n  outer:why  $-4\n  outer:zed  $4\n" <>+                          "2008/12/07 Five\n  foo  $-5\n  bar  $5\n"+                         )++  ,"apply account directive should preserve \"virtual\" posting type" ~: do+    j <- readJournal Nothing Nothing True Nothing "apply account test\n2008/12/07 One\n  (from)  $-1\n  (to)  $1\n" >>= either error' return+    let p = head $ tpostings $ head $ jtxns j+    assertBool "" $ paccount p == "test:from"+    assertBool "" $ ptype p == VirtualPosting+  +  ,"account aliases" ~: do+    j <- readJournal Nothing Nothing True Nothing "!alias expenses = equity:draw:personal\n1/1\n (expenses:food)  1\n" >>= either error' return+    let p = head $ tpostings $ head $ jtxns j+    assertBool "" $ paccount p == "equity:draw:personal:food"++  ,"ledgerAccountNames" ~:+    ledgerAccountNames ledger7 `is`+     ["assets","assets:cash","assets:checking","assets:saving","equity","equity:opening balances",+      "expenses","expenses:food","expenses:food:dining","expenses:phone","expenses:vacation",+      "liabilities","liabilities:credit cards","liabilities:credit cards:discover"]++  -- ,"journalCanonicaliseAmounts" ~:+  --  "use the greatest precision" ~:+  --   (map asprecision $ journalAmountAndPriceCommodities $ journalCanonicaliseAmounts $ journalWithAmounts ["1","2.00"]) `is` [2,2]++  -- don't know what this should do+  -- ,"elideAccountName" ~: do+  --    (elideAccountName 50 "aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa"+  --     `is` "aa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa")+  --    (elideAccountName 20 "aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa"+  --     `is` "aa:aa:aaaaaaaaaaaaaa")++  ,"default year" ~: do+    j <- readJournal Nothing Nothing True Nothing defaultyear_journal_txt >>= either error' return+    tdate (head $ jtxns j) `is` fromGregorian 2009 1 1+    return ()++  ,"show dollars" ~: showAmount (usd 1) ~?= "$1.00"++  ,"show hours" ~: showAmount (hrs 1) ~?= "1.00h"++ ]+++-- test data++-- date1 = parsedate "2008/11/26"+-- t1 = LocalTime date1 midday++{-+samplejournal = readJournal' sample_journal_str++sample_journal_str = unlines+ ["; A sample journal file."+ ,";"+ ,"; Sets up this account tree:"+ ,"; assets"+ ,";   bank"+ ,";     checking"+ ,";     saving"+ ,";   cash"+ ,"; expenses"+ ,";   food"+ ,";   supplies"+ ,"; income"+ ,";   gifts"+ ,";   salary"+ ,"; liabilities"+ ,";   debts"+ ,""+ ,"2008/01/01 income"+ ,"    assets:bank:checking  $1"+ ,"    income:salary"+ ,""+ ,"2008/06/01 gift"+ ,"    assets:bank:checking  $1"+ ,"    income:gifts"+ ,""+ ,"2008/06/02 save"+ ,"    assets:bank:saving  $1"+ ,"    assets:bank:checking"+ ,""+ ,"2008/06/03 * eat & shop"+ ,"    expenses:food      $1"+ ,"    expenses:supplies  $1"+ ,"    assets:cash"+ ,""+ ,"2008/12/31 * pay off"+ ,"    liabilities:debts  $1"+ ,"    assets:bank:checking"+ ,""+ ,""+ ,";final comment"+ ]+-}++defaultyear_journal_txt :: Text+defaultyear_journal_txt = T.unlines+ ["Y2009"+ ,""+ ,"01/01 A"+ ,"    a  $1"+ ,"    b"+ ]++-- write_sample_journal = writeFile "sample.journal" sample_journal_str++-- entry2_str = unlines+--  ["2007/01/27 * joes diner"+--  ,"    expenses:food:dining                      $10.00"+--  ,"    expenses:gifts                            $10.00"+--  ,"    assets:checking                          $-20.00"+--  ,""+--  ]++-- entry3_str = unlines+--  ["2007/01/01 * opening balance"+--  ,"    assets:cash                                $4.82"+--  ,"    equity:opening balances"+--  ,""+--  ,"2007/01/01 * opening balance"+--  ,"    assets:cash                                $4.82"+--  ,"    equity:opening balances"+--  ,""+--  ,"2007/01/28 coopportunity"+--  ,"  expenses:food:groceries                 $47.18"+--  ,"  assets:checking"+--  ,""+--  ]++-- periodic_entry1_str = unlines+--  ["~ monthly from 2007/2/2"+--  ,"  assets:saving            $200.00"+--  ,"  assets:checking"+--  ,""+--  ]++-- periodic_entry2_str = unlines+--  ["~ monthly from 2007/2/2"+--  ,"  assets:saving            $200.00         ;auto savings"+--  ,"  assets:checking"+--  ,""+--  ]++-- periodic_entry3_str = unlines+--  ["~ monthly from 2007/01/01"+--  ,"    assets:cash                                $4.82"+--  ,"    equity:opening balances"+--  ,""+--  ,"~ monthly from 2007/01/01"+--  ,"    assets:cash                                $4.82"+--  ,"    equity:opening balances"+--  ,""+--  ]++-- journal1_str = unlines+--  [""+--  ,"2007/01/27 * joes diner"+--  ,"  expenses:food:dining                    $10.00"+--  ,"  expenses:gifts                          $10.00"+--  ,"  assets:checking                        $-20.00"+--  ,""+--  ,""+--  ,"2007/01/28 coopportunity"+--  ,"  expenses:food:groceries                 $47.18"+--  ,"  assets:checking                        $-47.18"+--  ,""+--  ,""+--  ]++-- journal2_str = unlines+--  [";comment"+--  ,"2007/01/27 * joes diner"+--  ,"  expenses:food:dining                    $10.00"+--  ,"  assets:checking                        $-47.18"+--  ,""+--  ]++-- journal3_str = unlines+--  ["2007/01/27 * joes diner"+--  ,"  expenses:food:dining                    $10.00"+--  ,";intra-entry comment"+--  ,"  assets:checking                        $-47.18"+--  ,""+--  ]++-- journal4_str = unlines+--  ["!include \"somefile\""+--  ,"2007/01/27 * joes diner"+--  ,"  expenses:food:dining                    $10.00"+--  ,"  assets:checking                        $-47.18"+--  ,""+--  ]++-- journal5_str = ""++-- journal6_str = unlines+--  ["~ monthly from 2007/1/21"+--  ,"    expenses:entertainment  $16.23        ;netflix"+--  ,"    assets:checking"+--  ,""+--  ,"; 2007/01/01 * opening balance"+--  ,";     assets:saving                            $200.04"+--  ,";     equity:opening balances                         "+--  ,""+--  ]++-- journal7_str = unlines+--  ["2007/01/01 * opening balance"+--  ,"    assets:cash                                $4.82"+--  ,"    equity:opening balances                         "+--  ,""+--  ,"2007/01/01 * opening balance"+--  ,"    income:interest                                $-4.82"+--  ,"    equity:opening balances                         "+--  ,""+--  ,"2007/01/02 * ayres suites"+--  ,"    expenses:vacation                        $179.92"+--  ,"    assets:checking                                 "+--  ,""+--  ,"2007/01/02 * auto transfer to savings"+--  ,"    assets:saving                            $200.00"+--  ,"    assets:checking                                 "+--  ,""+--  ,"2007/01/03 * poquito mas"+--  ,"    expenses:food:dining                       $4.82"+--  ,"    assets:cash                                     "+--  ,""+--  ,"2007/01/03 * verizon"+--  ,"    expenses:phone                            $95.11"+--  ,"    assets:checking                                 "+--  ,""+--  ,"2007/01/03 * discover"+--  ,"    liabilities:credit cards:discover         $80.00"+--  ,"    assets:checking                                 "+--  ,""+--  ,"2007/01/04 * blue cross"+--  ,"    expenses:health:insurance                 $90.00"+--  ,"    assets:checking                                 "+--  ,""+--  ,"2007/01/05 * village market liquor"+--  ,"    expenses:food:dining                       $6.48"+--  ,"    assets:checking                                 "+--  ,""+--  ]++journal7 :: Journal+journal7 = nulljournal {jtxns =+          [+           txnTieKnot Transaction {+             tindex=0,+             tsourcepos=nullsourcepos,+             tdate=parsedate "2007/01/01",+             tdate2=Nothing,+             tstatus=Unmarked,+             tcode="*",+             tdescription="opening balance",+             tcomment="",+             ttags=[],+             tpostings=+                 ["assets:cash" `post` usd 4.82+                 ,"equity:opening balances" `post` usd (-4.82)+                 ],+             tpreceding_comment_lines=""+           }+          ,+           txnTieKnot Transaction {+             tindex=0,+             tsourcepos=nullsourcepos,+             tdate=parsedate "2007/02/01",+             tdate2=Nothing,+             tstatus=Unmarked,+             tcode="*",+             tdescription="ayres suites",+             tcomment="",+             ttags=[],+             tpostings=+                 ["expenses:vacation" `post` usd 179.92+                 ,"assets:checking" `post` usd (-179.92)+                 ],+             tpreceding_comment_lines=""+           }+          ,+           txnTieKnot Transaction {+             tindex=0,+             tsourcepos=nullsourcepos,+             tdate=parsedate "2007/01/02",+             tdate2=Nothing,+             tstatus=Unmarked,+             tcode="*",+             tdescription="auto transfer to savings",+             tcomment="",+             ttags=[],+             tpostings=+                 ["assets:saving" `post` usd 200+                 ,"assets:checking" `post` usd (-200)+                 ],+             tpreceding_comment_lines=""+           }+          ,+           txnTieKnot Transaction {+             tindex=0,+             tsourcepos=nullsourcepos,+             tdate=parsedate "2007/01/03",+             tdate2=Nothing,+             tstatus=Unmarked,+             tcode="*",+             tdescription="poquito mas",+             tcomment="",+             ttags=[],+             tpostings=+                 ["expenses:food:dining" `post` usd 4.82+                 ,"assets:cash" `post` usd (-4.82)+                 ],+             tpreceding_comment_lines=""+           }+          ,+           txnTieKnot Transaction {+             tindex=0,+             tsourcepos=nullsourcepos,+             tdate=parsedate "2007/01/03",+             tdate2=Nothing,+             tstatus=Unmarked,+             tcode="*",+             tdescription="verizon",+             tcomment="",+             ttags=[],+             tpostings=+                 ["expenses:phone" `post` usd 95.11+                 ,"assets:checking" `post` usd (-95.11)+                 ],+             tpreceding_comment_lines=""+           }+          ,+           txnTieKnot Transaction {+             tindex=0,+             tsourcepos=nullsourcepos,+             tdate=parsedate "2007/01/03",+             tdate2=Nothing,+             tstatus=Unmarked,+             tcode="*",+             tdescription="discover",+             tcomment="",+             ttags=[],+             tpostings=+                 ["liabilities:credit cards:discover" `post` usd 80+                 ,"assets:checking" `post` usd (-80)+                 ],+             tpreceding_comment_lines=""+           }+          ]+         }++ledger7 :: Ledger+ledger7 = ledgerFromJournal Any journal7

@@ -0,0 +1,67 @@+{-|++The @accounts@ command lists account names:++- in flat mode (default), it lists the full names of accounts posted to by matched postings,+  clipped to the specified depth, possibly with leading components dropped.++- in tree mode, it shows the indented short names of accounts posted to by matched postings,+  and their parents, to the specified depth.++-}++{-# LANGUAGE OverloadedStrings #-}++module Hledger.Cli.Commands.Accounts (+  accountsmode+ ,accounts+ ,tests_Hledger_Cli_Commands_Accounts+) where++import Data.List+import Data.Monoid+-- import Data.Text (Text)+import qualified Data.Text as T+import System.Console.CmdArgs.Explicit as C+import Test.HUnit++import Hledger+import Prelude hiding (putStrLn)+import Hledger.Utils.UTF8IOCompat (putStrLn)+import Hledger.Cli.CliOptions+++-- | Command line options for this command.+accountsmode = (defCommandMode $ ["accounts"] ++ aliases) {+  modeHelp = "show account names" `withAliases` aliases+ ,modeHelpSuffix = [+    "This command lists the accounts referenced by matched postings (and in tree mode, their parents as well). The accounts can be depth-clipped (--depth N) or have their leading parts trimmed (--drop N)."+   ]+ ,modeGroupFlags = C.Group {+     groupUnnamed = [+      flagNone ["tree"] (\opts -> setboolopt "tree" opts) "show short account names, as a tree"+     ,flagNone ["flat"] (\opts -> setboolopt "flat" opts) "show full account names, as a list (default)"+     ,flagReq  ["drop"] (\s opts -> Right $ setopt "drop" s opts) "N" "flat mode: omit N leading account name parts"+     ]+    ,groupHidden = []+    ,groupNamed = [generalflagsgroup1]+    }+ }+  where aliases = ["a"]++-- | The accounts command.+accounts :: CliOpts -> Journal -> IO ()+accounts CliOpts{reportopts_=ropts} j = do+  d <- getCurrentDay+  let q = queryFromOpts d ropts+      nodepthq = dbg1 "nodepthq" $ filterQuery (not . queryIsDepth) q+      depth    = dbg1 "depth" $ queryDepth $ filterQuery queryIsDepth q+      ps = dbg1 "ps" $ journalPostings $ filterJournalPostings nodepthq j+      as = dbg1 "as" $ nub $ filter (not . T.null) $ map (clipAccountName depth) $ sort $ map paccount ps+      as' | tree_ ropts = expandAccountNames as+          | otherwise   = as+      render a | tree_ ropts = T.replicate (2 * (accountNameLevel a - 1)) " " <> accountLeafName a+               | otherwise   = maybeAccountNameDrop ropts a+  mapM_ (putStrLn . T.unpack . render) as'++tests_Hledger_Cli_Commands_Accounts = TestList []

@@ -0,0 +1,58 @@+{-|++Print a bar chart of posting activity per day, or other report interval. ++-}++module Hledger.Cli.Commands.Activity+where++import Data.List+import Data.Maybe+import Data.Ord+import System.Console.CmdArgs.Explicit+import Text.Printf++import Hledger+import Hledger.Cli.CliOptions+import Prelude hiding (putStr)+import Hledger.Utils.UTF8IOCompat (putStr)++activitymode :: Mode RawOpts+activitymode = (defCommandMode $ ["activity"] ++ aliases) {+  modeHelp = "show an ascii barchart of posting counts per interval (default: daily)" `withAliases` aliases+ ,modeHelpSuffix = []+ ,modeGroupFlags = Group {+     groupUnnamed = []+    ,groupHidden = []+    ,groupNamed = [generalflagsgroup1]+    }+ }+  where aliases = []++barchar :: Char+barchar = '*'++-- | Print a bar chart of number of postings per report interval.+activity :: CliOpts -> Journal -> IO ()+activity CliOpts{reportopts_=ropts} j = do+  d <- getCurrentDay+  putStr $ showHistogram ropts (queryFromOpts d ropts) j++showHistogram :: ReportOpts -> Query -> Journal -> String+showHistogram opts q j = concatMap (printDayWith countBar) spanps+    where+      i = interval_ opts+      interval | i == NoInterval = Days 1+               | otherwise = i+      span' = queryDateSpan (date2_ opts) q `spanDefaultsFrom` journalDateSpan (date2_ opts) j+      spans = filter (DateSpan Nothing Nothing /=) $ splitSpan interval span'+      spanps = [(s, filter (isPostingInDateSpan s) ps) | s <- spans]+      -- same as Register+      -- should count transactions, not postings ?+      -- ps = sortBy (comparing postingDate) $ filterempties $ filter matchapats $ filterdepth $ journalPostings j+      ps = sortBy (comparing postingDate) $ filter (q `matchesPosting`) $ journalPostings j++printDayWith f (DateSpan b _, ps) = printf "%s %s\n" (show $ fromJust b) (f ps)++countBar ps = replicate (length ps) barchar

@@ -0,0 +1,455 @@+{-|+A history-aware add command to help with data entry.+|-}++{-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-unused-do-bind #-}+{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts, OverloadedStrings #-}++module Hledger.Cli.Commands.Add (+   addmode+  ,add+  ,appendToJournalFileOrStdout+  ,journalAddTransaction+  ,transactionsSimilarTo+)+where++import Prelude ()+import Prelude.Compat+import Control.Exception as E+import Control.Monad+import Control.Monad.Trans.Class+import Control.Monad.State.Strict (evalState, evalStateT)+import Control.Monad.Trans (liftIO)+import Data.Char (toUpper, toLower)+import Data.Functor.Identity (Identity(..))+import Data.List.Compat+import qualified Data.Set as S+import Data.Maybe+import Data.Text (Text)+import qualified Data.Text as T+import Data.Time.Calendar (Day)+import Data.Typeable (Typeable)+import Safe (headDef, headMay)+import System.Console.CmdArgs.Explicit+import System.Console.Haskeline (runInputT, defaultSettings, setComplete)+import System.Console.Haskeline.Completion+import System.Console.Wizard+import System.Console.Wizard.Haskeline+import System.IO ( stderr, hPutStr, hPutStrLn )+import Text.Megaparsec.Compat+import Text.Printf++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.Commands.Register (postingsReportAsText)+++addmode = (defCommandMode ["add"]) {+  modeHelp = "prompt for transactions and add them to the journal"+ ,modeHelpSuffix = ["Defaults come from previous similar transactions; use query patterns to restrict these."]+ ,modeGroupFlags = Group {+     groupUnnamed = [+      flagNone ["no-new-accounts"]  (\opts -> setboolopt "no-new-accounts" opts) "don't allow creating new accounts"+     ]+    ,groupHidden = []+    ,groupNamed = [generalflagsgroup2]+    }+ }++-- | State used while entering transactions.+data EntryState = EntryState {+   esOpts               :: CliOpts           -- ^ command line options+  ,esArgs               :: [String]          -- ^ command line arguments remaining to be used as defaults+  ,esToday              :: Day               -- ^ today's date+  ,esDefDate            :: Day               -- ^ the default date for next transaction+  ,esJournal            :: Journal           -- ^ the journal we are adding to+  ,esSimilarTransaction :: Maybe Transaction -- ^ the most similar historical txn+  ,esPostings           :: [Posting]         -- ^ postings entered so far in the current txn+  } deriving (Show,Typeable)++defEntryState = EntryState {+   esOpts               = defcliopts+  ,esArgs               = []+  ,esToday              = nulldate+  ,esDefDate            = nulldate+  ,esJournal            = nulljournal+  ,esSimilarTransaction = Nothing+  ,esPostings           = []+}++data RestartTransactionException = RestartTransactionException deriving (Typeable,Show)+instance Exception RestartTransactionException++-- data ShowHelpException = ShowHelpException deriving (Typeable,Show)+-- instance Exception ShowHelpException++-- | Read multiple transactions from the console, prompting for each+-- field, and append them to the journal file.  If the journal came+-- from stdin, this command has no effect.+add :: CliOpts -> Journal -> IO ()+add opts j+    | journalFilePath j == "-" = return ()+    | otherwise = do+        hPrintf stderr "Adding transactions to journal file %s\n" (journalFilePath j)+        showHelp+        today <- getCurrentDay+        let es = defEntryState{esOpts=opts+                              ,esArgs=map (T.unpack . stripquotes . T.pack) $ listofstringopt "args" $ rawopts_ opts+                              ,esToday=today+                              ,esDefDate=today+                              ,esJournal=j+                              }+        getAndAddTransactions es `E.catch` (\(_::UnexpectedEOF) -> putStr "")++showHelp = hPutStr stderr $ unlines [+     "Any command line arguments will be used as defaults."+    ,"Use tab key to complete, readline keys to edit, enter to accept defaults."+    ,"An optional (CODE) may follow transaction dates."+    ,"An optional ; COMMENT may follow descriptions or amounts."+    ,"If you make a mistake, enter < at any prompt to restart the transaction."+    ,"To end a transaction, enter . when prompted."+    ,"To quit, enter . at a date prompt or press control-d or control-c."+    ]++-- | Loop reading transactions from the console, prompting, validating+-- and appending each one to the journal file, until end of input or+-- ctrl-c (then raise an EOF exception).  If provided, command-line+-- arguments are used as defaults; otherwise defaults come from the+-- most similar recent transaction in the journal.+getAndAddTransactions :: EntryState -> IO ()+getAndAddTransactions es@EntryState{..} = (do+  mt <- runInputT (setComplete noCompletion defaultSettings) (run $ haskeline $ confirmedTransactionWizard es)+  case mt of+    Nothing -> fail "urk ?"+    Just t -> do+      j <- if debug_ esOpts > 0+           then do hPrintf stderr "Skipping journal add due to debug mode.\n"+                   return esJournal+           else do j' <- journalAddTransaction esJournal esOpts t+                   hPrintf stderr "Saved.\n"+                   return j'+      hPrintf stderr "Starting the next transaction (. or ctrl-D/ctrl-C to quit)\n"+      getAndAddTransactions es{esJournal=j, esDefDate=tdate t}+  )+  `E.catch` (\(_::RestartTransactionException) ->+                 hPrintf stderr "Restarting this transaction.\n" >> getAndAddTransactions es)++-- confirmedTransactionWizard :: (ArbitraryIO :<: b, OutputLn :<: b, Line :<: b) => EntryState -> Wizard b Transaction+-- confirmedTransactionWizard :: EntryState -> Wizard Haskeline Transaction+confirmedTransactionWizard es@EntryState{..} = do+  t <- transactionWizard es+  -- liftIO $ hPrintf stderr {- "Transaction entered:\n%s" -} (show t)+  output $ show t+  y <- let def = "y" in+       retryMsg "Please enter y or n." $+        parser ((fmap ('y' ==)) . headMay . map toLower . strip) $+        defaultTo' def $ nonEmpty $+        maybeRestartTransaction $+        line $ green $ printf "Save this transaction to the journal ?%s: " (showDefault def)+  if y then return t else throw RestartTransactionException++transactionWizard es@EntryState{..} = do+  (date,code)    <- dateAndCodeWizard es+  let es1@EntryState{esArgs=args1} = es{esArgs=drop 1 esArgs, esDefDate=date}+  (desc,comment) <- descriptionAndCommentWizard es1+  let mbaset = similarTransaction es1 desc+  when (isJust mbaset) $ liftIO $ hPrintf stderr "Using this similar transaction for defaults:\n%s" (show $ fromJust mbaset)+  let es2 = es1{esArgs=drop 1 args1, esSimilarTransaction=mbaset}+      balancedPostingsWizard = do+        ps <- postingsWizard es2{esPostings=[]}+        let t = nulltransaction{tdate=date+                               ,tstatus=Unmarked+                               ,tcode=code+                               ,tdescription=desc+                               ,tcomment=comment+                               ,tpostings=ps+                               }+        case balanceTransaction Nothing t of -- imprecise balancing (?)+          Right t' -> return t'+          Left err -> liftIO (hPutStrLn stderr $ "\n" ++ (capitalize err) ++ "please re-enter.") >> balancedPostingsWizard+  balancedPostingsWizard++-- Identify the closest recent match for this description in past transactions.+similarTransaction :: EntryState -> Text -> Maybe Transaction+similarTransaction EntryState{..} desc =+  let q = queryFromOptsOnly esToday $ reportopts_ esOpts+      historymatches = transactionsSimilarTo esJournal q desc+      bestmatch | null historymatches = Nothing+                | otherwise           = Just $ snd $ head historymatches+  in bestmatch++dateAndCodeWizard EntryState{..} = do+  let def = headDef (showDate esDefDate) esArgs+  retryMsg "A valid hledger smart date is required. Eg: 2014/2/14, 14, yesterday." $+   parser (parseSmartDateAndCode esToday) $+   withCompletion (dateCompleter def) $+   defaultTo' def $ nonEmpty $+   maybeExit $+   maybeRestartTransaction $+   -- maybeShowHelp $+   line $ green $ printf "Date%s: " (showDefault def)+    where+      parseSmartDateAndCode refdate s = either (const Nothing) (\(d,c) -> return (fixSmartDate refdate d, c)) edc+          where+            edc = runParser (dateandcodep <* eof) "" $ T.pack $ lowercase s+            dateandcodep :: SimpleTextParser (SmartDate, Text)+            dateandcodep = do+                d <- smartdate+                c <- optional codep+                many spacenonewline+                eof+                return (d, T.pack $ fromMaybe "" c)+      -- defday = fixSmartDate today $ fromparse $ (parse smartdate "" . lowercase) defdate+      -- datestr = showDate $ fixSmartDate defday smtdate++descriptionAndCommentWizard EntryState{..} = do+  let def = headDef "" esArgs+  s <- withCompletion (descriptionCompleter esJournal def) $+       defaultTo' def $ nonEmpty $+       maybeRestartTransaction $+       line $ green $ printf "Description%s: " (showDefault def)+  let (desc,comment) = (T.pack $ strip a, T.pack $ strip $ dropWhile (==';') b) where (a,b) = break (==';') s+  return (desc, comment)++postingsWizard es@EntryState{..} = do+  mp <- postingWizard es+  case mp of Nothing -> return esPostings+             Just p  -> postingsWizard es{esArgs=drop 2 esArgs, esPostings=esPostings++[p]}++postingWizard es@EntryState{..} = do+  acct <- accountWizard es+  if acct `elem` [".",""]+  then case (esPostings, postingsBalanced esPostings) of+         ([],_)    -> liftIO (hPutStrLn stderr "Please enter some postings first.") >> postingWizard es+         (_,False) -> liftIO (hPutStrLn stderr "Please enter more postings to balance the transaction.") >> postingWizard es+         (_,True)  -> return Nothing -- no more postings, end of transaction+  else do+    let es1 = es{esArgs=drop 1 esArgs}+    (amt,comment)  <- amountAndCommentWizard es1+    return $ Just nullposting{paccount=T.pack $ stripbrackets acct+                             ,pamount=Mixed [amt]+                             ,pcomment=comment+                             ,ptype=accountNamePostingType $ T.pack acct+                             }++postingsBalanced :: [Posting] -> Bool+postingsBalanced ps = isRight $ balanceTransaction Nothing nulltransaction{tpostings=ps}++accountWizard EntryState{..} = do+  let pnum = length esPostings + 1+      historicalp = maybe Nothing (Just . (!! (pnum-1)) . (++ (repeat nullposting)) . tpostings) esSimilarTransaction+      historicalacct = case historicalp of Just p  -> showAccountName Nothing (ptype p) (paccount p)+                                           Nothing -> ""+      def = headDef historicalacct esArgs+      endmsg | canfinish && null def = " (or . or enter to finish this transaction)"+             | canfinish             = " (or . to finish this transaction)"+             | otherwise             = ""+  retryMsg "A valid hledger account name is required. Eg: assets:cash, expenses:food:eating out." $+   parser (parseAccountOrDotOrNull def canfinish) $+   withCompletion (accountCompleter esJournal def) $+   defaultTo' def $ -- nonEmpty $+   maybeRestartTransaction $+   line $ green $ printf "Account %d%s%s: " pnum (endmsg::String) (showDefault def)+    where+      canfinish = not (null esPostings) && postingsBalanced esPostings+      parseAccountOrDotOrNull :: String -> Bool -> String -> Maybe String+      parseAccountOrDotOrNull _  _ "."       = dbg1 $ Just "." -- . always signals end of txn+      parseAccountOrDotOrNull "" True ""     = dbg1 $ Just ""  -- when there's no default and txn is balanced, "" also signals end of txn+      parseAccountOrDotOrNull def@(_:_) _ "" = dbg1 $ Just def -- when there's a default, "" means use that+      parseAccountOrDotOrNull _ _ s          = dbg1 $ fmap T.unpack $+        either (const Nothing) validateAccount $+          flip evalState esJournal $ runParserT (accountnamep <* eof) "" (T.pack s) -- otherwise, try to parse the input as an accountname+        where+          validateAccount :: Text -> Maybe Text+          validateAccount t | no_new_accounts_ esOpts && not (t `elem` journalAccountNames esJournal) = Nothing+                            | otherwise = Just t+      dbg1 = id -- strace++amountAndCommentWizard EntryState{..} = do+  let pnum = length esPostings + 1+      (mhistoricalp,followedhistoricalsofar) =+          case esSimilarTransaction of+            Nothing                        -> (Nothing,False)+            Just Transaction{tpostings=ps} -> (if length ps >= pnum then Just (ps !! (pnum-1)) else Nothing+                                              ,all (\(a,b) -> pamount a == pamount b) $ zip esPostings ps)+      def = case (esArgs, mhistoricalp, followedhistoricalsofar) of+              (d:_,_,_)                                             -> d+              (_,Just hp,True)                                      -> showamt $ pamount hp+              _  | pnum > 1 && not (isZeroMixedAmount balancingamt) -> showamt balancingamtfirstcommodity+              _                                                     -> ""+  retryMsg "A valid hledger amount is required. Eg: 1, $2, 3 EUR, \"4 red apples\"." $+   parser parseAmountAndComment $+   withCompletion (amountCompleter def) $+   defaultTo' def $ nonEmpty $+   maybeRestartTransaction $+   line $ green $ printf "Amount  %d%s: " pnum (showDefault def)+    where+      parseAmountAndComment s = either (const Nothing) Just $+                                runParser+                                  (evalStateT (amountandcommentp <* eof) nodefcommodityj)+                                  ""+                                  (T.pack s)+      nodefcommodityj = esJournal{jparsedefaultcommodity=Nothing}+      amountandcommentp :: JournalParser Identity (Amount, Text)+      amountandcommentp = do+        a <- amountp+        lift (many spacenonewline)+        c <- T.pack <$> fromMaybe "" `fmap` optional (char ';' >> many anyChar)+        -- eof+        return (a,c)+      balancingamt = negate $ sum $ map pamount realps where realps = filter isReal esPostings+      balancingamtfirstcommodity = Mixed $ take 1 $ amounts balancingamt+      showamt =+        showMixedAmountWithPrecision+                  -- what should this be ?+                  -- 1 maxprecision (show all decimal places or none) ?+                  -- 2 maxprecisionwithpoint (show all decimal places or .0 - avoids some but not all confusion with thousands separators) ?+                  -- 3 canonical precision for this commodity in the journal ?+                  -- 4 maximum precision entered so far in this transaction ?+                  -- 5 3 or 4, whichever would show the most decimal places ?+                  -- I think 1 or 4, whichever would show the most decimal places+                  maxprecisionwithpoint+  --+  -- let -- (amt,comment) = (strip a, strip $ dropWhile (==';') b) where (a,b) = break (==';') amtcmt+      -- a           = fromparse $ runParser (amountp <|> return missingamt) (jparsestate esJournal) "" amt+  --     awithoutjps = fromparse $ runParser (amountp <|> return missingamt) mempty              "" amt+  --     defamtaccepted = Just (showAmount a) == mdefamt+  --     es2 = if defamtaccepted then es1 else es1{esHistoricalPostings=Nothing}+  --     mdefaultcommodityapplied = if acommodity a == acommodity awithoutjps then Nothing else Just $ acommodity a+  -- when (isJust 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)++-- maybeShowHelp :: Wizard Haskeline String -> Wizard Haskeline String+-- maybeShowHelp wizard = maybe (liftIO showHelp >> wizard) return $+--                        parser (\s -> if s=="?" then Nothing else Just s) wizard++-- Completion helpers++dateCompleter :: String -> CompletionFunc IO+dateCompleter = completer ["today","tomorrow","yesterday"]++descriptionCompleter :: Journal -> String -> CompletionFunc IO+descriptionCompleter j = completer (map T.unpack $ journalDescriptions j)++accountCompleter :: Journal -> String -> CompletionFunc IO+accountCompleter j = completer (map T.unpack $ journalAccountNamesUsed j)++amountCompleter :: String -> CompletionFunc IO+amountCompleter = completer []++-- | Generate a haskeline completion function from the given+-- completions and default, that case insensitively completes with+-- prefix matches, or infix matches above a minimum length, or+-- completes the null string with the default.+completer :: [String] -> String -> CompletionFunc IO+completer completions def = completeWord Nothing "" completionsFor+    where+      simpleCompletion' s = (simpleCompletion s){isFinished=False}+      completionsFor "" = return [simpleCompletion' def]+      completionsFor i  = return (map simpleCompletion' ciprefixmatches)+          where+            ciprefixmatches = [c | c <- completions, i `isPrefixOf` c]+            -- mixed-case completions require haskeline > 0.7.1.2+            -- ciprefixmatches = [c | c <- completions, lowercase i `isPrefixOf` lowercase c]++--------------------------------------------------------------------------------++-- utilities++defaultTo' = flip defaultTo++withCompletion f = withSettings (setComplete f defaultSettings)++green s = "\ESC[1;32m\STX"++s++"\ESC[0m\STX"++showDefault "" = ""+showDefault s = " [" ++ s ++ "]"++-- | Append this transaction to the journal's file and transaction list.+journalAddTransaction :: Journal -> CliOpts -> Transaction -> IO Journal+journalAddTransaction j@Journal{jtxns=ts} opts t = do+  let f = journalFilePath j+  appendToJournalFileOrStdout f $ showTransactionUnelided t+    -- unelided shows all amounts explicitly, in case there's a price, cf #283+  when (debug_ opts > 0) $ do+    putStrLn $ printf "\nAdded transaction to %s:" f+    putStrLn =<< registerFromString (show t)+  return j{jtxns=ts++[t]}++-- | Append a string, typically one or more transactions, to a journal+-- file, or if the file is "-", dump it to stdout.  Tries to avoid+-- excess whitespace.+appendToJournalFileOrStdout :: FilePath -> String -> IO ()+appendToJournalFileOrStdout f s+  | f == "-"  = putStr s'+  | otherwise = appendFile f s'+  where s' = "\n" ++ ensureOneNewlineTerminated s++-- | Replace a string's 0 or more terminating newlines with exactly one.+ensureOneNewlineTerminated :: String -> String+ensureOneNewlineTerminated = (++"\n") . reverse . dropWhile (=='\n') . reverse++-- | Convert a string of journal data into a register report.+registerFromString :: String -> IO String+registerFromString s = do+  d <- getCurrentDay+  j <- readJournal' $ T.pack s+  return $ postingsReportAsText opts $ postingsReport ropts (queryFromOpts d ropts) j+      where+        ropts = defreportopts{empty_=True}+        opts = defcliopts{reportopts_=ropts}++capitalize :: String -> String+capitalize "" = ""+capitalize (c:cs) = toUpper c : cs++-- | Find the most similar and recent transactions matching the given+-- transaction description and report query.  Transactions are listed+-- with their "relevancy" score, most relevant first.+transactionsSimilarTo :: Journal -> Query -> Text -> [(Double,Transaction)]+transactionsSimilarTo j q desc =+    sortBy compareRelevanceAndRecency+               $ filter ((> threshold).fst)+               [(compareDescriptions desc $ tdescription t, t) | t <- ts]+    where+      compareRelevanceAndRecency (n1,t1) (n2,t2) = compare (n2,tdate t2) (n1,tdate t1)+      ts = filter (q `matchesTransaction`) $ jtxns j+      threshold = 0++-- | Return a similarity measure, from 0 to 1, for two transaction+-- descriptions.  This is like compareStrings, but first strips out+-- any numbers, to improve accuracy eg when there are bank transaction+-- ids from imported data.+compareDescriptions :: Text -> Text -> Double+compareDescriptions s t = compareStrings s' t'+    where s' = simplify $ T.unpack s+          t' = simplify $ T.unpack t+          simplify = filter (not . (`elem` ("0123456789" :: String)))++-- | Return a similarity measure, from 0 to 1, for two strings.  This+-- was based on Simon White's string similarity algorithm+-- (http://www.catalysoft.com/articles/StrikeAMatch.html), later found+-- to be https://en.wikipedia.org/wiki/S%C3%B8rensen%E2%80%93Dice_coefficient,+-- modified to handle short strings better.+-- Todo: check out http://nlp.fi.muni.cz/raslan/2008/raslan08.pdf#page=14 .+compareStrings :: String -> String -> Double+compareStrings "" "" = 1+compareStrings (_:[]) "" = 0+compareStrings "" (_:[]) = 0+compareStrings (a:[]) (b:[]) = if toUpper a == toUpper b then 1 else 0+compareStrings s1 s2 = 2 * commonpairs / totalpairs+    where+      pairs1      = S.fromList $ wordLetterPairs $ uppercase s1+      pairs2      = S.fromList $ wordLetterPairs $ uppercase s2+      commonpairs = fromIntegral $ S.size $ S.intersection pairs1 pairs2+      totalpairs  = fromIntegral $ S.size pairs1 + S.size pairs2++wordLetterPairs = concatMap letterPairs . words++letterPairs (a:b:rest) = [a,b] : letterPairs (b:rest)+letterPairs _ = []

@@ -0,0 +1,553 @@+{-|++A ledger-compatible @balance@ command, with additional support for+multi-column reports.++Here is a description/specification for the balance command.  See also+"Hledger.Reports" -> \"Balance reports\".+++/Basic balance report/++With no report interval (@--monthly@ etc.), hledger's balance+command emulates ledger's, showing accounts indented according to+hierarchy, along with their total amount posted (including subaccounts).++Here's an example. With @examples/sample.journal@, which defines the following account tree:++@+ assets+   bank+     checking+     saving+   cash+ expenses+   food+   supplies+ income+   gifts+   salary+ liabilities+   debts+@++the basic @balance@ command gives this output:++@+ $ hledger -f sample.journal balance+                 $-1  assets+                  $1    bank:saving+                 $-2    cash+                  $2  expenses+                  $1    food+                  $1    supplies+                 $-2  income+                 $-1    gifts+                 $-1    salary+                  $1  liabilities:debts+--------------------+                   0+@++Subaccounts are displayed indented below their parent. Only the account leaf name (the final part) is shown.+(With @--flat@, account names are shown in full and unindented.)++Each account's \"balance\" is the sum of postings in that account and any subaccounts during the report period.+When the report period includes all transactions, this is equivalent to the account's current balance.++The overall total of the highest-level displayed accounts is shown below the line.+(The @--no-total/-N@ flag prevents this.)++/Eliding and omitting/++Accounts which have a zero balance, and no non-zero subaccount+balances, are normally omitted from the report.+(The @--empty/-E@ flag forces such accounts to be displayed.)+Eg, above @checking@ is omitted because it has a zero balance and no subaccounts.++Accounts which have a single subaccount also being displayed, with the same balance,+are normally elided into the subaccount's line.+(The @--no-elide@ flag prevents this.)+Eg, above @bank@ is elided to @bank:saving@ because it has only a+single displayed subaccount (@saving@) and their balance is the same+($1). Similarly, @liabilities@ is elided to @liabilities:debts@.++/Date limiting/++The default report period is that of the whole journal, including all+known transactions. The @--begin\/-b@, @--end\/-e@, @--period\/-p@+options or @date:@/@date2:@ patterns can be used to report only+on transactions before and/or after specified dates.++/Depth limiting/++The @--depth@ option can be used to limit the depth of the balance report.+Eg, to see just the top level accounts (still including their subaccount balances):++@+$ hledger -f sample.journal balance --depth 1+                 $-1  assets+                  $2  expenses+                 $-2  income+                  $1  liabilities+--------------------+                   0+@++/Account limiting/++With one or more account pattern arguments, the report is restricted+to accounts whose name matches one of the patterns, plus their parents+and subaccounts. Eg, adding the pattern @o@ to the first example gives:++@+ $ hledger -f sample.journal balance o+                  $1  expenses:food+                 $-2  income+                 $-1    gifts+                 $-1    salary+--------------------+                 $-1+@++* The @o@ pattern matched @food@ and @income@, so they are shown.++* @food@'s parent (@expenses@) is shown even though the pattern didn't+  match it, to clarify the hierarchy. The usual eliding rules cause it to be elided here.++* @income@'s subaccounts are also shown.++/Multi-column balance report/++hledger's balance command will show multiple columns when a reporting+interval is specified (eg with @--monthly@), one column for each sub-period.++There are three kinds of multi-column balance report, indicated by the heading:++* A \"period balance\" (or \"flow\") report (the default) shows the change of account+  balance in each period, which is equivalent to the sum of postings in each+  period. Here, checking's balance increased by 10 in Feb:++  > Change of balance (flow):+  >+  >                  Jan   Feb   Mar+  > assets:checking   20    10    -5++* A \"cumulative balance\" report (with @--cumulative@) shows the accumulated ending balance+  across periods, starting from zero at the report's start date.+  Here, 30 is the sum of checking postings during Jan and Feb:++  > Ending balance (cumulative):+  >+  >                  Jan   Feb   Mar+  > assets:checking   20    30    25++* A \"historical balance\" report (with @--historical/-H@) also shows ending balances,+  but it includes the starting balance from any postings before the report start date.+  Here, 130 is the balance from all checking postings at the end of Feb, including+  pre-Jan postings which created a starting balance of 100:++  > Ending balance (historical):+  >+  >                  Jan   Feb   Mar+  > assets:checking  120   130   125++/Eliding and omitting, 2/++Here's a (imperfect?) specification for the eliding/omitting behaviour:++* Each account is normally displayed on its own line.++* An account less deep than the report's max depth, with just one+interesting subaccount, and the same balance as the subaccount, is+non-interesting, and prefixed to the subaccount's line, unless+@--no-elide@ is in effect.++* An account with a zero inclusive balance and less than two interesting+subaccounts is not displayed at all, unless @--empty@ is in effect.++* Multi-column balance reports show full account names with no eliding+  (like @--flat@). Accounts (and periods) are omitted as described below.++/Which accounts to show in balance reports/++By default:++* single-column: accounts with non-zero balance in report period.+                 (With @--flat@: accounts with non-zero balance and postings.)++* periodic:      accounts with postings and non-zero period balance in any period++* cumulative:    accounts with non-zero cumulative balance in any period++* historical:    accounts with non-zero historical balance in any period++With @-E/--empty@:++* single-column: accounts with postings in report period++* periodic:      accounts with postings in report period++* cumulative:    accounts with postings in report period++* historical:    accounts with non-zero starting balance ++                 accounts with postings in report period++/Which periods (columns) to show in balance reports/++An empty period/column is one where no report account has any postings.+A zero period/column is one where no report account has a non-zero period balance.++Currently,++by default:++* single-column: N/A++* periodic:      all periods within the overall report period,+                 except for leading and trailing empty periods++* cumulative:    all periods within the overall report period,+                 except for leading and trailing empty periods++* historical:    all periods within the overall report period,+                 except for leading and trailing empty periods++With @-E/--empty@:++* single-column: N/A++* periodic:      all periods within the overall report period++* cumulative:    all periods within the overall report period++* historical:    all periods within the overall report period++/What to show in empty cells/++An empty periodic balance report cell is one which has no corresponding postings.+An empty cumulative/historical balance report cell is one which has no correponding+or prior postings, ie the account doesn't exist yet.+Currently, empty cells show 0.++-}++{-# LANGUAGE OverloadedStrings #-}++module Hledger.Cli.Commands.Balance (+  balancemode+ ,balance+ ,balanceReportAsText+ ,balanceReportItemAsText+ ,multiBalanceReportAsText+ ,multiBalanceReportAsCsv+ ,renderBalanceReportTable+ ,balanceReportAsTable+ ,tests_Hledger_Cli_Commands_Balance+) where++import Data.List (intercalate)+import Data.Maybe+-- import Data.Monoid+import qualified Data.Text as T+import System.Console.CmdArgs.Explicit as C+import Text.CSV+import Test.HUnit+import Text.Printf (printf)+import Text.Tabular as T+import Text.Tabular.AsciiWide++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.Utils+++-- | Command line options for this command.+balancemode = (defCommandMode $ ["balance"] ++ aliases) { -- also accept but don't show the common bal alias+  modeHelp = "show accounts and balances" `withAliases` aliases+ ,modeGroupFlags = C.Group {+     groupUnnamed = [+      flagNone ["change"] (\opts -> setboolopt "change" opts)+        "show balance change in each period (default)"+     ,flagNone ["cumulative"] (\opts -> setboolopt "cumulative" opts)+        "show balance change accumulated across periods (in multicolumn reports)"+     ,flagNone ["historical","H"] (\opts -> setboolopt "historical" opts)+        "show historical ending balance in each period (includes postings before report start date)\n "+     ,flagNone ["tree"] (\opts -> setboolopt "tree" opts) "show accounts as a tree; amounts include subaccounts (default in simple reports)"+     ,flagNone ["flat"] (\opts -> setboolopt "flat" opts) "show accounts as a list; amounts exclude subaccounts except when account is depth-clipped (default in multicolumn reports)\n "+     ,flagNone ["average","A"] (\opts -> setboolopt "average" opts) "show a row average column (in multicolumn reports)"+     ,flagNone ["row-total","T"] (\opts -> setboolopt "row-total" opts) "show a row total column (in multicolumn reports)"+     ,flagNone ["no-total","N"] (\opts -> setboolopt "no-total" opts) "omit the final total row"+     ,flagReq  ["drop"] (\s opts -> Right $ setopt "drop" s opts) "N" "omit N leading account name parts (in flat mode)"+     ,flagNone ["no-elide"] (\opts -> setboolopt "no-elide" opts) "don't squash boring parent accounts (in tree mode)"+     ,flagReq  ["format"] (\s opts -> Right $ setopt "format" s opts) "FORMATSTR" "use this custom line format (in simple reports)"+     ,flagNone ["pretty-tables"] (\opts -> setboolopt "pretty-tables" opts) "use unicode when displaying tables"+     ,flagNone ["sort-amount","S"] (\opts -> setboolopt "sort-amount" opts) "sort by amount instead of account name"+     ]+     ++ outputflags+    ,groupHidden = []+    ,groupNamed = [generalflagsgroup1]+    }+ }+  where aliases = ["b","bal"]++-- | The balance command, prints a balance report.+balance :: CliOpts -> Journal -> IO ()+balance opts@CliOpts{reportopts_=ropts} j = do+  d <- getCurrentDay+  case lineFormatFromOpts ropts of+    Left err -> error' $ unlines [err]+    Right _ -> do+      let format   = outputFormatFromOpts opts+          interval = interval_ ropts+      -- XXX shenanigans: use singleBalanceReport or multiBalanceReport when we must, +      -- ie when there's a report interval, or when --historical or --cumulative +      -- are used (balanceReport doesn't handle those).+      -- Otherwise prefer the older balanceReport since it can elide boring parents.+      -- See also compoundBalanceCommandSingleColumnReport, singleBalanceReport etc.+      case interval of+        NoInterval -> do+          let report+                -- For --historical/--cumulative, we must use multiBalanceReport.+                -- (This forces --no-elide.)+                | balancetype_ ropts `elem` [HistoricalBalance, CumulativeChange]+                  = let ropts' | flat_ ropts = ropts+                               | otherwise   = ropts{accountlistmode_=ALTree}+                    in singleBalanceReport ropts' (queryFromOpts d ropts) j+                | otherwise = balanceReport ropts (queryFromOpts d ropts) j+              render = case format of+                "csv" -> \ropts r -> (++ "\n") $ printCSV $ balanceReportAsCsv ropts r+                _     -> balanceReportAsText+          writeOutput opts $ render ropts report+        _ -> do+          let report = multiBalanceReport ropts (queryFromOpts d ropts) j+              render = case format of+                "csv" -> \ropts r -> (++ "\n") $ printCSV $ multiBalanceReportAsCsv ropts r+                _     -> multiBalanceReportAsText+          writeOutput opts $ render ropts report++-- single-column balance reports++-- | Find the best commodity to convert to when asked to show the+-- market value of this commodity on the given date. That is, the one+-- in which it has most recently been market-priced, ie the commodity+-- mentioned in the most recent applicable historical price directive+-- before this date.+-- defaultValuationCommodity :: Journal -> Day -> CommoditySymbol -> Maybe CommoditySymbol+-- defaultValuationCommodity j d c = mpamount <$> commodityValue j d c++-- | Render a single-column balance report as CSV.+balanceReportAsCsv :: ReportOpts -> BalanceReport -> CSV+balanceReportAsCsv opts (items, total) =+  ["account","balance"] :+  [[T.unpack a, showMixedAmountOneLineWithoutPrice b] | (a, _, _, b) <- items]+  +++  if no_total_ opts+  then []+  else [["total", showMixedAmountOneLineWithoutPrice total]]++-- | Render a single-column balance report as plain text.+balanceReportAsText :: ReportOpts -> BalanceReport -> String+balanceReportAsText opts ((items, total)) = unlines $ concat lines ++ t+  where+      fmt = lineFormatFromOpts opts+      lines = case fmt of+                Right fmt -> map (balanceReportItemAsText opts fmt) items+                Left err  -> [[err]]+      t = if no_total_ opts+           then []+           else+             case fmt of+               Right fmt ->+                let+                  -- abuse renderBalanceReportItem to render the total with similar format+                  acctcolwidth = maximum' [T.length fullname | (fullname, _, _, _) <- items]+                  totallines = map rstrip $ renderBalanceReportItem opts fmt (T.replicate (acctcolwidth+1) " ", 0, total)+                  -- with a custom format, extend the line to the full report width;+                  -- otherwise show the usual 20-char line for compatibility+                  overlinewidth | isJust (format_ opts) = maximum' $ map length $ concat lines+                                | otherwise             = defaultTotalFieldWidth+                  overline   = replicate overlinewidth '-'+                in overline : totallines+               Left _ -> []++tests_balanceReportAsText = [+  "balanceReportAsText" ~: do+  -- "unicode in balance layout" ~: do+    j <- readJournal'+      "2009/01/01 * медвежья шкура\n  расходы:покупки  100\n  актив:наличные\n"+    let opts = defreportopts+    balanceReportAsText opts (balanceReport opts (queryFromOpts (parsedate "2008/11/26") opts) j) `is`+      unlines+      ["                -100  актив:наличные"+      ,"                 100  расходы:покупки"+      ,"--------------------"+      ,"                   0"+      ]+ ]++{-+:r+This implementation turned out to be a bit convoluted but implements the following algorithm for formatting:++- If there is a single amount, print it with the account name directly:+- Otherwise, only print the account name on the last line.++    a         USD 1   ; Account 'a' has a single amount+              EUR -1+    b         USD -1  ; Account 'b' has two amounts. The account name is printed on the last line.+-}+-- | Render one balance report line item as plain text suitable for console output (or+-- whatever string format is specified). Note, prices will not be rendered, and+-- differently-priced quantities of the same commodity will appear merged.+-- The output will be one or more lines depending on the format and number of commodities.+balanceReportItemAsText :: ReportOpts -> StringFormat -> BalanceReportItem -> [String]+balanceReportItemAsText opts fmt (_, accountName, depth, amt) =+  renderBalanceReportItem opts fmt (+    maybeAccountNameDrop opts accountName,+    depth,+    normaliseMixedAmountSquashPricesForDisplay amt+    )++-- | Render a balance report item using the given StringFormat, generating one or more lines of text.+renderBalanceReportItem :: ReportOpts -> StringFormat -> (AccountName, Int, MixedAmount) -> [String]+renderBalanceReportItem opts fmt (acctname, depth, total) =+  lines $+  case fmt of+    OneLine comps       -> concatOneLine      $ render1 comps+    TopAligned comps    -> concatBottomPadded $ render comps+    BottomAligned comps -> concatTopPadded    $ render comps+  where+    render1 = map (renderComponent1 opts (acctname, depth, total))+    render  = map (renderComponent opts (acctname, depth, total))++defaultTotalFieldWidth = 20++-- | Render one StringFormat component for a balance report item.+renderComponent :: ReportOpts -> (AccountName, Int, MixedAmount) -> StringFormatComponent -> String+renderComponent _ _ (FormatLiteral s) = s+renderComponent opts (acctname, depth, total) (FormatField ljust min max field) = case field of+  DepthSpacerField -> formatString ljust Nothing max $ replicate d ' '+                      where d = case min of+                                 Just m  -> depth * m+                                 Nothing -> depth+  AccountField     -> formatString ljust min max (T.unpack acctname)+  TotalField       -> fitStringMulti min max True False $ showamt total+    where+      showamt | color_ opts = cshowMixedAmountWithoutPrice+              | otherwise   = showMixedAmountWithoutPrice+  _                -> ""++-- | Render one StringFormat component for a balance report item.+-- This variant is for use with OneLine string formats; it squashes+-- any multi-line rendered values onto one line, comma-and-space separated,+-- while still complying with the width spec.+renderComponent1 :: ReportOpts -> (AccountName, Int, MixedAmount) -> StringFormatComponent -> String+renderComponent1 _ _ (FormatLiteral s) = s+renderComponent1 opts (acctname, depth, total) (FormatField ljust min max field) = case field of+  AccountField     -> formatString ljust min max ((intercalate ", " . lines) (indented (T.unpack acctname)))+                      where+                        -- better to indent the account name here rather than use a DepthField component+                        -- so that it complies with width spec. Uses a fixed indent step size.+                        indented = ((replicate (depth*2) ' ')++)+  TotalField       -> fitStringMulti min max True False $ ((intercalate ", " . map strip . lines) (showamt total))+    where+      showamt | color_ opts = cshowMixedAmountWithoutPrice+              | otherwise   = showMixedAmountWithoutPrice +  _                -> ""++-- multi-column balance reports++-- | Render a multi-column balance report as CSV.+multiBalanceReportAsCsv :: ReportOpts -> MultiBalanceReport -> CSV+multiBalanceReportAsCsv opts (MultiBalanceReport (colspans, items, (coltotals,tot,avg))) =+  ("account" : "short account" : "indent" : map showDateSpan colspans+   ++ (if row_total_ opts then ["total"] else [])+   ++ (if average_ opts then ["average"] else [])+  ) :+  [T.unpack a : T.unpack a' : show i :+   map showMixedAmountOneLineWithoutPrice+   (amts+    ++ (if row_total_ opts then [rowtot] else [])+    ++ (if average_ opts then [rowavg] else []))+  | (a,a',i, amts, rowtot, rowavg) <- items]+  +++  if no_total_ opts+  then []+  else [["totals", "", ""]+        ++ map showMixedAmountOneLineWithoutPrice (+           coltotals+           ++ (if row_total_ opts then [tot] else [])+           ++ (if average_ opts then [avg] else [])+           )]++-- | Render a multi-column balance report as plain text suitable for console output.+multiBalanceReportAsText :: ReportOpts -> MultiBalanceReport -> String+multiBalanceReportAsText opts r =+    printf "%s in %s:\n\n" typeStr (showDateSpan $ multiBalanceReportSpan r)+      ++ renderBalanceReportTable opts tabl+  where+    tabl = balanceReportAsTable opts r+    typeStr :: String+    typeStr = case balancetype_ opts of+        PeriodChange -> "Balance changes"+        CumulativeChange -> "Ending balances (cumulative)"+        HistoricalBalance -> "Ending balances (historical)"++-- | Given a table representing a multi-column balance report (for example,+-- made using 'balanceReportAsTable'), render it in a format suitable for+-- console output.+renderBalanceReportTable :: ReportOpts -> Table String String MixedAmount -> String+renderBalanceReportTable (ReportOpts { pretty_tables_ = pretty, color_=usecolor }) = +  unlines+  . addtrailingblank+  . trimborder +  . lines+  . render pretty id id showamt+  . align+  where+    addtrailingblank = (++[""])+    trimborder = drop 1 . init . map (drop 1 . init)+    align (Table l t d) = Table l' t d+      where+        acctswidth = maximum' $ map strWidth (headerContents l)+        l'         = padRightWide acctswidth <$> l+    showamt | usecolor  = cshowMixedAmountOneLineWithoutPrice+            | otherwise = showMixedAmountOneLineWithoutPrice++-- | Build a 'Table' from a multi-column balance report.+balanceReportAsTable :: ReportOpts -> MultiBalanceReport -> Table String String MixedAmount+balanceReportAsTable opts (MultiBalanceReport (colspans, items, (coltotals,tot,avg))) =+   addtotalrow $ Table+     (T.Group NoLine $ map Header accts)+     (T.Group NoLine $ map Header colheadings)+     (map rowvals items)+  where+    mkDate = case balancetype_ opts of+       PeriodChange -> showDateSpan+       _            -> maybe "" (showDate . prevday) . spanEnd+    colheadings = map mkDate colspans+                  ++ (if row_total_ opts then ["  Total"] else [])+                  ++ (if average_ opts then ["Average"] else [])+    accts = map renderacct items+    renderacct (a,a',i,_,_,_)+      | tree_ opts = replicate ((i-1)*2) ' ' ++ T.unpack a'+      | otherwise  = T.unpack $ maybeAccountNameDrop opts a+    rowvals (_,_,_,as,rowtot,rowavg) = as+                             ++ (if row_total_ opts then [rowtot] else [])+                             ++ (if average_ opts then [rowavg] else [])+    addtotalrow | no_total_ opts = id+                | otherwise      = (+----+ (row "" $+                                    coltotals+                                    ++ (if row_total_ opts && not (null coltotals) then [tot] else [])+                                    ++ (if average_ opts && not (null coltotals)   then [avg] else [])+                                    ))++-- | Figure out the overall date span of a multicolumn balance report.+multiBalanceReportSpan :: MultiBalanceReport -> DateSpan+multiBalanceReportSpan (MultiBalanceReport ([], _, _))       = DateSpan Nothing Nothing+multiBalanceReportSpan (MultiBalanceReport (colspans, _, _)) = DateSpan (spanStart $ head colspans) (spanEnd $ last colspans)+++tests_Hledger_Cli_Commands_Balance = TestList+  tests_balanceReportAsText

@@ -0,0 +1,47 @@+{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}+{-|++The @balancesheet@ command prints a simple balance sheet.++-}++module Hledger.Cli.Commands.Balancesheet (+  balancesheetmode+ ,balancesheet+ ,tests_Hledger_Cli_Commands_Balancesheet+) where++import Data.String.Here+import System.Console.CmdArgs.Explicit+import Test.HUnit++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.CompoundBalanceCommand++balancesheetSpec = CompoundBalanceCommandSpec {+  cbcname     = "balancesheet",+  cbcaliases  = ["bs"],+  cbchelp     = [here|+This command displays a simple balance sheet, showing historical ending+balances of asset and liability accounts (ignoring any report begin date). +It assumes that these accounts are under a top-level `asset` or `liability`+account (case insensitive, plural forms also  allowed).+  |],+  cbctitle    = "Balance Sheet",+  cbcqueries  = [ ("Assets"     , journalAssetAccountQuery,     Just NormalPositive),+                  ("Liabilities", journalLiabilityAccountQuery, Just NormalNegative)+                ],+  cbctype     = HistoricalBalance+}++balancesheetmode :: Mode RawOpts+balancesheetmode = compoundBalanceCommandMode balancesheetSpec++balancesheet :: CliOpts -> Journal -> IO ()+balancesheet = compoundBalanceCommand balancesheetSpec++tests_Hledger_Cli_Commands_Balancesheet :: Test+tests_Hledger_Cli_Commands_Balancesheet = TestList+ [+ ]

@@ -0,0 +1,40 @@+{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}+{-|++The @balancesheetequity@ command prints a simple balance sheet.++-}++module Hledger.Cli.Commands.Balancesheetequity (+  balancesheetequitymode+ ,balancesheetequity+) where++import Data.String.Here+import System.Console.CmdArgs.Explicit++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.CompoundBalanceCommand++balancesheetequitySpec = CompoundBalanceCommandSpec {+  cbcname     = "balancesheetequity",+  cbcaliases  = ["bse"],+  cbchelp     = [here|This command displays a simple balance sheet, showing historical ending+balances of asset, liability and equity accounts (ignoring any report begin date). +It assumes that these accounts are under a top-level `asset`, `liability` and `equity`+account (plural forms also  allowed).+  |],+  cbctitle    = "Balance Sheet With Equity",+  cbcqueries  = [("Assets",      journalAssetAccountQuery,     Just NormalPositive),+                 ("Liabilities", journalLiabilityAccountQuery, Just NormalNegative),+                 ("Equity",      journalEquityAccountQuery,    Just NormalNegative)+              ],+  cbctype     = HistoricalBalance+}++balancesheetequitymode :: Mode RawOpts+balancesheetequitymode = compoundBalanceCommandMode balancesheetequitySpec++balancesheetequity :: CliOpts -> Journal -> IO ()+balancesheetequity = compoundBalanceCommand balancesheetequitySpec

@@ -0,0 +1,48 @@+{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}+{-|++The @cashflow@ command prints a simplified cashflow statement.  It just+shows the change in all "cash" accounts for the period (without the+traditional segmentation into operating, investing, and financing+cash flows.)++-}++module Hledger.Cli.Commands.Cashflow (+  cashflowmode+ ,cashflow+ ,tests_Hledger_Cli_Commands_Cashflow+) where++import Data.String.Here+import System.Console.CmdArgs.Explicit+import Test.HUnit++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.CompoundBalanceCommand++cashflowSpec = CompoundBalanceCommandSpec {+  cbcname     = "cashflow",+  cbcaliases  = ["cf"],+  cbchelp     = [here|+This command displays a simple cashflow statement, showing changes+in "cash" accounts. It assumes that these accounts are under a top-level +`asset` account (case insensitive, plural forms also allowed) and do not +contain `receivable` or `A/R` in their name. +  |],+  cbctitle    = "Cashflow Statement",+  cbcqueries  = [("Cash flows", journalCashAccountQuery, Just NormalPositive)],+  cbctype     = PeriodChange+}++cashflowmode :: Mode RawOpts+cashflowmode = compoundBalanceCommandMode cashflowSpec++cashflow :: CliOpts -> Journal -> IO ()+cashflow = compoundBalanceCommand cashflowSpec++tests_Hledger_Cli_Commands_Cashflow :: Test+tests_Hledger_Cli_Commands_Cashflow = TestList+ [+ ]

@@ -0,0 +1,85 @@+{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Checkdates (+  checkdatesmode+ ,checkdates+ ,tests_Hledger_Cli_Commands_Checkdates+) where++import Data.String.Here+import Hledger+import Hledger.Cli.CliOptions+import System.Console.CmdArgs.Explicit+import Test.HUnit+import Text.Printf++-- checkdatesmode :: Mode RawOpts+checkdatesmode = hledgerCommandMode+  [here| check-dates+Check that transactions are sorted by increasing date.+With --date2, checks secondary dates instead.+With --strict, dates must also be unique.+With a query, only matched transactions' dates are checked.+Reads the default journal file, or another specified with -f.+FLAGS+  |]+  [flagNone ["strict"] (\opts -> setboolopt "strict" opts) "makes date comparing strict"]+  [generalflagsgroup1]+  []+  ([], Just $ argsFlag "[QUERY]")++checkdates :: CliOpts -> Journal -> IO ()+checkdates CliOpts{rawopts_=rawopts,reportopts_=ropts} j = do+  d <- getCurrentDay+  let ropts_ = ropts{accountlistmode_=ALFlat}+  let q = queryFromOpts d ropts_+  let ts = filter (q `matchesTransaction`) $+           jtxns $ journalSelectingAmountFromOpts ropts j+  let strict = boolopt "strict" rawopts+  let date = transactionDateFn ropts+  let compare a b =+        if strict+        then date a <  date b+        else date a <= date b+  case checkTransactions compare ts of+   FoldAcc{fa_previous=Nothing} -> putStrLn "ok (empty journal)"+   FoldAcc{fa_error=Nothing}    -> putStrLn "ok"+   FoldAcc{fa_error=Just error, fa_previous=Just previous} ->+    putStrLn $ printf ("ERROR: transaction out of%s date order"+     ++ "\nPrevious date: %s"+     ++ "\nDate: %s"+     ++ "\nLocation: %s"+     ++ "\nTransaction:\n\n%s")+     (if strict then " STRICT" else "")+     (show $ date previous)+     (show $ date error)+     (show $ tsourcepos error)+     (showTransactionUnelided error)++data FoldAcc a b = FoldAcc+ { fa_error    :: Maybe a+ , fa_previous :: Maybe b+ }++foldWhile :: (a -> FoldAcc a b -> FoldAcc a b) -> FoldAcc a b -> [a] -> FoldAcc a b+foldWhile _ acc [] = acc+foldWhile fold acc (a:as) =+  case fold a acc of+   acc@FoldAcc{fa_error=Just _} -> acc+   acc -> foldWhile fold acc as++checkTransactions :: (Transaction -> Transaction -> Bool)+ -> [Transaction] -> FoldAcc Transaction Transaction+checkTransactions compare ts =+  foldWhile fold FoldAcc{fa_error=Nothing, fa_previous=Nothing} ts+  where+    fold current acc@FoldAcc{fa_previous=Nothing} = acc{fa_previous=Just current}+    fold current acc@FoldAcc{fa_previous=Just previous} =+      if compare previous current+      then acc{fa_previous=Just current}+      else acc{fa_error=Just current}++tests_Hledger_Cli_Commands_Checkdates :: Test+tests_Hledger_Cli_Commands_Checkdates = TestList+ [+ ]

@@ -0,0 +1,49 @@+{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Checkdupes (+  checkdupesmode+ ,checkdupes+) +where++import Data.Function+import Data.List+import Data.String.Here+import qualified Data.Text as T+import Hledger+import Hledger.Cli.CliOptions+import System.Console.CmdArgs.Explicit+import Text.Printf++checkdupesmode :: Mode RawOpts+checkdupesmode = hledgerCommandMode+  [here| check-dupes+Reports account names having the same leaf but different prefixes. +In other words, two or more leaves that are categorized differently.+Reads the default journal file, or another specified as an argument.+An example: http://stefanorodighiero.net/software/hledger-dupes.html+  |]+  []+  [generalflagsgroup1]+  []+  ([], Nothing)++checkdupes _opts j = mapM_ render $ checkdupes' $ accountsNames j++accountsNames :: Journal -> [(String, AccountName)]+accountsNames j = map leafAndAccountName as+  where leafAndAccountName a = (T.unpack $ accountLeafName a, a)+        ps = journalPostings j+        as = nub $ sort $ map paccount ps++checkdupes' :: (Ord k, Eq k) => [(k, v)] -> [(k, [v])]+checkdupes' l = zip dupLeafs dupAccountNames+  where dupLeafs = map (fst . head) d+        dupAccountNames = map (map snd) d+        d = dupes' l+        dupes' = filter ((> 1) . length)+          . groupBy ((==) `on` fst)+          . sortBy (compare `on` fst)++render :: (String, [AccountName]) -> IO ()+render (leafName, accountNameL) = printf "%s as %s\n" leafName (concat $ intersperse ", " (map T.unpack accountNameL))

@@ -0,0 +1,85 @@+{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Equity (+  equitymode+ ,equity+) +where++import Data.Maybe+import Data.String.Here+import Data.Time.Calendar+import Hledger+import Hledger.Cli.CliOptions++equitymode = hledgerCommandMode+  [here| equity+Print a "closing balances" transaction that brings all accounts (or with+query arguments, just the matched accounts) to a zero balance, followed by an+opposite "opening balances" transaction that restores the balances from zero.+Such transactions can be useful, eg, for bringing account balances across+file boundaries.++FLAGS++The opening balances transaction is useful to carry over+asset/liability balances if you choose to start a new journal file,+eg at the beginning of the year.++The closing balances transaction is useful to zero out balances in+the old file, which gives you the option of reporting on both files+at once while still seeing correct balances.++Balances are calculated, and the opening transaction is dated, as of+the report end date, which you should specify with -e or date: (and+the closing transaction is dated one day earlier). If a report end+date is not specified, it defaults to today.++Example:+```shell+$ hledger equity -f 2015.journal -e 2016/1/1 assets liabilities >>2015.journal+# move the opening balances transaction to 2016.journal+$ hledger -f 2015.journal bal assets liabilities not:desc:closing # shows correct 2015 balances+$ hledger -f 2016.journal bal assets liabilities                  # shows correct 2016 balances+$ hledger -f 2015.journal -f 2016.journal bal assets liabilities  # still shows correct 2016 balances+```+Open question: how to handle txns spanning a file boundary ? Eg:+```journal+2015/12/30 * food+    expenses:food:dining   $10+    assets:bank:checking  -$10  ; date:2016/1/4+```+This command might or might not have some connection to the concept of+"closing the books" in accounting.+  |]+  []+  [generalflagsgroup1]+  []+  ([], Just $ argsFlag "[QUERY]")++equity CliOpts{reportopts_=ropts} j = do+  today <- getCurrentDay+  let ropts_ = ropts{accountlistmode_=ALFlat}+      q = queryFromOpts today ropts_+      (acctbals,_) = balanceReport ropts_ q j+      balancingamt = negate $ sum $ map (\(_,_,_,b) -> normaliseMixedAmountSquashPricesForDisplay b) acctbals+      ps = [posting{paccount=a+                   ,pamount=mixed [b]+                   ,pbalanceassertion=Just b+                   }+           |(a,_,_,mb) <- acctbals+           ,b <- amounts $ normaliseMixedAmountSquashPricesForDisplay mb+           ]+           ++ [posting{paccount="equity:opening balances", pamount=balancingamt}]+      enddate = fromMaybe today $ queryEndDate (date2_ ropts_) q+      nps = [posting{paccount=a+                    ,pamount=mixed [negate b]+                    ,pbalanceassertion=Just b{aquantity=0}+                    }+            |(a,_,_,mb) <- acctbals+            ,b <- amounts $ normaliseMixedAmountSquashPricesForDisplay mb+            ]+           ++ [posting{paccount="equity:closing balances", pamount=negate balancingamt}]+  putStr $ showTransaction (nulltransaction{tdate=addDays (-1) enddate, tdescription="closing balances", tpostings=nps})+  putStr $ showTransaction (nulltransaction{tdate=enddate, tdescription="opening balances", tpostings=ps})

@@ -0,0 +1,84 @@+{-|++The help command.++|-}+--TODO rename manuals+--TODO substring matching++{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Help (++   helpmode+  ,help'++  ) where++import Prelude ()+import Prelude.Compat+import Data.Char+import Data.List+import Data.Maybe+import Data.String.Here+import Safe+import System.Console.CmdArgs.Explicit+import System.Environment+import System.IO++import Hledger.Data.RawOptions+import Hledger.Data.Types+import Hledger.Cli.CliOptions+import Hledger.Cli.DocFiles+--import Hledger.Utils.Debug++helpmode = (defCommandMode $ ["help"] ++ aliases) {+  modeHelp = "show any of the hledger manuals, choosing the most suitable viewer (info, man, a pager, or stdout). With no argument, list the manuals." `withAliases` aliases+ ,modeGroupFlags = Group {+     groupUnnamed = [+      flagNone ["info"]  (setboolopt "info")  "show the manual with info"+     ,flagNone ["man"]   (setboolopt "man")   "show the manual with man"+     ,flagNone ["pager"] (setboolopt "pager") "show the manual with $PAGER or less"+     ,flagNone ["cat"]   (setboolopt "cat")   "show the manual on stdout"+     ,flagNone ["help","h"]  (setboolopt "help")  "show this help"+     ]+    ,groupHidden = []+    ,groupNamed = []+    }+ ,modeArgs = ([], Just $ argsFlag "[MANUAL]")+}+  where aliases = []++-- | List or display one of the hledger manuals in various formats. +-- You can select a docs viewer with one of the `--info`, `--man`, `--pager`, `--cat` flags.+-- Otherwise it will use the first available of: info, man, $PAGER, less, stdout+-- (and always stdout if output is non-interactive). +help' :: CliOpts -> Journal -> IO ()+help' opts _ = do+  exes <- likelyExecutablesInPath+  pagerprog <- fromMaybe "less" <$> lookupEnv "PAGER"+  interactive <- hIsTerminalDevice stdout+  let+    args = take 1 $ listofstringopt "args" $ rawopts_ opts+    topic = case args of+              [pat] -> headMay [t | t <- docTopics, map toLower pat `isInfixOf` t]+              _   -> Nothing+    [info, man, pager, cat] = +      [runInfoForTopic, runManForTopic, runPagerForTopic pagerprog, printHelpForTopic]+    viewer+      | boolopt "info"  $ rawopts_ opts = info+      | boolopt "man"   $ rawopts_ opts = man+      | boolopt "pager" $ rawopts_ opts = pager+      | boolopt "cat"   $ rawopts_ opts = cat+      | not interactive                 = cat +      | "info"    `elem` exes           = info+      | "man"     `elem` exes           = man+      | pagerprog `elem` exes           = pager+      | otherwise                       = cat +  case topic of+    Nothing -> putStrLn $ [here|+Please choose a manual by typing "hledger help MANUAL" (any substring is ok).+A viewer (info, man, a pager, or stdout) will be auto-selected,+or type "hledger help -h" to see options. Manuals available:+|] ++ "\n " ++ intercalate " " docTopics+    Just t  -> viewer t

@@ -0,0 +1,60 @@+{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Import (+  importmode+ ,importcmd+) +where++import Control.Monad+import Data.List+import Data.Ord+import Data.String.Here+import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.Commands.Add (journalAddTransaction)+-- import Hledger.Cli.Commands.Print (print')+import System.Console.CmdArgs.Explicit+import Text.Printf++importmode = hledgerCommandMode+  [here| import+Read new transactions added to each FILE since last run, and add them to+the main journal file. Or with --dry-run, just print the transactions +that would be added.++Input files are provided as arguments, or glob patterns. So eg to add new +transactions from all CSV files to the main journal: hledger import *.csv++New transactions are detected like print --new (using .latest.FILE state files)++FLAGS+  |]+  [flagNone ["dry-run"] (\opts -> setboolopt "dry-run" opts) "just show the transactions to be imported"] +  [generalflagsgroup1]+  []+  ([], Just $ argsFlag "FILE [...]")++importcmd opts@CliOpts{rawopts_=rawopts,inputopts_=iopts} j = do+  let+    inputfiles = listofstringopt "args" rawopts+    dryrun = boolopt "dry-run" rawopts+    iopts' = iopts{new_=True, new_save_=not dryrun}+  case inputfiles of+    [] -> error' "please provide one or more input files as arguments"+    fs -> do+      enewj <- readJournalFilesWithOpts iopts' fs+      case enewj of+        Left e     -> error' e +        Right newj ->+          case sortBy (comparing tdate) $ jtxns newj of+            [] -> putStrLn "no new transactions"+            newts | dryrun -> do+              printf "would import %d new transactions:\n\n" (length newts)+              -- TODO how to force output here ?+              -- length (jtxns newj) `seq` print' opts{rawopts_=("explicit",""):rawopts} newj+              mapM_ (putStr . showTransactionUnelided) newts+            newts -> do+              foldM (flip journalAddTransaction opts) j newts  -- gets forced somehow.. (how ?)+              printf "imported %d new transactions\n" (length newts)

@@ -0,0 +1,47 @@+{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings, NoCPP #-}+{-|++The @incomestatement@ command prints a simple income statement (profit & loss report).++-}++module Hledger.Cli.Commands.Incomestatement (+  incomestatementmode+ ,incomestatement+ ,tests_Hledger_Cli_Commands_Incomestatement+) where++import Data.String.Here+import System.Console.CmdArgs.Explicit+import Test.HUnit++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.CompoundBalanceCommand++incomestatementSpec = CompoundBalanceCommandSpec {+  cbcname     = "incomestatement",+  cbcaliases  = ["is"],+  cbchelp     = [here|+This command displays a simple income statement, showing revenues+and expenses during a period. It assumes that these accounts are under a +top-level `revenue` or `income` or `expense` account (case insensitive,+plural forms also allowed).+  |],+  cbctitle    = "Income Statement",+  cbcqueries  = [ ("Revenues", journalIncomeAccountQuery, Just NormalNegative),+                  ("Expenses", journalExpenseAccountQuery, Just NormalPositive)+                ],+  cbctype     = PeriodChange+}++incomestatementmode :: Mode RawOpts+incomestatementmode = compoundBalanceCommandMode incomestatementSpec++incomestatement :: CliOpts -> Journal -> IO ()+incomestatement = compoundBalanceCommand incomestatementSpec++tests_Hledger_Cli_Commands_Incomestatement :: Test+tests_Hledger_Cli_Commands_Incomestatement = TestList+ [+ ]

@@ -0,0 +1,84 @@+{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Prices (+  pricesmode+ ,prices+) +where++import Data.Maybe+import Data.List+import Data.String.Here+import qualified Data.Text as T+import Data.Time+import Hledger+import Hledger.Cli.CliOptions+import System.Console.CmdArgs.Explicit++pricesmode = hledgerCommandMode+  [here| prices+Print all market prices from the journal.+  |]+  [flagNone ["costs"] (setboolopt "costs") "print transaction prices from postings"+  ,flagNone ["inverted-costs"] (setboolopt "inverted-costs") "print transaction inverted prices from postings also"]+  [generalflagsgroup1]+  []+  ([], Nothing)++prices opts j = do+  -- XXX the original hledger-prices script always ignored assertions +  let cprices = concatMap postingCosts . allPostings $ j+      icprices = concatMap postingCosts . mapAmount invertPrice . allPostings $ j+      printPrices = mapM_ (putStrLn . showPrice)+      forBoolOpt opt | boolopt opt $ rawopts_ opts = id+                     | otherwise = const []+      allPrices = sortOn mpdate . concat $+          [ jmarketprices j+          , forBoolOpt "costs" cprices+          , forBoolOpt "inverted-costs" icprices+          ]+  +  printPrices allPrices++showPrice :: MarketPrice -> String+showPrice mp = unwords ["P", show $ mpdate mp, T.unpack . quoteCommoditySymbolIfNeeded $ mpcommodity mp, showAmountWithZeroCommodity $ mpamount mp]++divideAmount' :: Amount -> Quantity -> Amount+divideAmount' a d = a' where+    a' = (a `divideAmount` d) { astyle = style' }+    style' = (astyle a) { asprecision = precision' }+    extPrecision = (1+) . floor . logBase 10 $ (realToFrac d :: Double)+    precision' = extPrecision + asprecision (astyle a)++invertPrice :: Amount -> Amount+invertPrice a =+    case aprice a of+        NoPrice -> a+        UnitPrice pa -> invertPrice+            -- normalize to TotalPrice+            a { aprice = TotalPrice pa' } where+                pa' = (pa `divideAmount` (1 / aquantity a)) { aprice = NoPrice }+        TotalPrice pa ->+            a { aquantity = aquantity pa * signum (aquantity a), acommodity = acommodity pa, aprice = TotalPrice pa' } where+                pa' = pa { aquantity = abs $ aquantity a, acommodity = acommodity a, aprice = NoPrice, astyle = astyle a }++amountCost :: Day -> Amount -> Maybe MarketPrice+amountCost d a =+    case aprice a of+        NoPrice -> Nothing+        UnitPrice pa -> Just+            MarketPrice { mpdate = d, mpcommodity = acommodity a, mpamount = pa }+        TotalPrice pa -> Just+            MarketPrice { mpdate = d, mpcommodity = acommodity a, mpamount = pa `divideAmount'` abs (aquantity a) }++postingCosts :: Posting -> [MarketPrice]+postingCosts p = mapMaybe (amountCost date) . amounts $ pamount p  where+   date = fromMaybe (tdate . fromJust $ ptransaction p) $ pdate p++allPostings :: Journal -> [Posting]+allPostings = concatMap tpostings . jtxns++mapAmount :: (Amount -> Amount) -> [Posting] -> [Posting]+mapAmount f = map pf where+    pf p = p { pamount = mf (pamount p) }+    mf = mixed . map f . amounts

@@ -0,0 +1,180 @@+{-|++A ledger-compatible @print@ command.++-}++{-# LANGUAGE OverloadedStrings #-}++module Hledger.Cli.Commands.Print (+  printmode+ ,print'+ -- ,entriesReportAsText+ ,originalTransaction+ ,tests_Hledger_Cli_Commands_Print+)+where++import Data.Text (Text)+import qualified Data.Text as T+import System.Console.CmdArgs.Explicit+import Test.HUnit+import Text.CSV++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.Utils+import Hledger.Cli.Commands.Add ( transactionsSimilarTo )+++printmode = (defCommandMode $ ["print"] ++ aliases) {+  modeHelp = "show transaction journal entries, sorted by date. With --date2, sort by secondary date instead." `withAliases` aliases+ ,modeGroupFlags = Group {+     groupUnnamed = [+         let arg = "STR" in+         flagReq  ["match","m"] (\s opts -> Right $ setopt "match" s opts) arg+          ("show the transaction whose description is most similar to "++arg++", and is most recent")+        ,flagNone ["explicit","x"] (setboolopt "explicit")+          "show all amounts explicitly"+        ,flagNone ["new"] (setboolopt "new")+          "show only newer-dated transactions added in each file since last run"+        ]+        ++ outputflags+    ,groupHidden = []+    ,groupNamed = [generalflagsgroup1]+    }+ }+  where aliases = ["p","txns"]++-- | Print journal transactions in standard format.+print' :: CliOpts -> Journal -> IO ()+print' opts j = do+  case maybestringopt "match" $ rawopts_ opts of+    Nothing   -> printEntries opts j+    Just desc -> printMatch opts j $ T.pack desc++printEntries :: CliOpts -> Journal -> IO ()+printEntries opts@CliOpts{reportopts_=ropts} j = do+  d <- getCurrentDay+  let q = queryFromOpts d ropts+      fmt = outputFormatFromOpts opts+      (render, ropts') = case fmt of+        "csv" -> ((++"\n") . printCSV . entriesReportAsCsv, ropts{accountlistmode_=ALFlat})+        _     -> (entriesReportAsText opts,                 ropts)+  writeOutput opts $ render $ entriesReport ropts' q j++entriesReportAsText :: CliOpts -> EntriesReport -> String+entriesReportAsText opts = concatMap (showTransactionUnelided . gettxn) +  where+    gettxn | boolopt "explicit" $ rawopts_ opts = id                   -- use the fully inferred/explicit txn+           | otherwise                          = originalTransaction  -- use the original txn (more or less)++-- Replace this transaction's postings with the original postings if any, but keep the+-- current possibly rewritten account names.+originalTransaction t = t { tpostings = map originalPostingPreservingAccount $ tpostings t }++-- Get the original posting if any, but keep the current possibly rewritten account name.+originalPostingPreservingAccount p = (originalPosting p) { paccount = paccount p }++-- XXX+-- tests_showTransactions = [+--   "showTransactions" ~: do++--    -- "print expenses" ~:+--    do+--     let opts = defreportopts{query_="expenses"}+--     d <- getCurrentDay+--     showTransactions opts (queryFromOpts d opts) samplejournal `is` unlines+--      ["2008/06/03 * eat & shop"+--      ,"    expenses:food                $1"+--      ,"    expenses:supplies            $1"+--      ,"    assets:cash                 $-2"+--      ,""+--      ]++--   -- , "print report with depth arg" ~:+--    do+--     let opts = defreportopts{depth_=Just 2}+--     d <- getCurrentDay+--     showTransactions opts (queryFromOpts d opts) samplejournal `is` unlines+--       ["2008/01/01 income"+--       ,"    assets:bank:checking            $1"+--       ,"    income:salary                  $-1"+--       ,""+--       ,"2008/06/01 gift"+--       ,"    assets:bank:checking            $1"+--       ,"    income:gifts                   $-1"+--       ,""+--       ,"2008/06/03 * eat & shop"+--       ,"    expenses:food                $1"+--       ,"    expenses:supplies            $1"+--       ,"    assets:cash                 $-2"+--       ,""+--       ,"2008/12/31 * pay off"+--       ,"    liabilities:debts               $1"+--       ,"    assets:bank:checking           $-1"+--       ,""+--       ]+--  ]++entriesReportAsCsv :: EntriesReport -> CSV+entriesReportAsCsv txns =+  ["txnidx","date","date2","status","code","description","comment","account","amount","commodity","credit","debit","posting-status","posting-comment"] :+  concatMap transactionToCSV txns++-- | Generate one CSV record per posting, duplicating the common transaction fields.+-- The txnidx field (transaction index) allows postings to be grouped back into transactions.+transactionToCSV :: Transaction -> CSV+transactionToCSV t =+  map (\p -> show idx:date:date2:status:code:description:comment:p)+   (concatMap postingToCSV $ tpostings t)+  where+    idx = tindex t+    description = T.unpack $ tdescription t+    date = showDate (tdate t)+    date2 = maybe "" showDate (tdate2 t)+    status = show $ tstatus t+    code = T.unpack $ tcode t+    comment = chomp $ strip $ T.unpack $ tcomment t++postingToCSV :: Posting -> CSV+postingToCSV p =+  map (\(a@(Amount {aquantity=q,acommodity=c})) ->+    let a_ = a{acommodity=""} in+    let amount = showAmount a_ in+    let commodity = T.unpack c in+    let credit = if q < 0 then showAmount $ negate a_ else "" in+    let debit  = if q >= 0 then showAmount a_ else "" in+    account:amount:commodity:credit:debit:status:comment:[])+   amounts+  where+    Mixed amounts = pamount p+    status = show $ pstatus p+    account = showAccountName Nothing (ptype p) (paccount p)+    comment = chomp $ strip $ T.unpack $ pcomment p++-- --match++-- | Print the transaction most closely and recently matching a description+-- (and the query, if any).+printMatch :: CliOpts -> Journal -> Text -> IO ()+printMatch CliOpts{reportopts_=ropts} j desc = do+  d <- getCurrentDay+  let q = queryFromOpts d ropts+  case similarTransaction' j q desc of+                Nothing -> putStrLn "no matches found."+                Just t  -> putStr $ showTransactionUnelided t++  where+    -- Identify the closest recent match for this description in past transactions.+    similarTransaction' :: Journal -> Query -> Text -> Maybe Transaction+    similarTransaction' j q desc+      | null historymatches = Nothing+      | otherwise           = Just $ snd $ head historymatches+      where+        historymatches = transactionsSimilarTo j q desc++-- tests++tests_Hledger_Cli_Commands_Print = TestList []+  -- tests_showTransactions

@@ -0,0 +1,47 @@+{-# LANGUAGE QuasiQuotes #-}++{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Printunique (+  printuniquemode+ ,printunique+) +where++import Data.List+import Data.Ord+import Data.String.Here+import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.Commands.Print++printuniquemode = hledgerCommandMode+  [here| print-unique+Print transactions which do not reuse an already-seen description.++FLAGS++Example:+```shell+$ cat unique.journal+1/1 test+ (acct:one)  1+2/2 test+ (acct:two)  2+$ LEDGER_FILE=unique.journal hledger print-unique+(-f option not supported)+2015/01/01 test+    (acct:one)             1+```+  |]+  []+  [generalflagsgroup1]+  []+  ([], Nothing)++printunique opts j@Journal{jtxns=ts} = do+  print' opts j{jtxns=uniquify ts}+  where+    uniquify = nubBy (\t1 t2 -> thingToCompare t1 == thingToCompare t2) . sortBy (comparing thingToCompare)+    thingToCompare = tdescription+    -- thingToCompare = tdate

@@ -0,0 +1,204 @@+{-|++A ledger-compatible @register@ command.++-}++{-# LANGUAGE CPP, OverloadedStrings #-}++module Hledger.Cli.Commands.Register (+  registermode+ ,register+ ,postingsReportAsText+ ,postingsReportItemAsText+ -- ,showPostingWithBalanceForVty+ ,tests_Hledger_Cli_Commands_Register+) where++import Data.List+import Data.Maybe+-- import Data.Text (Text)+import qualified Data.Text as T+import System.Console.CmdArgs.Explicit+import Text.CSV+import Test.HUnit++import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.Utils+++registermode = (defCommandMode $ ["register"] ++ aliases) {+  modeHelp = "show postings and running total. With --date2, show and sort by secondary date instead." `withAliases` aliases+ ,modeGroupFlags = Group {+     groupUnnamed = [+      flagNone ["cumulative"]         (\opts -> setboolopt "change" opts)+        "show running total from report start date (default)"+     ,flagNone ["historical","H"] (\opts -> setboolopt "historical" opts)+        "show historical running total/balance (includes postings before report start date)\n "+     ,flagNone ["average","A"] (\opts -> setboolopt "average" opts)+        "show running average of posting amounts instead of total (implies --empty)"+     ,flagNone ["related","r"] (\opts -> setboolopt "related" opts) "show postings' siblings instead"+     ,flagReq  ["width","w"] (\s opts -> Right $ setopt "width" s opts) "N"+      ("set output width (default: " +++#ifdef mingw32_HOST_OS+       show defaultWidth+#else+       "terminal width"+#endif+       ++ " or $COLUMNS). -wN,M sets description width as well."+       )+    ]+     ++ outputflags+    ,groupHidden = []+    ,groupNamed = [generalflagsgroup1]+    }+ }+  where aliases = ["r","reg"]++-- | Print a (posting) register report.+register :: CliOpts -> Journal -> IO ()+register opts@CliOpts{reportopts_=ropts} j = do+  d <- getCurrentDay+  let fmt = outputFormatFromOpts opts+      render | fmt=="csv" = const ((++"\n") . printCSV . postingsReportAsCsv)+             | otherwise  = postingsReportAsText+  writeOutput opts $ render opts $ postingsReport ropts (queryFromOpts d ropts) j++postingsReportAsCsv :: PostingsReport -> CSV+postingsReportAsCsv (_,is) =+  ["txnidx","date","description","account","amount","total"]+  :+  map postingsReportItemAsCsvRecord is++postingsReportItemAsCsvRecord :: PostingsReportItem -> Record+postingsReportItemAsCsvRecord (_, _, _, p, b) = [idx,date,desc,acct,amt,bal]+  where+    idx  = show $ maybe 0 tindex $ ptransaction p+    date = showDate $ postingDate p -- XXX csv should show date2 with --date2+    desc = T.unpack $ maybe "" tdescription $ ptransaction p+    acct = bracket $ T.unpack $ paccount p+      where+        bracket = case ptype p of+                             BalancedVirtualPosting -> (\s -> "["++s++"]")+                             VirtualPosting -> (\s -> "("++s++")")+                             _ -> id+    amt = showMixedAmountOneLineWithoutPrice $ pamount p+    bal = showMixedAmountOneLineWithoutPrice b++-- | Render a register report as plain text suitable for console output.+postingsReportAsText :: CliOpts -> PostingsReport -> String+postingsReportAsText opts (_,items) = unlines $ map (postingsReportItemAsText opts amtwidth balwidth) items+  where+    amtwidth = maximumStrict $ 12 : map (strWidth . showMixedAmount . itemamt) items+    balwidth = maximumStrict $ 12 : map (strWidth . showMixedAmount . itembal) items+    itemamt (_,_,_,Posting{pamount=a},_) = a+    itembal (_,_,_,_,a) = a++tests_postingsReportAsText = [+  "postingsReportAsText" ~: do+  -- "unicode in register layout" ~: do+    j <- readJournal'+      "2009/01/01 * медвежья шкура\n  расходы:покупки  100\n  актив:наличные\n"+    let opts = defreportopts+    (postingsReportAsText defcliopts $ postingsReport opts (queryFromOpts (parsedate "2008/11/26") opts) j) `is` unlines+      ["2009/01/01 медвежья шкура       расходы:покупки                100           100"+      ,"                                актив:наличные                -100             0"]+ ]++-- | Render one register report line item as plain text. Layout is like so:+-- @+-- <---------------- width (specified, terminal width, or 80) -------------------->+-- date (10)  description           account              amount (12)   balance (12)+-- DDDDDDDDDD dddddddddddddddddddd  aaaaaaaaaaaaaaaaaaa  AAAAAAAAAAAA  AAAAAAAAAAAA+-- @+-- If description's width is specified, account will use the remaining space.+-- Otherwise, description and account divide up the space equally.+--+-- With a report interval, the layout is like so:+-- @+-- <---------------- width (specified, terminal width, or 80) -------------------->+-- date (21)              account                        amount (12)   balance (12)+-- DDDDDDDDDDDDDDDDDDDDD  aaaaaaaaaaaaaaaaaaaaaaaaaaaaa  AAAAAAAAAAAA  AAAAAAAAAAAA+-- @+--+-- date and description are shown for the first posting of a transaction only.+--+-- Returns a string which can be multi-line, eg if the running balance+-- has multiple commodities. Does not yet support formatting control+-- like balance reports.+--+postingsReportItemAsText :: CliOpts -> Int -> Int -> PostingsReportItem -> String+postingsReportItemAsText opts preferredamtwidth preferredbalwidth (mdate, menddate, mdesc, p, b) =+  -- use elide*Width to be wide-char-aware+  -- trace (show (totalwidth, datewidth, descwidth, acctwidth, amtwidth, balwidth)) $+  intercalate "\n" $+    [concat [fitString (Just datewidth) (Just datewidth) True True date+            ," "+            ,fitString (Just descwidth) (Just descwidth) True True desc+            ,"  "+            ,fitString (Just acctwidth) (Just acctwidth) True True acct+            ,"  "+            ,fitString (Just amtwidth) (Just amtwidth) True False amtfirstline+            ,"  "+            ,fitString (Just balwidth) (Just balwidth) True False balfirstline+            ]]+    +++    [concat [spacer+            ,fitString (Just amtwidth) (Just amtwidth) True False a+            ,"  "+            ,fitString (Just balwidth) (Just balwidth) True False b+            ]+     | (a,b) <- zip amtrest balrest+     ]+    where+      -- calculate widths+      (totalwidth,mdescwidth) = registerWidthsFromOpts opts+      (datewidth, date) = case (mdate,menddate) of+                            (Just _, Just _)   -> (21, showDateSpan (DateSpan mdate menddate))+                            (Nothing, Just _)  -> (21, "")+                            (Just d, Nothing)  -> (10, showDate d)+                            _                  -> (10, "")+      (amtwidth, balwidth)+        | shortfall <= 0 = (preferredamtwidth, preferredbalwidth)+        | otherwise      = (adjustedamtwidth, adjustedbalwidth)+        where+          mincolwidth = 2 -- columns always show at least an ellipsis+          maxamtswidth = max 0 (totalwidth - (datewidth + 1 + mincolwidth + 2 + mincolwidth + 2 + 2))+          shortfall = (preferredamtwidth + preferredbalwidth) - maxamtswidth+          amtwidthproportion = fromIntegral preferredamtwidth / fromIntegral (preferredamtwidth + preferredbalwidth)+          adjustedamtwidth = round $ amtwidthproportion * fromIntegral maxamtswidth+          adjustedbalwidth = maxamtswidth - adjustedamtwidth++      remaining = totalwidth - (datewidth + 1 + 2 + amtwidth + 2 + balwidth)+      (descwidth, acctwidth)+        | hasinterval = (0, remaining - 2)+        | otherwise   = (w, remaining - 2 - w)+        where+            hasinterval = isJust menddate+            w = fromMaybe ((remaining - 2) `div` 2) mdescwidth++      -- gather content+      desc = fromMaybe "" mdesc+      acct = parenthesise $ T.unpack $ elideAccountName awidth $ paccount p+         where+          (parenthesise, awidth) =+            case ptype p of+              BalancedVirtualPosting -> (\s -> "["++s++"]", acctwidth-2)+              VirtualPosting         -> (\s -> "("++s++")", acctwidth-2)+              _                      -> (id,acctwidth)+      amt = showMixedAmountWithoutPrice $ pamount p+      bal = showMixedAmountWithoutPrice b+      -- alternate behaviour, show null amounts as 0 instead of blank+      -- amt = if null amt' then "0" else amt'+      -- bal = if null bal' then "0" else bal'+      (amtlines, ballines) = (lines amt, lines bal)+      (amtlen, ballen) = (length amtlines, length ballines)+      numlines = max 1 (max amtlen ballen)+      (amtfirstline:amtrest) = take numlines $ amtlines ++ repeat "" -- posting amount is top-aligned+      (balfirstline:balrest) = take numlines $ replicate (numlines - ballen) "" ++ ballines -- balance amount is bottom-aligned+      spacer = replicate (totalwidth - (amtwidth + 2 + balwidth)) ' '++tests_Hledger_Cli_Commands_Register :: Test+tests_Hledger_Cli_Commands_Register = TestList+  tests_postingsReportAsText

@@ -0,0 +1,96 @@+{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Registermatch (+  registermatchmode+ ,registermatch+) +where++import Data.Char (toUpper)+import Data.List+import Data.String.Here+import qualified Data.Text as T+import Hledger+import Hledger.Cli.CliOptions+import Hledger.Cli.Commands.Register++registermatchmode = hledgerCommandMode+  [here| register-match+Print the one posting whose transaction description is closest to DESC, +in the style of the register command.+If there are multiple equally good matches, it shows the most recent.+Query options (options, not arguments) can be used to restrict the search space.+Helps ledger-autosync detect already-seen transactions when importing.+  |]+  []+  [generalflagsgroup1]+  []+  ([], Nothing)++registermatch :: CliOpts -> Journal -> IO ()+registermatch opts@CliOpts{rawopts_=rawopts,reportopts_=ropts} j = do+  let args' = listofstringopt "args" rawopts+  case args' of+    [desc] -> do+        d <- getCurrentDay+        let q  = queryFromOptsOnly d ropts+            (_,pris) = postingsReport ropts q j+            ps = [p | (_,_,_,p,_) <- pris]+        case similarPosting ps desc of+          Nothing -> putStrLn "no matches found."+          Just p  -> putStr $ postingsReportAsText opts ("",[pri])+                     where pri = (Just (postingDate p)+                                 ,Nothing+                                 ,Just $ T.unpack (maybe "" tdescription $ ptransaction p)+                                 ,p+                                 ,0)+    _ -> putStrLn "please provide one description argument."++-- Identify the closest recent match for this description in the given date-sorted postings.+similarPosting :: [Posting] -> String -> Maybe Posting+similarPosting ps desc =+  let matches =+          sortBy compareRelevanceAndRecency+                     $ filter ((> threshold).fst)+                     [(maybe 0 (\t -> compareDescriptions desc (T.unpack $ tdescription t)) (ptransaction p), p) | p <- ps]+              where+                compareRelevanceAndRecency (n1,p1) (n2,p2) = compare (n2,postingDate p2) (n1,postingDate p1)+                threshold = 0+  in case matches of []  -> Nothing+                     m:_ -> Just $ snd m++-- -- Identify the closest recent match for this description in past transactions.+-- similarTransaction :: Journal -> Query -> String -> Maybe Transaction+-- similarTransaction j q desc =+--   case historymatches = transactionsSimilarTo j q desc of+--     ((,t):_) = Just t+--     []       = Nothing++compareDescriptions :: [Char] -> [Char] -> Double+compareDescriptions s t = compareStrings s' t'+    where s' = simplify s+          t' = simplify t+          simplify = filter (not . (`elem` ("0123456789"::String)))++-- | Return a similarity measure, from 0 to 1, for two strings.+-- This is Simon White's letter pairs algorithm from+-- http://www.catalysoft.com/articles/StrikeAMatch.html+-- with a modification for short strings.+compareStrings :: String -> String -> Double+compareStrings "" "" = 1+compareStrings (_:[]) "" = 0+compareStrings "" (_:[]) = 0+compareStrings (a:[]) (b:[]) = if toUpper a == toUpper b then 1 else 0+compareStrings s1 s2 = 2.0 * fromIntegral i / fromIntegral u+    where+      i = length $ intersect pairs1 pairs2+      u = length pairs1 + length pairs2+      pairs1 = wordLetterPairs $ uppercase s1+      pairs2 = wordLetterPairs $ uppercase s2++wordLetterPairs = concatMap letterPairs . words++letterPairs (a:b:rest) = [a,b] : letterPairs (b:rest)+letterPairs _ = []+

@@ -0,0 +1,276 @@+{-# LANGUAGE OverloadedStrings, LambdaCase, DeriveTraversable, ViewPatterns, QuasiQuotes #-}++module Hledger.Cli.Commands.Rewrite (+  rewritemode+ ,rewrite+) +where++import Control.Monad.Writer+import Data.List (sortOn, foldl')+import Data.String.Here+import qualified Data.Text as T+import Hledger+import Hledger.Data.AutoTransaction (runModifierTransaction)+import Hledger.Cli.CliOptions+import Hledger.Cli.Commands.Print+--import Hledger.Cli hiding (outputflags)+import System.Console.CmdArgs.Explicit+import Text.Printf+import Text.Megaparsec+import qualified Data.Algorithm.Diff as D++rewritemode = hledgerCommandMode+  [here| rewrite+Print all transactions, adding custom postings to the matched ones.++FLAGS++This is a start at a generic rewriter of transaction entries.+It reads the default journal and prints the transactions, like print,+but adds one or more specified postings to any transactions matching QUERY.+The posting amounts can be fixed, or a multiplier of the existing transaction's first posting amount. ++Examples:+```+hledger-rewrite.hs ^income --add-posting '(liabilities:tax)  *.33  ; income tax' --add-posting '(reserve:gifts)  $100'+hledger-rewrite.hs expenses:gifts --add-posting '(reserve:gifts)  *-1"'+hledger-rewrite.hs -f rewrites.hledger+```+rewrites.hledger may consist of entries like:+```+= ^income amt:<0 date:2017+  (liabilities:tax)  *0.33  ; tax on income+  (reserve:grocery)  *0.25  ; reserve 25% for grocery+  (reserve:)  *0.25  ; reserve 25% for grocery+```+Note the single quotes to protect the dollar sign from bash, +and the two spaces between account and amount.++More:++```shell+$ hledger rewrite -- [QUERY]        --add-posting "ACCT  AMTEXPR" ...+$ hledger rewrite -- ^income        --add-posting '(liabilities:tax)  *.33'+$ hledger rewrite -- expenses:gifts --add-posting '(budget:gifts)  *-1"'+$ hledger rewrite -- ^income        --add-posting '(budget:foreign currency)  *0.25 JPY; diversify'+```++Argument for `--add-posting` option is a usual posting of transaction with an+exception for amount specification. More precisely, you can use `'*'` (star+symbol) before the amount to indicate that that this is a factor for an+amount of original matched posting.  If the amount includes a commodity name,+the new posting amount will be in the new commodity; otherwise, it will be in+the matched posting amount's commodity.++#### Re-write rules in a file++During the run this tool will execute so called+["Automated Transactions"](http://ledger-cli.org/3.0/doc/ledger3.html#Automated-Transactions)+found in any journal it process. I.e instead of specifying this operations in+command line you can put them in a journal file.++```shell+$ rewrite-rules.journal+```++Make contents look like this:++```journal+= ^income+    (liabilities:tax)  *.33++= expenses:gifts+    budget:gifts  *-1+    assets:budget  *1+```++Note that `'='` (equality symbol) that is used instead of date in transactions+you usually write. It indicates the query by which you want to match the+posting to add new ones.++```shell+$ hledger rewrite -- -f input.journal -f rewrite-rules.journal > rewritten-tidy-output.journal+```++This is something similar to the commands pipeline:++```shell+$ hledger rewrite -- -f input.journal '^income' --add-posting '(liabilities:tax)  *.33' \+  | hledger rewrite -- -f - expenses:gifts      --add-posting 'budget:gifts  *-1'       \+                                                --add-posting 'assets:budget  *1'       \+  > rewritten-tidy-output.journal+```++It is important to understand that relative order of such entries in journal is+important. You can re-use result of previously added postings.++#### Diff output format++To use this tool for batch modification of your journal files you may find+useful output in form of unified diff.++```shell+$ hledger rewrite -- --diff -f examples/sample.journal '^income' --add-posting '(liabilities:tax)  *.33'+```++Output might look like:++```diff+--- /tmp/examples/sample.journal++++ /tmp/examples/sample.journal+@@ -18,3 +18,4 @@+ 2008/01/01 income+-    assets:bank:checking  $1++    assets:bank:checking            $1+     income:salary++    (liabilities:tax)                0+@@ -22,3 +23,4 @@+ 2008/06/01 gift+-    assets:bank:checking  $1++    assets:bank:checking            $1+     income:gifts++    (liabilities:tax)                0+```++If you'll pass this through `patch` tool you'll get transactions containing the+posting that matches your query be updated. Note that multiple files might be+update according to list of input files specified via `--file` options and+`include` directives inside of these files.++Be careful. Whole transaction being re-formatted in a style of output from+`hledger print`.++See also: ++https://github.com/simonmichael/hledger/issues/99++  |]+  [flagReq ["add-posting"] (\s opts -> Right $ setopt "add-posting" s opts) "'ACCT  AMTEXPR'"+           "add a posting to ACCT, which may be parenthesised. AMTEXPR is either a literal amount, or *N which means the transaction's first matched amount multiplied by N (a decimal number). Two spaces separate ACCT and AMTEXPR."+  ,flagNone ["diff"] (setboolopt "diff") "generate diff suitable as an input for patch tool"+  ]+  [generalflagsgroup1]+  []+  ([], Just $ argsFlag "[QUERY] --add-posting \"ACCT  AMTEXPR\" ...")+------------------------------------------------------------------------------++-- TODO regex matching and interpolating matched name in replacement+-- TODO interpolating match groups in replacement+-- TODO allow using this on unbalanced entries, eg to rewrite while editing++rewrite opts@CliOpts{rawopts_=rawopts,reportopts_=ropts} j@Journal{jtxns=ts} = do +  d <- getCurrentDay+  let q = queryFromOpts d ropts+  modifier <- modifierTransactionFromOpts rawopts+  -- create re-writer+  let modifiers = modifier : jmodifiertxns j+      -- Note that some query matches require transaction. Thus modifiers+      -- pipeline should include txnTieKnot on every step.+      modifier' = foldr (flip (.) . fmap txnTieKnot . runModifierTransaction q) id modifiers+  -- rewrite matched transactions+  let j' = j{jtxns=map modifier' ts}+  -- run the print command, showing all transactions+  outputFromOpts rawopts opts{reportopts_=ropts{query_=""}} j j'++postingp' :: T.Text -> IO Posting+postingp' t = runErroringJournalParser (postingp Nothing <* eof) t' >>= \case+        Left err -> fail err+        Right p -> return p+    where t' = " " <> t <> "\n" -- inject space and newline for proper parsing++modifierTransactionFromOpts :: RawOpts -> IO ModifierTransaction+modifierTransactionFromOpts opts = do+    postings <- mapM (postingp' . stripquotes . T.pack) $ listofstringopt "add-posting" opts+    return+        ModifierTransaction { mtvalueexpr = T.empty, mtpostings = postings }++outputFromOpts :: RawOpts -> (CliOpts -> Journal -> Journal -> IO ())+outputFromOpts opts+    | boolopt "diff" opts = const diffOutput+    | otherwise = flip (const print')++diffOutput :: Journal -> Journal -> IO ()+diffOutput j j' = do+    let changed = [(originalTransaction t, originalTransaction t') | (t, t') <- zip (jtxns j) (jtxns j'), t /= t']+    putStr $ renderPatch $ map (uncurry $ diffTxn j) changed++type Chunk = (GenericSourcePos, [DiffLine String])++-- | Render list of changed lines as a unified diff+--+-- >>> putStr $ renderPatch [(GenericSourcePos "a" 1 1, [D.First "x", D.Second "y"])]+-- --- a+-- +++ a+-- @@ -1,1 +1,1 @@+-- -x+-- +y+-- >>> putStr $ renderPatch [(GenericSourcePos "a" 1 1, [D.Both "x" "x", D.Second "y"]), (GenericSourcePos "a" 5 1, [D.Second "z"])]+-- --- a+-- +++ a+-- @@ -1,1 +1,2 @@+--  x+-- +y+-- @@ -5,0 +6,1 @@+-- +z+-- >>> putStr $ renderPatch [(GenericSourcePos "a" 1 1, [D.Both "x" "x", D.Second "y"]), (GenericSourcePos "b" 5 1, [D.Second "z"])]+-- --- a+-- +++ a+-- @@ -1,1 +1,2 @@+--  x+-- +y+-- --- b+-- +++ b+-- @@ -5,0 +5,1 @@+-- +z+renderPatch :: [Chunk] -> String+renderPatch = go Nothing . sortOn fst where+    go _ [] = ""+    go Nothing cs@((sourceFilePath -> fp, _):_) = fileHeader fp ++ go (Just (fp, 0)) cs+    go (Just (fp, _)) cs@((sourceFilePath -> fp', _):_) | fp /= fp' = go Nothing cs+    go (Just (fp, offs)) ((sourceFirstLine -> lineno, diffs):cs) = chunkHeader ++ chunk ++ go (Just (fp, offs + adds - dels)) cs+        where+            chunkHeader = printf "@@ -%d,%d +%d,%d @@\n" lineno dels (lineno+offs) adds where+            (dels, adds) = foldl' countDiff (0, 0) diffs+            chunk = concatMap renderLine diffs+    fileHeader fp = printf "--- %s\n+++ %s\n" fp fp++    countDiff (dels, adds) = \case+        Del _  -> (dels + 1, adds)+        Add _ -> (dels    , adds + 1)+        Ctx _ -> (dels + 1, adds + 1)++    renderLine = \case+        Del s -> '-' : s ++ "\n"+        Add s -> '+' : s ++ "\n"+        Ctx s -> ' ' : s ++ "\n"++diffTxn :: Journal -> Transaction -> Transaction -> Chunk+diffTxn j t t' =+        case tsourcepos t of+            GenericSourcePos fp lineno _ -> (GenericSourcePos fp (lineno+1) 1, diffs) where+                -- TODO: use range and produce two chunks: one removes part of+                --       original file, other adds transaction to new file with+                --       suffix .ledger (generated). I.e. move transaction from one file to another.+                diffs :: [DiffLine String]+                diffs = concat . map (traverse showPostingLines . mapDiff) $ D.getDiff (tpostings t) (tpostings t')+            pos@(JournalSourcePos fp (line, line')) -> (pos, diffs) where+                -- We do diff for original lines vs generated ones. Often leads+                -- to big diff because of re-format effect.+                diffs :: [DiffLine String]+                diffs = map mapDiff $ D.getDiff source changed'+                source | Just contents <- lookup fp $ jfiles j = map T.unpack . drop (line-1) . take line' $ T.lines contents+                       | otherwise = []+                changed = lines $ showTransactionUnelided t'+                changed' | null changed = changed+                         | null $ last changed = init changed+                         | otherwise = changed++data DiffLine a = Del a | Add a | Ctx a+    deriving (Show, Functor, Foldable, Traversable)++mapDiff :: D.Diff a -> DiffLine a+mapDiff = \case+    D.First x -> Del x+    D.Second x -> Add x+    D.Both x _ -> Ctx x

@@ -0,0 +1,112 @@+{-|++Print some statistics for the journal.++-}++{-# LANGUAGE OverloadedStrings #-}++module Hledger.Cli.Commands.Stats (+  statsmode+ ,stats+)+where++import Data.List+import Data.Maybe+import Data.Ord+import Data.HashSet (size, fromList)+-- import Data.Text (Text)+import qualified Data.Text as T+import Data.Time.Calendar+import System.Console.CmdArgs.Explicit+import Text.Printf+import qualified Data.Map as Map++import Hledger+import Hledger.Cli.CliOptions+import Prelude hiding (putStr)+import Hledger.Cli.Utils (writeOutput)+++statsmode = (defCommandMode $ ["stats"] ++ aliases) {+  modeHelp = "show some journal statistics" `withAliases` aliases+ ,modeGroupFlags = Group {+     groupUnnamed = [+        flagReq  ["output-file","o"]   (\s opts -> Right $ setopt "output-file" s opts) "FILE" "write output to FILE.  A file extension matching one of the above formats selects that format."+        ]+    ,groupHidden = []+    ,groupNamed = [generalflagsgroup1]+    }+ }+  where aliases = []++-- like Register.summarisePostings+-- | Print various statistics for the journal.+stats :: CliOpts -> Journal -> IO ()+stats opts@CliOpts{reportopts_=reportopts_} j = do+  d <- getCurrentDay+  let q = queryFromOpts d reportopts_+      l = ledgerFromJournal q j+      reportspan = (ledgerDateSpan l) `spanDefaultsFrom` (queryDateSpan False q)+      intervalspans = splitSpan (interval_ reportopts_) reportspan+      showstats = showLedgerStats l d+      s = intercalate "\n" $ map showstats intervalspans+  writeOutput opts s++showLedgerStats :: Ledger -> Day -> DateSpan -> String+showLedgerStats l today span =+    unlines $ map (\(label,value) -> concatBottomPadded [printf fmt1 label, value]) stats+    where+      fmt1 = "%-" ++ show w1 ++ "s: "+      -- fmt2 = "%-" ++ show w2 ++ "s"+      w1 = maximum $ map (length . fst) stats+      -- w2 = maximum $ map (length . show . snd) stats+      stats = [+         ("Main file" :: String, path) -- ++ " (from " ++ source ++ ")")+        ,("Included files", unlines $ drop 1 $ journalFilePaths j)+        ,("Transactions span", printf "%s to %s (%d days)" (start span) (end span) days)+        ,("Last transaction", maybe "none" show lastdate ++ showelapsed lastelapsed)+        ,("Transactions", printf "%d (%0.1f per day)" tnum txnrate)+        ,("Transactions last 30 days", printf "%d (%0.1f per day)" tnum30 txnrate30)+        ,("Transactions last 7 days", printf "%d (%0.1f per day)" tnum7 txnrate7)+        ,("Payees/descriptions", show $ size $ fromList $ map (tdescription) ts)+        ,("Accounts", printf "%d (depth %d)" acctnum acctdepth)+        ,("Commodities", printf "%s (%s)" (show $ length cs) (T.intercalate ", " cs))+      -- Transactions this month     : %(monthtxns)s (last month in the same period: %(lastmonthtxns)s)+      -- Unmarked transactions      : %(unmarked)s+      -- Days since reconciliation   : %(reconcileelapsed)s+      -- Days since last transaction : %(recentelapsed)s+       ]+           where+             j = ljournal l+             path = journalFilePath j+             ts = sortBy (comparing tdate) $ filter (spanContainsDate span . tdate) $ jtxns j+             as = nub $ map paccount $ concatMap tpostings ts+             cs = Map.keys $ commodityStylesFromAmounts $ concatMap amounts $ map pamount $ concatMap tpostings ts+             lastdate | null ts = Nothing+                      | otherwise = Just $ tdate $ last ts+             lastelapsed = maybe Nothing (Just . diffDays today) lastdate+             showelapsed Nothing = ""+             showelapsed (Just days) = printf " (%d %s)" days' direction+                                       where days' = abs days+                                             direction | days >= 0 = "days ago" :: String+                                                       | otherwise = "days from now"+             tnum = length ts+             start (DateSpan (Just d) _) = show d+             start _ = ""+             end (DateSpan _ (Just d)) = show d+             end _ = ""+             days = fromMaybe 0 $ daysInSpan span+             txnrate | days==0 = 0+                     | otherwise = fromIntegral tnum / fromIntegral days :: Double+             tnum30 = length $ filter withinlast30 ts+             withinlast30 t = d >= addDays (-30) today && (d<=today) where d = tdate t+             txnrate30 = fromIntegral tnum30 / 30 :: Double+             tnum7 = length $ filter withinlast7 ts+             withinlast7 t = d >= addDays (-7) today && (d<=today) where d = tdate t+             txnrate7 = fromIntegral tnum7 / 7 :: Double+             acctnum = length as+             acctdepth | null as = 0+                       | otherwise = maximum $ map accountNameLevel as+

@@ -0,0 +1,34 @@+{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE QuasiQuotes #-}++module Hledger.Cli.Commands.Tags (+  tagsmode+ ,tags+) +where++import Data.List+import Data.String.Here+import qualified Data.Text.IO as T+import Hledger+import Hledger.Cli.CliOptions++tagsmode = hledgerCommandMode+  [here| tags+List all the tag names in use.+With a query, only matched transactions' tags are shown.+Reads the default journal file, or another specified with -f.+FLAGS+  |]+  [] -- [flagNone ["strict"] (\opts -> setboolopt "strict" opts) "makes date comparing strict"] -- +  [generalflagsgroup1]+  []+  ([], Just $ argsFlag "[QUERY]")++tags CliOpts{rawopts_=_rawopts,reportopts_=ropts} j = do+  d <- getCurrentDay+  let+    q = queryFromOpts d ropts+    ts = filter (q `matchesTransaction`) $ jtxns $ journalSelectingAmountFromOpts ropts j+    tags = nub $ sort $ map fst $ concatMap transactionAllTags ts+  mapM_ T.putStrLn tags

@@ -12,20 +12,22 @@  ,compoundBalanceCommand ) where -import Control.Monad (unless)-import Data.List (intercalate, foldl', isPrefixOf)+import Data.List (intercalate, foldl') import Data.Maybe (fromMaybe) import Data.Monoid (Sum(..), (<>))+import Data.Tuple.HT (uncurry3) import System.Console.CmdArgs.Explicit as C+import Text.CSV import Text.Tabular as T  import Hledger-import Hledger.Cli.Balance+import Hledger.Cli.Commands.Balance import Hledger.Cli.CliOptions+import Hledger.Cli.Utils (writeOutput)  -- | Description of a compound balance report command,  -- from which we generate the command's cmdargs mode and IO action.--- A compound balance report shows one or more sections/subreports, +-- A compound balance report command shows one or more sections/subreports,  -- each with its own title and subtotals row, in a certain order,  -- plus a grand totals row if there's more than one section. -- Examples are the balancesheet, cashflow and incomestatement commands.@@ -34,7 +36,9 @@   cbcaliases  :: [String],                      -- ^ command aliases   cbchelp     :: String,                        -- ^ command line help   cbctitle    :: String,                        -- ^ overall report title-  cbcqueries  :: [(String, Journal -> Query)],  -- ^ title and (journal-parameterised) query for each subreport+  cbcqueries  :: [(String, Journal -> Query, Maybe NormalBalance)],+    -- ^ title, journal-parameterised query, and expected normal balance for each subreport.+    -- The normal balance helps --sort-amount know how to sort negative amounts.    cbctype     :: BalanceType                    -- ^ the type of "balance" this report shows (overrides command line flags) } @@ -64,6 +68,9 @@      ,flagNone ["no-elide"] (\opts -> setboolopt "no-elide" opts) "don't squash boring parent accounts (in tree mode)"      ,flagReq  ["format"] (\s opts -> Right $ setopt "format" s opts) "FORMATSTR" "use this custom line format (in simple reports)"      ,flagNone ["pretty-tables"] (\opts -> setboolopt "pretty-tables" opts) "use unicode when displaying tables"+     ,flagNone ["sort-amount","S"] (\opts -> setboolopt "sort-amount" opts) "sort by amount instead of account name"+     ,outputFormatFlag+     ,outputFileFlag      ]     ,groupHidden = []     ,groupNamed = [generalflagsgroup1]@@ -76,7 +83,7 @@  -- | Generate a runnable command from a compound balance command specification. compoundBalanceCommand :: CompoundBalanceCommandSpec -> (CliOpts -> Journal -> IO ())-compoundBalanceCommand CompoundBalanceCommandSpec{..} CliOpts{command_=cmd, reportopts_=ropts, rawopts_=rawopts} j = do+compoundBalanceCommand CompoundBalanceCommandSpec{..} opts@CliOpts{command_=cmd, reportopts_=ropts, rawopts_=rawopts} j = do     d <- getCurrentDay     let       -- use the default balance type for this report, unless the user overrides  @@ -95,10 +102,12 @@               PeriodChange      -> "(Balance Changes)"               CumulativeChange  -> "(Cumulative Ending Balances)"               HistoricalBalance -> "(Historical Ending Balances)"-      -- set balance type and possibly tree mode in the report options. Some older notes: -      -- For --historical/--cumulative, we must use multiBalanceReport (this forces --no-elide).-      -- These settings format the output in a way that we can convert to a normal balance report -      -- using singleBalanceReport, see Balance.hs for more information.+      -- Set balance type in the report options.+      -- XXX Also, use tree mode (by default, at least?) if --cumulative/--historical +      -- are used in single column mode, since in that situation we will be using +      -- singleBalanceReport which does not support eliding boring parents,+      -- and tree mode hides this.. or something.. +      -- see also compoundBalanceCommandSingleColumnReport, #565         ropts'         | not (flat_ ropts) &&            interval_ ropts==NoInterval && @@ -107,107 +116,232 @@         | otherwise             = ropts{balancetype_=balancetype}       userq = queryFromOpts d ropts'+      format = outputFormatFromOpts opts      case interval_ ropts' of        -- single-column report+      -- TODO refactor, support output format like multi column        NoInterval -> do-        let (subreportstr, total) = foldMap (uncurry (compoundBalanceCommandSingleColumnReport ropts' userq j)) cbcqueries-        putStrLn $ title ++ "\n"-        mapM_ putStrLn subreportstr-        unless (no_total_ ropts' || cmd=="cashflow") . mapM_ putStrLn $ -- TODO temp-          [ "Total:"-          , "--------------------"-          , padLeftWide 20 $ showamt (getSum total)-          ]-        where-          showamt | color_ ropts' = cshowMixedAmountWithoutPrice-                  | otherwise    = showMixedAmountWithoutPrice-          +        let+          -- concatenate the rendering and sum the totals from each subreport+          (subreportstr, total) = +            foldMap (uncurry3 (compoundBalanceCommandSingleColumnReport ropts' userq j)) cbcqueries++        writeOutput opts $ unlines $+          [title ++ "\n"] +++          subreportstr +++          if (no_total_ ropts' || cmd=="cashflow")+           then []+           else+             [ "Total:"+             , "--------------------"+             , padLeftWide 20 $ showamt (getSum total)+             , ""+             ]+             where+               showamt | color_ ropts' = cshowMixedAmountWithoutPrice+                       | otherwise    = showMixedAmountWithoutPrice+       -- multi-column report       _ -> do         let-          (subreporttables, subreporttotals, Sum overalltotal) = foldMap (uncurry (compoundBalanceCommandMultiColumnReports ropts' userq j)) cbcqueries-          overalltable = case subreporttables of-            t1:ts -> foldl' concatTables t1 ts-            []    -> T.empty-          overalltable'-            | no_total_ ropts' || length cbcqueries == 1 =-                overalltable-            | otherwise =-                overalltable-                +====+-                row "Total" overalltotals'-              where-                overalltotals = case subreporttotals of-                  [] -> []-                  ts -> foldl' (zipWith (+)) zeros ts'-                    where-                      -- A subreport might be empty and have no subtotals, count those as zeroes (#588).-                      -- Varying-length subtotals rows are handled similarly, though that is not expected to happen.  -                      len = maximum $ map length ts-                      ts' = [take len $ as ++ repeat nullmixedamt | as <- ts]-                      zeros = replicate len nullmixedamt-                overalltotals'-                  | null overalltotals = []-                  | otherwise =  overalltotals-                                 ++ (if row_total_ ropts' then [overalltotal]   else [])-                                 ++ (if average_ ropts'   then [overallaverage] else [])-                    where-                      overallaverage = overalltotal `divideMixedAmount` fromIntegral (length overalltotals)-        putStrLn title-        putStrLn $ renderBalanceReportTable ropts' overalltable'---- Add the second table below the first, discarding its column headings.-concatTables (Table hLeft hTop dat) (Table hLeft' _ dat') =-    Table (T.Group DoubleLine [hLeft, hLeft']) hTop (dat ++ dat')+          -- make a CompoundBalanceReport+          namedsubreports = +            map (\(subreporttitle, subreportq, subreportnormalsign) -> +                  (subreporttitle, compoundBalanceSubreport ropts' userq j subreportq subreportnormalsign)) +                cbcqueries+          subtotalrows = [coltotals | MultiBalanceReport (_,_,(coltotals,_,_)) <- map snd namedsubreports]+          overalltotals = case subtotalrows of+            [] -> ([], nullmixedamt, nullmixedamt)+            rs ->+              -- Sum the subtotals in each column.+              -- A subreport might be empty and have no subtotals, count those as zeros (#588).+              -- Short subtotals rows are also implicitly padded with zeros, though that is not expected to happen.  +              let+                numcols = maximum $ map length rs  -- depends on non-null ts+                zeros = replicate numcols nullmixedamt+                rs' = [take numcols $ as ++ repeat nullmixedamt | as <- rs]+                coltotals = foldl' (zipWith (+)) zeros rs'+                grandtotal = sum coltotals+                grandavg | null coltotals = nullmixedamt+                         | otherwise      = grandtotal `divideMixedAmount` fromIntegral (length coltotals)+              in +                (coltotals, grandtotal, grandavg)+          cbr =+            (title+            ,namedsubreports+            ,overalltotals +            )+        -- render appropriately+        writeOutput opts $+          case format of+            "csv" -> printCSV (compoundBalanceReportAsCsv ropts cbr) ++ "\n"+            _     -> compoundBalanceReportAsText ropts' cbr --- | Run one subreport for a single-column compound balance command.--- Currently this returns the plain text rendering of the subreport,--- and its total.+-- | Run one subreport for a compound balance command in single-column mode.+-- Currently this returns the plain text rendering of the subreport, and its total.+-- The latter is wrapped in a Sum for easy monoidal combining. compoundBalanceCommandSingleColumnReport     :: ReportOpts     -> Query     -> Journal     -> String     -> (Journal -> Query)+    -> Maybe NormalBalance     -> ([String], Sum MixedAmount)-compoundBalanceCommandSingleColumnReport ropts q0 j t q = ([view], Sum amt)-    where-      q' = And [q0, q j]-      rep@(_ , amt)-        -- For --historical/--cumulative, we must use multiBalanceReport.-        -- (This forces --no-elide.)-        -- See Balance.hs's implementation of 'balance' for more information-        | balancetype_ ropts `elem` [HistoricalBalance, CumulativeChange]-            = singleBalanceReport ropts q' j-        | otherwise-            = balanceReport ropts q' j-      view = intercalate "\n" [t <> ":", balanceReportAsText ropts rep]+compoundBalanceCommandSingleColumnReport ropts userq j subreporttitle subreportqfn subreportnormalsign = +  ([subreportstr], Sum total)+  where+    q = And [subreportqfn j, userq]+    ropts' = ropts{normalbalance_=subreportnormalsign}+    r@(_,total)+      -- XXX For --historical/--cumulative, we must use singleBalanceReport;+      -- otherwise we use balanceReport -- because it supports eliding boring parents. +      -- See also compoundBalanceCommand, Balance.hs -> balance.+      | balancetype_ ropts `elem` [CumulativeChange, HistoricalBalance] = singleBalanceReport ropts' q j+      | otherwise                                                       = balanceReport       ropts' q j+    subreportstr = intercalate "\n" [subreporttitle <> ":", balanceReportAsText ropts r] --- | Run all the subreports for a multi-column compound balance command.--- Currently this returns a table of rendered balance amounts for each --- subreport (including a totals row), the totals row for each subreport --- (again, as mixedamounts), and the grand total.-compoundBalanceCommandMultiColumnReports-    :: ReportOpts-    -> Query-    -> Journal-    -> String-    -> (Journal -> Query)-    -> ([Table String String MixedAmount], [[MixedAmount]], Sum MixedAmount)-compoundBalanceCommandMultiColumnReports ropts q0 j t q = ([tabl], [coltotals], Sum tot)-    where-      singlesection = "Cash" `isPrefixOf` t -- TODO temp-      ropts' = ropts { no_total_ = singlesection && no_total_ ropts, empty_ = True }-      q' = And [q0, q j]-      MultiBalanceReport (dates, rows, (coltotals,tot,avg)) =-          multiBalanceReport ropts' q' j-      rows' | empty_ ropts = rows-            | otherwise    = filter (not . emptyRow) rows-        where-          emptyRow (_,_,_,amts,_,_) = all isZeroMixedAmount amts-      r = MultiBalanceReport (dates, rows', (coltotals, tot, avg))-      Table hLeft hTop dat = balanceReportAsTable ropts' r-      tabl = Table (T.Group SingleLine [Header t, hLeft]) hTop ([]:dat)+-- | A compound balance report has:+--+-- * an overall title+--+-- * one or more named multi balance reports, with the same column headings+--+-- * a list of overall totals for each column, and their grand total and average+--+-- It is used in compound balance report commands like balancesheet, +-- cashflow and incomestatement.+type CompoundBalanceReport = +  ( String+  , [(String, MultiBalanceReport)]+  , ([MixedAmount], MixedAmount, MixedAmount)+  ) +-- | Run one subreport for a compound balance command in multi-column mode.+-- This returns a MultiBalanceReport.+compoundBalanceSubreport :: ReportOpts -> Query -> Journal -> (Journal -> Query) -> Maybe NormalBalance -> MultiBalanceReport+compoundBalanceSubreport ropts userq j subreportqfn subreportnormalsign = r'+  where+    -- force --empty to ensure same columns in all sections+    ropts' = ropts { empty_=True, normalbalance_=subreportnormalsign }+    -- run the report+    q = And [subreportqfn j, userq]+    r@(MultiBalanceReport (dates, rows, totals)) = multiBalanceReport ropts' q j+    -- if user didn't specify --empty, now remove the all-zero rows+    r' | empty_ ropts = r+       | otherwise    = MultiBalanceReport (dates, rows', totals) +          where+            rows' = filter (not . emptyRow) rows+              where+                emptyRow (_,_,_,amts,_,_) = all isZeroMixedAmount amts++-- | Render a compound balance report as plain text suitable for console output.+{- Eg:+Balance Sheet++             ||  2017/12/31    Total  Average +=============++===============================+ Assets      ||                               +-------------++-------------------------------+ assets:b    ||           1        1        1 +-------------++-------------------------------+             ||           1        1        1 +=============++===============================+ Liabilities ||                               +-------------++-------------------------------+-------------++-------------------------------+             ||                               +=============++===============================+ Total       ||           1        1        1 ++-}+compoundBalanceReportAsText :: ReportOpts -> CompoundBalanceReport -> String+compoundBalanceReportAsText ropts (title, subreports, (coltotals, grandtotal, grandavg)) =+  title ++ "\n\n" ++ +  renderBalanceReportTable ropts bigtable'+  where+    singlesubreport = length subreports == 1+    bigtable = +      case map (subreportAsTable ropts singlesubreport) subreports of+        []   -> T.empty+        r:rs -> foldl' concatTables r rs+    bigtable'+      | no_total_ ropts || singlesubreport = +          bigtable+      | otherwise =+          bigtable+          +====++          row "Total" (+            coltotals+            ++ (if row_total_ ropts then [grandtotal] else [])+            ++ (if average_ ropts   then [grandavg]   else [])+            )++    -- | Convert a named multi balance report to a table suitable for+    -- concatenating with others to make a compound balance report table.+    subreportAsTable ropts singlesubreport (title, r) = t+      where+        -- unless there's only one section, always show the subtotal row+        ropts' | singlesubreport = ropts+               | otherwise       = ropts{ no_total_=False }+        -- convert to table+        Table lefthdrs tophdrs cells = balanceReportAsTable ropts' r+        -- tweak the layout+        t = Table (T.Group SingleLine [Header title, lefthdrs]) tophdrs ([]:cells)++-- | Add the second table below the first, discarding its column headings.+concatTables (Table hLeft hTop dat) (Table hLeft' _ dat') =+    Table (T.Group DoubleLine [hLeft, hLeft']) hTop (dat ++ dat')++-- | Render a compound balance report as CSV.+{- Eg: +ghci> :main -f examples/sample.journal bs -Y -O csv -AT+"Balance Sheet","","","","",""+"Assets","","","","",""+"account","short account","indent","2008","total","average"+"assets:bank:saving","saving","3","$1","$1","$1"+"assets:cash","cash","2","$-2","$-2","$-2"+"totals","","","$-1","$-1","$-1"+"Liabilities","","","","",""+"account","short account","indent","2008","total","average"+"liabilities:debts","debts","2","$1","$1","$1"+"totals","","","$1","$1","$1"+"Total","0","0","0"+-}+compoundBalanceReportAsCsv :: ReportOpts -> CompoundBalanceReport -> CSV+compoundBalanceReportAsCsv ropts (title, subreports, (coltotals, grandtotal, grandavg)) =+  addtotals $+  padRow title :+  concatMap (subreportAsCsv ropts singlesubreport) subreports+  where+    singlesubreport = length subreports == 1+    subreportAsCsv ropts singlesubreport (subreporttitle, multibalreport) =+      padRow subreporttitle :+      multiBalanceReportAsCsv ropts' multibalreport+      where+        -- unless there's only one section, always show the subtotal row+        ropts' | singlesubreport = ropts+               | otherwise       = ropts{ no_total_=False }+    padRow s = take numcols $ s : repeat ""+      where+        numcols+          | null subreports = 1+          | otherwise =+            (3 +) $ -- account name & indent columns+            (if row_total_ ropts then (1+) else id) $+            (if average_ ropts then (1+) else id) $+            maximum $ -- depends on non-null subreports+            map (\(MultiBalanceReport (amtcolheadings, _, _)) -> length amtcolheadings) $ +            map snd subreports+    addtotals+      | no_total_ ropts || length subreports == 1 = id+      | otherwise = (++ +          ["Total" :+           map showMixedAmountOneLineWithoutPrice (+             coltotals+             ++ (if row_total_ ropts then [grandtotal] else [])+             ++ (if average_ ropts   then [grandavg]   else [])+             )+          ])

@@ -16,6 +16,7 @@   ,printHelpForTopic   ,runManForTopic   ,runInfoForTopic+  ,runPagerForTopic    ) where @@ -33,22 +34,22 @@  docFiles :: IsString a => [(Topic, (a, a, a))] docFiles = [-   ("cli",+   ("hledger",     ($(makeRelativeToProject "doc/hledger.1" >>= embedStringFile)     ,$(makeRelativeToProject "doc/hledger.1.txt" >>= embedStringFile)     ,$(makeRelativeToProject "doc/hledger.1.info" >>= embedStringFile)     ))-  ,("ui",+  ,("hledger-ui",     ($(makeRelativeToProject "doc/other/hledger-ui.1" >>= embedStringFile)     ,$(makeRelativeToProject "doc/other/hledger-ui.1.txt" >>= embedStringFile)     ,$(makeRelativeToProject "doc/other/hledger-ui.1.info" >>= embedStringFile)     ))-  ,("web",+  ,("hledger-web",     ($(makeRelativeToProject "doc/other/hledger-web.1" >>= embedStringFile)     ,$(makeRelativeToProject "doc/other/hledger-web.1.txt" >>= embedStringFile)     ,$(makeRelativeToProject "doc/other/hledger-web.1.info" >>= embedStringFile)     ))-  ,("api",+  ,("hledger-api",     ($(makeRelativeToProject "doc/other/hledger-api.1" >>= embedStringFile)     ,$(makeRelativeToProject "doc/other/hledger-api.1.txt" >>= embedStringFile)     ,$(makeRelativeToProject "doc/other/hledger-api.1.info" >>= embedStringFile)@@ -93,6 +94,15 @@ printHelpForTopic :: Topic -> IO () printHelpForTopic t =   putStrLn $ lookupDocTxt t++runPagerForTopic :: FilePath -> Topic -> IO ()+runPagerForTopic exe t = do+  (Just inp, _, _, ph) <- createProcess (proc exe []){+    std_in=CreatePipe+    }+  hPutStrLn inp (lookupDocTxt t)+  _ <- waitForProcess ph+  return ()  runManForTopic :: Topic -> IO () runManForTopic t =

@@ -1,42 +0,0 @@-{-|--The help command.--|-}--module Hledger.Cli.Help (--   helpmode-  ,help'--  ) where--import Prelude ()-import Prelude.Compat-import Data.List-import System.Console.CmdArgs.Explicit--import Hledger.Data.RawOptions-import Hledger.Cli.CliOptions-import Hledger.Cli.DocFiles--helpmode = (defCommandMode $ ["help"] ++ aliases) {-  modeHelp = "show any of the hledger manuals" `withAliases` aliases- ,modeGroupFlags = Group {-     groupUnnamed = []-    ,groupHidden = []-    ,groupNamed = []-    }- }-  where aliases = []---- | Print detailed help on various topics.-help' :: CliOpts -> IO ()-help' opts = do-  let args = listofstringopt "args" $ rawopts_ opts-  case args of-    []    -> putStrLn $-             "Choose a topic, eg: hledger help cli\n" ++-             intercalate ", " docTopics-    topic:_ -> printHelpForTopic topic-

@@ -1,59 +0,0 @@-{-|--Print a histogram report. (The "activity" command).---}--module Hledger.Cli.Histogram-where--import Data.List-import Data.Maybe-import Data.Ord-import System.Console.CmdArgs.Explicit-import Text.Printf--import Hledger-import Hledger.Cli.CliOptions-import Prelude hiding (putStr)-import Hledger.Utils.UTF8IOCompat (putStr)--activitymode :: Mode RawOpts-activitymode = (defCommandMode $ ["activity"] ++ aliases) {-  modeHelp = "show an ascii barchart of posting counts per interval (default: daily)" `withAliases` aliases- ,modeHelpSuffix = []- ,modeGroupFlags = Group {-     groupUnnamed = []-    ,groupHidden = []-    ,groupNamed = [generalflagsgroup1]-    }- }-  where aliases = []--barchar :: Char-barchar = '*'---- | Print a histogram of some statistic per report interval, such as--- number of postings per day.-histogram :: CliOpts -> Journal -> IO ()-histogram CliOpts{reportopts_=ropts} j = do-  d <- getCurrentDay-  putStr $ showHistogram ropts (queryFromOpts d ropts) j--showHistogram :: ReportOpts -> Query -> Journal -> String-showHistogram opts q j = concatMap (printDayWith countBar) spanps-    where-      i = interval_ opts-      interval | i == NoInterval = Days 1-               | otherwise = i-      span' = queryDateSpan (date2_ opts) q `spanDefaultsFrom` journalDateSpan (date2_ opts) j-      spans = filter (DateSpan Nothing Nothing /=) $ splitSpan interval span'-      spanps = [(s, filter (isPostingInDateSpan s) ps) | s <- spans]-      -- same as Register-      -- should count transactions, not postings ?-      -- ps = sortBy (comparing postingDate) $ filterempties $ filter matchapats $ filterdepth $ journalPostings j-      ps = sortBy (comparing postingDate) $ filter (q `matchesPosting`) $ journalPostings j--printDayWith f (DateSpan b _, ps) = printf "%s %s\n" (show $ fromJust b) (f ps)--countBar ps = replicate (length ps) barchar

@@ -1,47 +0,0 @@-{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings, NoCPP #-}-{-|--The @incomestatement@ command prints a simple income statement (profit & loss report).---}--module Hledger.Cli.Incomestatement (-  incomestatementmode- ,incomestatement- ,tests_Hledger_Cli_Incomestatement-) where--import Data.String.Here-import System.Console.CmdArgs.Explicit-import Test.HUnit--import Hledger-import Hledger.Cli.CliOptions-import Hledger.Cli.CompoundBalanceCommand--incomestatementSpec = CompoundBalanceCommandSpec {-  cbcname     = "incomestatement",-  cbcaliases  = ["is"],-  cbchelp     = [here|-This command displays a simple income statement, showing revenues-and expenses during a period. It assumes that these accounts are under a -top-level `revenue` or `income` or `expense` account (case insensitive,-plural forms also allowed).-  |],-  cbctitle    = "Income Statement",-  cbcqueries  = [ ("Revenues", journalIncomeAccountQuery),-                 ("Expenses", journalExpenseAccountQuery)-               ],-  cbctype     = PeriodChange-}--incomestatementmode :: Mode RawOpts-incomestatementmode = compoundBalanceCommandMode incomestatementSpec--incomestatement :: CliOpts -> Journal -> IO ()-incomestatement = compoundBalanceCommand incomestatementSpec--tests_Hledger_Cli_Incomestatement :: Test-tests_Hledger_Cli_Incomestatement = TestList- [- ]

@@ -1,41 +0,0 @@-{-|--The info command.--|-}--module Hledger.Cli.Info (--   infomode-  ,info'--  ) where--import Prelude ()-import Prelude.Compat-import Data.List-import System.Console.CmdArgs.Explicit--import Hledger.Data.RawOptions-import Hledger.Cli.CliOptions-import Hledger.Cli.DocFiles--infomode = (defCommandMode $ ["info"] ++ aliases) {-  modeHelp = "show any of the hledger manuals with info" `withAliases` aliases- ,modeGroupFlags = Group {-     groupUnnamed = []-    ,groupHidden = []-    ,groupNamed = []-    }- }-  where aliases = []---- | Try to use info to view the selected manual.-info' :: CliOpts -> IO ()-info' opts = do-  let args = listofstringopt "args" $ rawopts_ opts-  case args of-    []    -> putStrLn $-             "Choose a topic, eg: hledger info cli\n" ++-             intercalate ", " docTopics-    topic:_ -> runInfoForTopic topic

@@ -40,11 +40,9 @@  module Hledger.Cli.Main where --- import Control.Monad import Data.Char (isDigit)-import Data.String.Here import Data.List-import Data.List.Split (splitOn)+import Data.String.Here import Safe import System.Console.CmdArgs.Explicit as C import System.Environment@@ -53,36 +51,14 @@ import System.Process import Text.Printf -import Hledger (ensureJournalFileExists)-import Hledger.Cli.Add-import Hledger.Cli.Accounts-import Hledger.Cli.Balance-import Hledger.Cli.Balancesheet-import Hledger.Cli.Cashflow-import Hledger.Cli.DocFiles-import Hledger.Cli.Help-import Hledger.Cli.Histogram-import Hledger.Cli.Incomestatement-import Hledger.Cli.Info-import Hledger.Cli.Man-import Hledger.Cli.Print-import Hledger.Cli.Register-import Hledger.Cli.Stats-import Hledger.Cli.CliOptions-import Hledger.Cli.Tests-import Hledger.Cli.Utils-import Hledger.Cli.Version-import Hledger.Data.Dates (getCurrentDay)-import Hledger.Data.RawOptions (RawOpts)-import Hledger.Reports.ReportOptions (period_, interval_, queryFromOpts)-import Hledger.Utils+import Hledger.Cli  --- | The overall cmdargs mode describing command-line options for hledger.+-- | The overall cmdargs mode describing hledger's command-line options and subcommands. mainmode addons = defMode {   modeNames = [progname ++ " [CMD]"]  ,modeArgs = ([], Just $ argsFlag "[ARGS]")- ,modeHelp = unlines ["hledger's command line interface"]+ ,modeHelp = unlines ["hledger's main command line interface. Runs builtin commands and other hledger executables. Type \"hledger\" to list available commands."]  ,modeGroupModes = Group {     -- subcommands in the unnamed group, shown first:     groupUnnamed = [@@ -91,23 +67,7 @@    ,groupNamed = [      ]     -- subcommands handled but not shown in the help:-   ,groupHidden = [-      oldconvertmode-     ,accountsmode-     ,activitymode-     ,addmode-     ,balancemode-     ,balancesheetmode-     ,cashflowmode-     ,helpmode-     ,incomestatementmode-     ,infomode-     ,manmode-     ,printmode-     ,registermode-     ,statsmode-     ,testmode-     ] ++ map quickAddonCommandMode addons+   ,groupHidden = map fst builtinCommands ++ map quickAddonCommandMode addons    }  ,modeGroupFlags = Group {      -- flags in named groups:@@ -127,178 +87,13 @@ PROGNAME                         list commands PROGNAME CMD [--] [OPTS] [ARGS]  run a command (use -- with addon commands) PROGNAME-CMD [OPTS] [ARGS]       or run addon commands directly-PROGNAME -h                      general usage-PROGNAME CMD -h                  command usage-PROGNAME --help                  PROGNAME manual-PROGNAME --man                   PROGNAME manual as man page-PROGNAME --info                  PROGNAME manual as info manual-PROGNAME help                    list help topics-PROGNAME help TOPIC              TOPIC manual-PROGNAME man  TOPIC              TOPIC manual as man page-PROGNAME info TOPIC              TOPIC manual as info manual+PROGNAME -h                      show general usage+PROGNAME CMD -h                  show command usage+PROGNAME help [MANUAL]           show any of the hledger manuals in various formats |]  } -oldconvertmode = (defCommandMode ["convert"]) {-  modeValue = [("command","convert")]- ,modeHelp = "convert is no longer needed, just use -f FILE.csv"- ,modeArgs = ([], Just $ argsFlag "[CSVFILE]")- ,modeGroupFlags = Group {-     groupUnnamed = []-    ,groupHidden = helpflags-    ,groupNamed = []-    }- }--builtinCommands :: [Mode RawOpts]-builtinCommands =-  let gs = modeGroupModes $ mainmode []-  in concatMap snd (groupNamed gs) ++ groupUnnamed gs ++ groupHidden gs--builtinCommandNames :: [String]-builtinCommandNames = concatMap modeNames builtinCommands---- | Parse hledger CLI options from these command line arguments and--- add-on command names, or raise any error.-argsToCliOpts :: [String] -> [String] -> IO CliOpts-argsToCliOpts args addons = do-  let-    args'        = moveFlagsAfterCommand args-    cmdargsopts  = either usageError id $ process (mainmode addons) args'-    cmdargsopts' = decodeRawOpts cmdargsopts-  rawOptsToCliOpts cmdargsopts'---- | A hacky workaround for cmdargs not accepting flags before the--- subcommand name: try to detect and move such flags after the--- command.  This allows the user to put them in either position.--- The order of options is not preserved, but this should be ok.------ Since we're not parsing flags as precisely as cmdargs here, this is--- imperfect. We make a decent effort to:--- - move all no-argument help/input/report flags--- - move all required-argument help/input/report flags along with their values, space-separated or not--- - not confuse things further or cause misleading errors.-moveFlagsAfterCommand :: [String] -> [String]-moveFlagsAfterCommand args = moveArgs $ ensureDebugHasArg args-  where-    -- quickly! make sure --debug has a numeric argument, or this all goes to hell-    ensureDebugHasArg as =-      case break (=="--debug") as of-       (bs,"--debug":c:cs) | null c || not (all isDigit c) -> bs++"--debug=1":c:cs-       (bs,"--debug":[])                                   -> bs++"--debug=1":[]-       _                                                   -> as--    -- -h ..., --version ...-    moveArgs (f:a:as)   | isMovableNoArgFlag f                   = (moveArgs $ a:as) ++ [f]-    -- -f FILE ..., --alias ALIAS ...-    moveArgs (f:v:a:as) | isMovableReqArgFlag f, isValue v       = (moveArgs $ a:as) ++ [f,v]-    -- -fFILE ..., --alias=ALIAS ...-    moveArgs (fv:a:as)  | isMovableReqArgFlagAndValue fv         = (moveArgs $ a:as) ++ [fv]-    -- -f(missing arg)-    moveArgs (f:a:as)   | isMovableReqArgFlag f, not (isValue a) = (moveArgs $ a:as) ++ [f]-    -- anything else-    moveArgs as = as--isMovableNoArgFlag a  = "-" `isPrefixOf` a && dropWhile (=='-') a `elem` noargflagstomove--isMovableReqArgFlag a = "-" `isPrefixOf` a && dropWhile (=='-') a `elem` reqargflagstomove--isMovableReqArgFlagAndValue ('-':'-':a:as) = case break (== '=') (a:as) of (f:fs,_:_) -> (f:fs) `elem` reqargflagstomove-                                                                           _          -> False-isMovableReqArgFlagAndValue ('-':shortflag:_:_) = [shortflag] `elem` reqargflagstomove-isMovableReqArgFlagAndValue _ = False--isValue "-"     = True-isValue ('-':_) = False-isValue _       = True--flagstomove = inputflags ++ reportflags ++ helpflags-noargflagstomove  = concatMap flagNames $ filter ((==FlagNone).flagInfo) flagstomove-reqargflagstomove = -- filter (/= "debug") $-                    concatMap flagNames $ filter ((==FlagReq ).flagInfo) flagstomove---- | Template for the commands list. Includes an entry for known (or--- hypothetical) builtin and addon commands; these will be filtered--- based on the commands found at runtime.  COUNT is replaced with the--- number of commands found.  OTHERCMDS is replaced with an entry for--- each unknown addon command found. The command descriptions here--- should be synced with the commands' builtin help and the command--- list in the hledger manual.-commandsListTemplate :: String-commandsListTemplate = [here|Commands available (COUNT):--Standard reports:- accounts             show chart of accounts- balancesheet (bs)    show a balance sheet- cashflow (cf)        show a cashflow statement- incomestatement (is) show an income statement- transactions (txns)  show transactions in some account--General reporting:- activity             show a bar chart of posting counts per interval- balance (bal)        show accounts and balances- budget               add automated postings/txns/bucket accts (experimental)- chart                generate simple balance pie charts (experimental)- check                check more powerful balance assertions- check-dates          check transactions are ordered by date- check-dupes          check for accounts with the same leaf name- irr                  calculate internal rate of return of an investment- prices               show market price records- print                show transaction journal entries- print-unique         show only transactions with unique descriptions- register (reg)       show postings and running total- register-match       show best matching transaction for a description- stats                show some journal statistics--Interfaces:- add                  console ui for adding transactions- api                  web api server- iadd                 curses ui for adding transactions- ui                   curses ui- web                  web ui--Misc:- autosync             download/deduplicate/convert OFX data- equity               generate transactions to zero & restore account balances- interest             generate interest transactions- rewrite              add automated postings to certain transactions- test                 run some self tests-OTHERCMDS-Help: (see also -h, CMD -h, --help|--man|--info)- help|man|info        show any of the hledger manuals in text/man/info format-|]--knownCommands :: [String]-knownCommands = sort $ commandsFromCommandsList commandsListTemplate---- | Extract the command names from a commands list like the above:--- the first word (or words separated by |) of lines beginning with a space.-commandsFromCommandsList :: String -> [String]-commandsFromCommandsList s = concatMap (splitOn "|") [w | ' ':l <- lines s, let w:_ = words l]---- | Print the commands list, modifying the template above based on--- the currently available addons. Missing addons will be removed, and--- extra addons will be added under Misc.-printCommandsList :: [String] -> IO ()-printCommandsList addonsFound = putStr commandsList-  where-    commandsFound = builtinCommandNames ++ addonsFound-    unknownCommandsFound = addonsFound \\ knownCommands--    adjustline (' ':l) | not $ w `elem` commandsFound = []-      where w = takeWhile (not . (`elem` "| ")) l-    adjustline l = [l]--    commandsList1 =-      regexReplace "OTHERCMDS" (unlines [' ':w | w <- unknownCommandsFound]) $-      unlines $ concatMap adjustline $ lines commandsListTemplate--    commandsList =-      regexReplace "COUNT" (show $ length $ commandsFromCommandsList commandsList1)-      commandsList1----- | Let's go.+-- | Let's go! main :: IO () main = do @@ -310,9 +105,9 @@   -- command-line.test.    -- some preliminary (imperfect) argument parsing to supplement cmdargs-  args <- getArgs+  args <- getArgs >>= expandArgsAt   let-    args'                = moveFlagsAfterCommand args+    args'                = moveFlagsAfterCommand $ replaceNumericFlags args     isFlag               = ("-" `isPrefixOf`)     isNonEmptyNonFlag s  = not (isFlag s) && not (null s)     rawcmd               = headDef "" $ takeWhile isNonEmptyNonFlag args'@@ -346,18 +141,10 @@     hasDetailedVersion   = ("--version+" `elem`)     printUsage           = putStr $ showModeUsage $ mainmode addons     badCommandError      = error' ("command "++rawcmd++" is not recognized, run with no command to see a list") >> exitFailure-    hasShortHelpFlag args = any (`elem` args) ["-h"]-    hasLongHelpFlag args = any (`elem` args) ["--help"]-    hasManFlag args      = any (`elem` args) ["--man"]-    hasInfoFlag args     = any (`elem` args) ["--info"]-    hasSomeHelpFlag args = hasShortHelpFlag args || hasLongHelpFlag args || hasManFlag args || hasInfoFlag args+    hasHelpFlag args     = any (`elem` args) ["-h","--help"]     f `orShowHelp` mode-      | hasShortHelpFlag args = putStr $ showModeUsage mode-      | hasLongHelpFlag args  = printHelpForTopic t-      | hasManFlag args       = runManForTopic t-      | hasInfoFlag args      = runInfoForTopic t-      | otherwise             = f-      where t = topicForMode mode+      | hasHelpFlag args = putStr $ showModeUsage mode+      | otherwise        = f   dbgIO "processed opts" opts   dbgIO "command matched" cmd   dbgIO "isNullCommand" isNullCommand@@ -371,36 +158,27 @@   let     runHledgerCommand       -- high priority flags and situations. -h, then --help, then --info are highest priority.-      | hasShortHelpFlag argsbeforecmd = dbgIO "" "-h before command, showing general usage" >> printUsage-      | hasLongHelpFlag  argsbeforecmd = dbgIO "" "--help before command, showing general manual" >> printHelpForTopic (topicForMode $ mainmode addons)-      | hasManFlag       argsbeforecmd = dbgIO "" "--man before command, showing general manual with man" >> runManForTopic (topicForMode $ mainmode addons)-      | hasInfoFlag      argsbeforecmd = dbgIO "" "--info before command, showing general manual with info" >> runInfoForTopic (topicForMode $ mainmode addons)-      | not (hasSomeHelpFlag argsaftercmd) && (hasVersion argsbeforecmd || (hasVersion argsaftercmd && isInternalCommand))+      | hasHelpFlag argsbeforecmd = dbgIO "" "-h before command, showing general usage" >> printUsage+      | not (hasHelpFlag argsaftercmd) && (hasVersion argsbeforecmd || (hasVersion argsaftercmd && isInternalCommand))                                  = putStrLn prognameandversion-      | not (hasSomeHelpFlag argsaftercmd) && (hasDetailedVersion argsbeforecmd || (hasDetailedVersion argsaftercmd && isInternalCommand))+      | not (hasHelpFlag argsaftercmd) && (hasDetailedVersion argsbeforecmd || (hasDetailedVersion argsaftercmd && isInternalCommand))                                  = putStrLn prognameanddetailedversion       -- \| (null externalcmd) && "binary-filename" `inRawOpts` rawopts = putStrLn $ binaryfilename progname       -- \| "--browse-args" `elem` args     = System.Console.CmdArgs.Helper.execute "cmdargs-browser" mainmode' args >>= (putStr . show)       | isNullCommand            = dbgIO "" "no command, showing commands list" >> printCommandsList addons       | isBadCommand             = badCommandError -      -- internal commands-      | cmd == "activity"        = withJournalDo opts histogram       `orShowHelp` activitymode-      | cmd == "add"             = (journalFilePathFromOpts opts >>= (ensureJournalFileExists . head) >> withJournalDo opts add) `orShowHelp` addmode-      | cmd == "accounts"        = withJournalDo opts accounts        `orShowHelp` accountsmode-      | cmd == "balance"         = withJournalDo opts balance         `orShowHelp` balancemode-      | cmd == "balancesheet"    = withJournalDo opts balancesheet    `orShowHelp` balancesheetmode-      | cmd == "cashflow"        = withJournalDo opts cashflow        `orShowHelp` cashflowmode-      | cmd == "incomestatement" = withJournalDo opts incomestatement `orShowHelp` incomestatementmode-      | cmd == "print"           = withJournalDo opts print'          `orShowHelp` printmode-      | cmd == "register"        = withJournalDo opts register        `orShowHelp` registermode-      | cmd == "stats"           = withJournalDo opts stats           `orShowHelp` statsmode-      | cmd == "test"            = test' opts                         `orShowHelp` testmode-      | cmd == "help"            = help' opts                         `orShowHelp` helpmode-      | cmd == "man"             = man opts                           `orShowHelp` manmode-      | cmd == "info"            = info' opts                         `orShowHelp` infomode+      -- builtin commands+      | Just (cmdmode, cmdaction) <- findCommand cmd = do +        if cmd=="add" -- add command does extra work before reading journal+        then (do+          journalFilePathFromOpts opts >>= (ensureJournalFileExists . head) +          withJournalDo opts cmdaction)+          `orShowHelp` cmdmode+        else+          withJournalDo opts cmdaction `orShowHelp` cmdmode -      -- an external command+      -- addon commands       | isExternalCommand = do           let externalargs = argsbeforecmd ++ filter (not.(=="--")) argsaftercmd           let shellcmd = printf "%s-%s %s" progname cmd (unwords' externalargs) :: String@@ -410,20 +188,69 @@           system shellcmd >>= exitWith        -- deprecated commands-      | cmd == "convert"         = error' (modeHelp oldconvertmode) >> exitFailure+      -- cmd == "convert"         = error' (modeHelp oldconvertmode) >> exitFailure        -- shouldn't reach here       | otherwise                = usageError ("could not understand the arguments "++show args) >> exitFailure    runHledgerCommand +-- | Parse hledger CLI options from these command line arguments and+-- add-on command names, or raise any error.+argsToCliOpts :: [String] -> [String] -> IO CliOpts+argsToCliOpts args addons = do+  let+    args'        = moveFlagsAfterCommand $ replaceNumericFlags args+    cmdargsopts  = either usageError id $ process (mainmode addons) args'+    cmdargsopts' = decodeRawOpts cmdargsopts+  rawOptsToCliOpts cmdargsopts' --- tests_runHledgerCommand = [---   -- "runHledgerCommand" ~: do---   --   let opts = defreportopts{query_="expenses"}---   --   d <- getCurrentDay---   --   runHledgerCommand addons opts@CliOpts{command_=cmd} args+-- | A hacky workaround for cmdargs not accepting flags before the+-- subcommand name: try to detect and move such flags after the+-- command.  This allows the user to put them in either position.+-- The order of options is not preserved, but this should be ok.+--+-- Since we're not parsing flags as precisely as cmdargs here, this is+-- imperfect. We make a decent effort to:+-- - move all no-argument help/input/report flags+-- - move all required-argument help/input/report flags along with their values, space-separated or not+-- - not confuse things further or cause misleading errors.+moveFlagsAfterCommand :: [String] -> [String]+moveFlagsAfterCommand args = moveArgs $ ensureDebugHasArg args+  where+    -- quickly! make sure --debug has a numeric argument, or this all goes to hell+    ensureDebugHasArg as =+      case break (=="--debug") as of+       (bs,"--debug":c:cs) | null c || not (all isDigit c) -> bs++"--debug=1":c:cs+       (bs,"--debug":[])                                   -> bs++"--debug=1":[]+       _                                                   -> as ---  ]+    -- -h ..., --version ...+    moveArgs (f:a:as)   | isMovableNoArgFlag f                   = (moveArgs $ a:as) ++ [f]+    -- -f FILE ..., --alias ALIAS ...+    moveArgs (f:v:a:as) | isMovableReqArgFlag f, isValue v       = (moveArgs $ a:as) ++ [f,v]+    -- -fFILE ..., --alias=ALIAS ...+    moveArgs (fv:a:as)  | isMovableReqArgFlagAndValue fv         = (moveArgs $ a:as) ++ [fv]+    -- -f(missing arg)+    moveArgs (f:a:as)   | isMovableReqArgFlag f, not (isValue a) = (moveArgs $ a:as) ++ [f]+    -- anything else+    moveArgs as = as +isMovableNoArgFlag a  = "-" `isPrefixOf` a && dropWhile (=='-') a `elem` noargflagstomove++isMovableReqArgFlag a = "-" `isPrefixOf` a && dropWhile (=='-') a `elem` reqargflagstomove++isMovableReqArgFlagAndValue ('-':'-':a:as) = case break (== '=') (a:as) of (f:fs,_:_) -> (f:fs) `elem` reqargflagstomove+                                                                           _          -> False+isMovableReqArgFlagAndValue ('-':shortflag:_:_) = [shortflag] `elem` reqargflagstomove+isMovableReqArgFlagAndValue _ = False++isValue "-"     = True+isValue ('-':_) = False+isValue _       = True++flagstomove = inputflags ++ reportflags ++ helpflags+noargflagstomove  = concatMap flagNames $ filter ((==FlagNone).flagInfo) flagstomove+reqargflagstomove = -- filter (/= "debug") $+                    concatMap flagNames $ filter ((==FlagReq ).flagInfo) flagstomove 

@@ -1,41 +0,0 @@-{-|--The man command.--|-}--module Hledger.Cli.Man (--   manmode-  ,man--  ) where--import Prelude ()-import Prelude.Compat-import Data.List-import System.Console.CmdArgs.Explicit--import Hledger.Data.RawOptions-import Hledger.Cli.CliOptions-import Hledger.Cli.DocFiles--manmode = (defCommandMode $ ["man"] ++ aliases) {-  modeHelp = "show any of the hledger manuals with man" `withAliases` aliases- ,modeGroupFlags = Group {-     groupUnnamed = []-    ,groupHidden = []-    ,groupNamed = []-    }- }-  where aliases = []---- | Try to use man to view the selected manual.-man :: CliOpts -> IO ()-man opts = do-  let args = listofstringopt "args" $ rawopts_ opts-  case args of-    []    -> putStrLn $-             "Choose a topic, eg: hledger man cli\n" ++-             intercalate ", " docTopics-    topic:_ -> runManForTopic topic

@@ -1,180 +0,0 @@-{-|--A ledger-compatible @print@ command.---}--{-# LANGUAGE OverloadedStrings #-}--module Hledger.Cli.Print (-  printmode- ,print'- -- ,entriesReportAsText- ,originalTransaction- ,tests_Hledger_Cli_Print-)-where--import Data.Text (Text)-import qualified Data.Text as T-import System.Console.CmdArgs.Explicit-import Test.HUnit-import Text.CSV--import Hledger-import Hledger.Cli.CliOptions-import Hledger.Cli.Utils-import Hledger.Cli.Add ( transactionsSimilarTo )---printmode = (defCommandMode $ ["print"] ++ aliases) {-  modeHelp = "show transaction journal entries" `withAliases` aliases- ,modeGroupFlags = Group {-     groupUnnamed = [-        let matcharg = "STR"-        in-         flagReq  ["match","m"] (\s opts -> Right $ setopt "match" s opts) matcharg-         ("show the transaction whose description is most similar to "++matcharg-          ++ ", and is most recent"),-        flagNone ["explicit","x"] (setboolopt "explicit")-         "show all amounts explicitly"-        ]-        ++ outputflags-    ,groupHidden = []-    ,groupNamed = [generalflagsgroup1]-    }- }-  where aliases = []---- | Print journal transactions in standard format.-print' :: CliOpts -> Journal -> IO ()-print' opts j = do-  case maybestringopt "match" $ rawopts_ opts of-    Nothing   -> printEntries opts j-    Just desc -> printMatch opts j $ T.pack desc--printEntries :: CliOpts -> Journal -> IO ()-printEntries opts@CliOpts{reportopts_=ropts} j = do-  d <- getCurrentDay-  let q = queryFromOpts d ropts-      fmt = outputFormatFromOpts opts-      (render, ropts') = case fmt of-        "csv" -> ((++"\n") . printCSV . entriesReportAsCsv, ropts{accountlistmode_=ALFlat})-        _     -> (entriesReportAsText opts,                 ropts)-  writeOutput opts $ render $ entriesReport ropts' q j--entriesReportAsText :: CliOpts -> EntriesReport -> String-entriesReportAsText opts = concatMap (showTransactionUnelided . gettxn) -  where-    gettxn | boolopt "explicit" $ rawopts_ opts = id                   -- use the fully inferred/explicit txn-           | otherwise                          = originalTransaction  -- use the original txn (more or less)---- Replace this transaction's postings with the original postings if any, but keep the--- current possibly rewritten account names.-originalTransaction t = t { tpostings = map originalPostingPreservingAccount $ tpostings t }---- Get the original posting if any, but keep the current possibly rewritten account name.-originalPostingPreservingAccount p = (originalPosting p) { paccount = paccount p }---- XXX--- tests_showTransactions = [---   "showTransactions" ~: do----    -- "print expenses" ~:---    do---     let opts = defreportopts{query_="expenses"}---     d <- getCurrentDay---     showTransactions opts (queryFromOpts d opts) samplejournal `is` unlines---      ["2008/06/03 * eat & shop"---      ,"    expenses:food                $1"---      ,"    expenses:supplies            $1"---      ,"    assets:cash                 $-2"---      ,""---      ]----   -- , "print report with depth arg" ~:---    do---     let opts = defreportopts{depth_=Just 2}---     d <- getCurrentDay---     showTransactions opts (queryFromOpts d opts) samplejournal `is` unlines---       ["2008/01/01 income"---       ,"    assets:bank:checking            $1"---       ,"    income:salary                  $-1"---       ,""---       ,"2008/06/01 gift"---       ,"    assets:bank:checking            $1"---       ,"    income:gifts                   $-1"---       ,""---       ,"2008/06/03 * eat & shop"---       ,"    expenses:food                $1"---       ,"    expenses:supplies            $1"---       ,"    assets:cash                 $-2"---       ,""---       ,"2008/12/31 * pay off"---       ,"    liabilities:debts               $1"---       ,"    assets:bank:checking           $-1"---       ,""---       ]---  ]--entriesReportAsCsv :: EntriesReport -> CSV-entriesReportAsCsv txns =-  ["txnidx","date","date2","status","code","description","comment","account","amount","commodity","credit","debit","posting-status","posting-comment"] :-  concatMap transactionToCSV txns---- | Generate one CSV record per posting, duplicating the common transaction fields.--- The txnidx field (transaction index) allows postings to be grouped back into transactions.-transactionToCSV :: Transaction -> CSV-transactionToCSV t =-  map (\p -> show idx:date:date2:status:code:description:comment:p)-   (concatMap postingToCSV $ tpostings t)-  where-    idx = tindex t-    description = T.unpack $ tdescription t-    date = showDate (tdate t)-    date2 = maybe "" showDate (tdate2 t)-    status = show $ tstatus t-    code = T.unpack $ tcode t-    comment = chomp $ strip $ T.unpack $ tcomment t--postingToCSV :: Posting -> CSV-postingToCSV p =-  map (\(a@(Amount {aquantity=q,acommodity=c})) ->-    let a_ = a{acommodity=""} in-    let amount = showAmount a_ in-    let commodity = T.unpack c in-    let credit = if q < 0 then showAmount $ negate a_ else "" in-    let debit  = if q >= 0 then showAmount a_ else "" in-    account:amount:commodity:credit:debit:status:comment:[])-   amounts-  where-    Mixed amounts = pamount p-    status = show $ pstatus p-    account = showAccountName Nothing (ptype p) (paccount p)-    comment = chomp $ strip $ T.unpack $ pcomment p---- --match---- | Print the transaction most closely and recently matching a description--- (and the query, if any).-printMatch :: CliOpts -> Journal -> Text -> IO ()-printMatch CliOpts{reportopts_=ropts} j desc = do-  d <- getCurrentDay-  let q = queryFromOpts d ropts-  case similarTransaction' j q desc of-                Nothing -> putStrLn "no matches found."-                Just t  -> putStr $ showTransactionUnelided t--  where-    -- Identify the closest recent match for this description in past transactions.-    similarTransaction' :: Journal -> Query -> Text -> Maybe Transaction-    similarTransaction' j q desc-      | null historymatches = Nothing-      | otherwise           = Just $ snd $ head historymatches-      where-        historymatches = transactionsSimilarTo j q desc---- tests--tests_Hledger_Cli_Print = TestList []-  -- tests_showTransactions

@@ -1,204 +0,0 @@-{-|--A ledger-compatible @register@ command.---}--{-# LANGUAGE CPP, OverloadedStrings #-}--module Hledger.Cli.Register (-  registermode- ,register- ,postingsReportAsText- ,postingsReportItemAsText- -- ,showPostingWithBalanceForVty- ,tests_Hledger_Cli_Register-) where--import Data.List-import Data.Maybe--- import Data.Text (Text)-import qualified Data.Text as T-import System.Console.CmdArgs.Explicit-import Text.CSV-import Test.HUnit--import Hledger-import Hledger.Cli.CliOptions-import Hledger.Cli.Utils---registermode = (defCommandMode $ ["register"] ++ aliases) {-  modeHelp = "show postings and running total" `withAliases` aliases- ,modeGroupFlags = Group {-     groupUnnamed = [-      flagNone ["cumulative"]         (\opts -> setboolopt "change" opts)-        "show running total from report start date (default)"-     ,flagNone ["historical","H"] (\opts -> setboolopt "historical" opts)-        "show historical running total/balance (includes postings before report start date)\n "-     ,flagNone ["average","A"] (\opts -> setboolopt "average" opts)-        "show running average of posting amounts instead of total (implies --empty)"-     ,flagNone ["related","r"] (\opts -> setboolopt "related" opts) "show postings' siblings instead"-     ,flagReq  ["width","w"] (\s opts -> Right $ setopt "width" s opts) "N"-      ("set output width (default: " ++-#ifdef mingw32_HOST_OS-       show defaultWidth-#else-       "terminal width"-#endif-       ++ " or $COLUMNS). -wN,M sets description width as well."-       )-    ]-     ++ outputflags-    ,groupHidden = []-    ,groupNamed = [generalflagsgroup1]-    }- }-  where aliases = ["reg"]---- | Print a (posting) register report.-register :: CliOpts -> Journal -> IO ()-register opts@CliOpts{reportopts_=ropts} j = do-  d <- getCurrentDay-  let fmt = outputFormatFromOpts opts-      render | fmt=="csv" = const ((++"\n") . printCSV . postingsReportAsCsv)-             | otherwise  = postingsReportAsText-  writeOutput opts $ render opts $ postingsReport ropts (queryFromOpts d ropts) j--postingsReportAsCsv :: PostingsReport -> CSV-postingsReportAsCsv (_,is) =-  ["txnidx","date","description","account","amount","total"]-  :-  map postingsReportItemAsCsvRecord is--postingsReportItemAsCsvRecord :: PostingsReportItem -> Record-postingsReportItemAsCsvRecord (_, _, _, p, b) = [idx,date,desc,acct,amt,bal]-  where-    idx  = show $ maybe 0 tindex $ ptransaction p-    date = showDate $ postingDate p -- XXX csv should show date2 with --date2-    desc = T.unpack $ maybe "" tdescription $ ptransaction p-    acct = bracket $ T.unpack $ paccount p-      where-        bracket = case ptype p of-                             BalancedVirtualPosting -> (\s -> "["++s++"]")-                             VirtualPosting -> (\s -> "("++s++")")-                             _ -> id-    amt = showMixedAmountOneLineWithoutPrice $ pamount p-    bal = showMixedAmountOneLineWithoutPrice b---- | Render a register report as plain text suitable for console output.-postingsReportAsText :: CliOpts -> PostingsReport -> String-postingsReportAsText opts (_,items) = unlines $ map (postingsReportItemAsText opts amtwidth balwidth) items-  where-    amtwidth = maximumStrict $ 12 : map (strWidth . showMixedAmount . itemamt) items-    balwidth = maximumStrict $ 12 : map (strWidth . showMixedAmount . itembal) items-    itemamt (_,_,_,Posting{pamount=a},_) = a-    itembal (_,_,_,_,a) = a--tests_postingsReportAsText = [-  "postingsReportAsText" ~: do-  -- "unicode in register layout" ~: do-    j <- readJournal'-      "2009/01/01 * медвежья шкура\n  расходы:покупки  100\n  актив:наличные\n"-    let opts = defreportopts-    (postingsReportAsText defcliopts $ postingsReport opts (queryFromOpts (parsedate "2008/11/26") opts) j) `is` unlines-      ["2009/01/01 медвежья шкура       расходы:покупки                100           100"-      ,"                                актив:наличные                -100             0"]- ]---- | Render one register report line item as plain text. Layout is like so:--- @--- <---------------- width (specified, terminal width, or 80) -------------------->--- date (10)  description           account              amount (12)   balance (12)--- DDDDDDDDDD dddddddddddddddddddd  aaaaaaaaaaaaaaaaaaa  AAAAAAAAAAAA  AAAAAAAAAAAA--- @--- If description's width is specified, account will use the remaining space.--- Otherwise, description and account divide up the space equally.------ With a report interval, the layout is like so:--- @--- <---------------- width (specified, terminal width, or 80) -------------------->--- date (21)              account                        amount (12)   balance (12)--- DDDDDDDDDDDDDDDDDDDDD  aaaaaaaaaaaaaaaaaaaaaaaaaaaaa  AAAAAAAAAAAA  AAAAAAAAAAAA--- @------ date and description are shown for the first posting of a transaction only.------ Returns a string which can be multi-line, eg if the running balance--- has multiple commodities. Does not yet support formatting control--- like balance reports.----postingsReportItemAsText :: CliOpts -> Int -> Int -> PostingsReportItem -> String-postingsReportItemAsText opts preferredamtwidth preferredbalwidth (mdate, menddate, mdesc, p, b) =-  -- use elide*Width to be wide-char-aware-  -- trace (show (totalwidth, datewidth, descwidth, acctwidth, amtwidth, balwidth)) $-  intercalate "\n" $-    [concat [fitString (Just datewidth) (Just datewidth) True True date-            ," "-            ,fitString (Just descwidth) (Just descwidth) True True desc-            ,"  "-            ,fitString (Just acctwidth) (Just acctwidth) True True acct-            ,"  "-            ,fitString (Just amtwidth) (Just amtwidth) True False amtfirstline-            ,"  "-            ,fitString (Just balwidth) (Just balwidth) True False balfirstline-            ]]-    ++-    [concat [spacer-            ,fitString (Just amtwidth) (Just amtwidth) True False a-            ,"  "-            ,fitString (Just balwidth) (Just balwidth) True False b-            ]-     | (a,b) <- zip amtrest balrest-     ]-    where-      -- calculate widths-      (totalwidth,mdescwidth) = registerWidthsFromOpts opts-      (datewidth, date) = case (mdate,menddate) of-                            (Just _, Just _)   -> (21, showDateSpan (DateSpan mdate menddate))-                            (Nothing, Just _)  -> (21, "")-                            (Just d, Nothing)  -> (10, showDate d)-                            _                  -> (10, "")-      (amtwidth, balwidth)-        | shortfall <= 0 = (preferredamtwidth, preferredbalwidth)-        | otherwise      = (adjustedamtwidth, adjustedbalwidth)-        where-          mincolwidth = 2 -- columns always show at least an ellipsis-          maxamtswidth = max 0 (totalwidth - (datewidth + 1 + mincolwidth + 2 + mincolwidth + 2 + 2))-          shortfall = (preferredamtwidth + preferredbalwidth) - maxamtswidth-          amtwidthproportion = fromIntegral preferredamtwidth / fromIntegral (preferredamtwidth + preferredbalwidth)-          adjustedamtwidth = round $ amtwidthproportion * fromIntegral maxamtswidth-          adjustedbalwidth = maxamtswidth - adjustedamtwidth--      remaining = totalwidth - (datewidth + 1 + 2 + amtwidth + 2 + balwidth)-      (descwidth, acctwidth)-        | hasinterval = (0, remaining - 2)-        | otherwise   = (w, remaining - 2 - w)-        where-            hasinterval = isJust menddate-            w = fromMaybe ((remaining - 2) `div` 2) mdescwidth--      -- gather content-      desc = fromMaybe "" mdesc-      acct = parenthesise $ T.unpack $ elideAccountName awidth $ paccount p-         where-          (parenthesise, awidth) =-            case ptype p of-              BalancedVirtualPosting -> (\s -> "["++s++"]", acctwidth-2)-              VirtualPosting         -> (\s -> "("++s++")", acctwidth-2)-              _                      -> (id,acctwidth)-      amt = showMixedAmountWithoutPrice $ pamount p-      bal = showMixedAmountWithoutPrice b-      -- alternate behaviour, show null amounts as 0 instead of blank-      -- amt = if null amt' then "0" else amt'-      -- bal = if null bal' then "0" else bal'-      (amtlines, ballines) = (lines amt, lines bal)-      (amtlen, ballen) = (length amtlines, length ballines)-      numlines = max 1 (max amtlen ballen)-      (amtfirstline:amtrest) = take numlines $ amtlines ++ repeat "" -- posting amount is top-aligned-      (balfirstline:balrest) = take numlines $ replicate (numlines - ballen) "" ++ ballines -- balance amount is bottom-aligned-      spacer = replicate (totalwidth - (amtwidth + 2 + balwidth)) ' '--tests_Hledger_Cli_Register :: Test-tests_Hledger_Cli_Register = TestList-  tests_postingsReportAsText

@@ -1,112 +0,0 @@-{-|--Print some statistics for the journal.---}--{-# LANGUAGE OverloadedStrings #-}--module Hledger.Cli.Stats (-  statsmode- ,stats-)-where--import Data.List-import Data.Maybe-import Data.Ord-import Data.HashSet (size, fromList)--- import Data.Text (Text)-import qualified Data.Text as T-import Data.Time.Calendar-import System.Console.CmdArgs.Explicit-import Text.Printf-import qualified Data.Map as Map--import Hledger-import Hledger.Cli.CliOptions-import Prelude hiding (putStr)-import Hledger.Cli.Utils (writeOutput)---statsmode = (defCommandMode $ ["stats"] ++ aliases) {-  modeHelp = "show some journal statistics" `withAliases` aliases- ,modeGroupFlags = Group {-     groupUnnamed = [-        flagReq  ["output-file","o"]   (\s opts -> Right $ setopt "output-file" s opts) "FILE" "write output to FILE.  A file extension matching one of the above formats selects that format."-        ]-    ,groupHidden = []-    ,groupNamed = [generalflagsgroup1]-    }- }-  where aliases = []---- like Register.summarisePostings--- | Print various statistics for the journal.-stats :: CliOpts -> Journal -> IO ()-stats opts@CliOpts{reportopts_=reportopts_} j = do-  d <- getCurrentDay-  let q = queryFromOpts d reportopts_-      l = ledgerFromJournal q j-      reportspan = (ledgerDateSpan l) `spanDefaultsFrom` (queryDateSpan False q)-      intervalspans = splitSpan (interval_ reportopts_) reportspan-      showstats = showLedgerStats l d-      s = intercalate "\n" $ map showstats intervalspans-  writeOutput opts s--showLedgerStats :: Ledger -> Day -> DateSpan -> String-showLedgerStats l today span =-    unlines $ map (\(label,value) -> concatBottomPadded [printf fmt1 label, value]) stats-    where-      fmt1 = "%-" ++ show w1 ++ "s: "-      -- fmt2 = "%-" ++ show w2 ++ "s"-      w1 = maximum $ map (length . fst) stats-      -- w2 = maximum $ map (length . show . snd) stats-      stats = [-         ("Main file" :: String, path) -- ++ " (from " ++ source ++ ")")-        ,("Included files", unlines $ drop 1 $ journalFilePaths j)-        ,("Transactions span", printf "%s to %s (%d days)" (start span) (end span) days)-        ,("Last transaction", maybe "none" show lastdate ++ showelapsed lastelapsed)-        ,("Transactions", printf "%d (%0.1f per day)" tnum txnrate)-        ,("Transactions last 30 days", printf "%d (%0.1f per day)" tnum30 txnrate30)-        ,("Transactions last 7 days", printf "%d (%0.1f per day)" tnum7 txnrate7)-        ,("Payees/descriptions", show $ size $ fromList $ map (tdescription) ts)-        ,("Accounts", printf "%d (depth %d)" acctnum acctdepth)-        ,("Commodities", printf "%s (%s)" (show $ length cs) (T.intercalate ", " cs))-      -- Transactions this month     : %(monthtxns)s (last month in the same period: %(lastmonthtxns)s)-      -- Unmarked transactions      : %(unmarked)s-      -- Days since reconciliation   : %(reconcileelapsed)s-      -- Days since last transaction : %(recentelapsed)s-       ]-           where-             j = ljournal l-             path = journalFilePath j-             ts = sortBy (comparing tdate) $ filter (spanContainsDate span . tdate) $ jtxns j-             as = nub $ map paccount $ concatMap tpostings ts-             cs = Map.keys $ commodityStylesFromAmounts $ concatMap amounts $ map pamount $ concatMap tpostings ts-             lastdate | null ts = Nothing-                      | otherwise = Just $ tdate $ last ts-             lastelapsed = maybe Nothing (Just . diffDays today) lastdate-             showelapsed Nothing = ""-             showelapsed (Just days) = printf " (%d %s)" days' direction-                                       where days' = abs days-                                             direction | days >= 0 = "days ago" :: String-                                                       | otherwise = "days from now"-             tnum = length ts-             start (DateSpan (Just d) _) = show d-             start _ = ""-             end (DateSpan _ (Just d)) = show d-             end _ = ""-             days = fromMaybe 0 $ daysInSpan span-             txnrate | days==0 = 0-                     | otherwise = fromIntegral tnum / fromIntegral days :: Double-             tnum30 = length $ filter withinlast30 ts-             withinlast30 t = d >= addDays (-30) today && (d<=today) where d = tdate t-             txnrate30 = fromIntegral tnum30 / 30 :: Double-             tnum7 = length $ filter withinlast7 ts-             withinlast7 t = d >= addDays (-7) today && (d<=today) where d = tdate t-             txnrate7 = fromIntegral tnum7 / 7 :: Double-             acctnum = length as-             acctdepth | null as = 0-                       | otherwise = maximum $ map accountNameLevel as-

@@ -1,71 +0,0 @@--- {-# OPTIONS_GHC -F -pgmF htfpp #-}-{-# LANGUAGE CPP #-}-{- |--A simple test runner for hledger's built-in unit tests.---}--module Hledger.Cli.Tests (-  testmode- ,test'-)-where--import Control.Monad--- import Data.Text (Text)-import qualified Data.Text as T-import System.Exit-import Test.HUnit--import Hledger-import Hledger.Cli--#ifdef TESTS--import Test.Framework-import {-@ HTF_TESTS @-} Hledger.Read.JournalReader---- | Run HTF unit tests and exit with success or failure.-test' :: CliOpts -> IO ()-test' _opts = htfMain htf_importedTests--#else---- | Run HUnit unit tests and exit with success or failure.-test' :: CliOpts -> IO ()-test' opts = do-  results <- runTests opts-  if errors results > 0 || failures results > 0-   then exitFailure-   else exitWith ExitSuccess--testmode = (defCommandMode ["test"]) {-  modeHelp = "run built-in self-tests"- ,modeArgs = ([], Just $ argsFlag "[REGEXPS]")- ,modeGroupFlags = Group {-     groupUnnamed = []-    ,groupHidden = []-    ,groupNamed = [generalflagsgroup3]-    }- }---- | Run all or just the matched unit tests and return their HUnit result counts.-runTests :: CliOpts -> IO Counts-runTests = liftM (fst . flip (,) 0) . runTestTT . flatTests---- -- | Run all or just the matched unit tests until the first failure or--- -- error, returning the name of the problem test if any.--- runTestsTillFailure :: CliOpts -> IO (Maybe String)--- runTestsTillFailure _ = undefined -- do---   -- let ts = flatTests opts---   --     results = liftM (fst . flip (,) 0) $ runTestTT $---   --     firstproblem = find (\counts -> )---- | All or pattern-matched tests, as a flat list to show simple names.-flatTests opts = TestList $ filter (matchesAccount (queryFromOpts nulldate $ reportopts_ opts) . T.pack . testName) $ flattenTests tests_Hledger_Cli---- -- | All or pattern-matched tests, in the original suites to show hierarchical names.--- hierarchicalTests opts = filterTests (matchesAccount (queryFromOpts nulldate $ reportopts_ opts) . testName) tests_Hledger_Cli--#endif

@@ -19,6 +19,8 @@      writeFileWithBackup,      writeFileWithBackupIfChanged,      readFileStrictly,+     pivotByOpts,+     anonymiseByOpts,      Test(TestList),     ) where@@ -27,7 +29,6 @@ import Data.Hashable (hash) import Data.List import Data.Maybe-import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.IO as T import Data.Time (Day)@@ -45,21 +46,8 @@ import Text.Printf import Text.Regex.TDFA ((=~)) ---- kludge - adapt to whichever directory version is installed, or when--- cabal macros aren't available, assume the new directory-#ifdef MIN_VERSION_directory-#if MIN_VERSION_directory(1,2,0)-#define directory_1_2-#endif-#else-#define directory_1_2-#endif--#ifdef directory_1_2 import System.Time (ClockTime(TOD)) import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)-#endif  import Hledger.Cli.CliOptions import Hledger.Data@@ -75,9 +63,8 @@   -- We kludgily read the file before parsing to grab the full text, unless   -- it's stdin, or it doesn't exist and we are adding. We read it strictly   -- to let the add command work.-  rulespath <- rulesFilePathFromOpts opts   journalpaths <- journalFilePathFromOpts opts-  ej <- readJournalFiles Nothing rulespath (not $ ignore_assertions_ opts) journalpaths+  ej <- readJournalFilesWithOpts (inputopts_ opts) journalpaths   let f   = cmd opts           . pivotByOpts opts           . anonymiseByOpts opts@@ -89,19 +76,9 @@ pivotByOpts :: CliOpts -> Journal -> Journal pivotByOpts opts =   case maybestringopt "pivot" . rawopts_ $ opts of-    Just tag -> pivot $ T.pack tag+    Just tag -> journalPivot $ T.pack tag     Nothing  -> id --- | Apply the pivot transformation by given tag on a journal.-pivot :: Text -> Journal -> Journal-pivot tag j = j{jtxns = map pivotTrans . jtxns $ j}- where-  pivotTrans t = t{tpostings = map pivotPosting . tpostings $ t}-  pivotPosting p-    | Just (_ , value) <- tagTuple = p{paccount = value, porigin = Just $ originalPosting p}-    | _                <- tagTuple = p{paccount = T.pack "", porigin = Just $ originalPosting p}-   where tagTuple = find ((tag ==) . fst) . postingAllImplicitTags $ p- -- | Apply the anonymisation transformation on a journal, if option is present anonymiseByOpts :: CliOpts -> Journal -> Journal anonymiseByOpts opts =@@ -126,6 +103,10 @@   where     anon = T.pack . flip showHex "" . (fromIntegral :: Int -> Word32) . hash +-- XXX as of since 2017/4 this is used instead of +-- balanceReportValue/multiBalanceReportValue (mostly; not yet hledger-ui)+-- | If -V/--value was requested, convert all journal amounts to their market value+-- as of the report end date. Cf http://hledger.org/manual.html#market-value journalApplyValue :: ReportOpts -> Journal -> IO Journal journalApplyValue ropts j = do     mvaluedate <- reportEndDate j ropts@@ -137,6 +118,7 @@     return $ convert j  -- | Write some output to stdout or to a file selected by --output-file.+-- If the file exists it will be overwritten. writeOutput :: CliOpts -> String -> IO () writeOutput opts s = do   f <- outputFileFromOpts opts@@ -151,10 +133,9 @@ -- Reads the full journal, without filtering. journalReload :: CliOpts -> IO (Either String Journal) journalReload opts = do-  rulespath <- rulesFilePathFromOpts opts   journalpaths <- journalFilePathFromOpts opts   ((pivotByOpts opts . journalApplyAliases (aliasesFromOpts opts)) <$>) <$>-    readJournalFiles Nothing rulespath (not $ ignore_assertions_ opts) journalpaths+    readJournalFilesWithOpts (inputopts_ opts) journalpaths  -- | Re-read the option-specified journal file(s), but only if any of -- them has changed since last read. (If the file is standard input,@@ -195,13 +176,9 @@ fileModificationTime f     | null f = getClockTime     | otherwise = (do-#ifdef directory_1_2         utc <- getModificationTime f         let nom = utcTimeToPOSIXSeconds utc         let clo = TOD (read $ takeWhile (`elem` "0123456789") $ show nom) 0 -- XXX read-#else-        clo <- getModificationTime f-#endif         return clo         )         `C.catch` \(_::C.IOException) -> getClockTime

@@ -115,7 +115,8 @@ --> <!-- [![gratipay](https://img.shields.io/gratipay/hledger.svg)]() --> -[![travis build status](https://img.shields.io/travis/simonmichael/hledger.svg)](https://travis-ci.org/simonmichael/hledger)+[![travis build status](https://img.shields.io/travis/simonmichael/hledger.svg)](https://travis.hledger.org)+[![appveyor windows build status](https://ci.appveyor.com/api/projects/status/5vejw0w5n5igdr42?svg=true)](https://appveyor.hledger.org) [![](https://img.shields.io/hackage-deps/v/hledger-lib.svg?label=hledger-lib+bounds)](http://packdeps.haskellers.com/feed?needle=hledger-lib) [![](https://img.shields.io/hackage-deps/v/hledger.svg?label=hledger+bounds)](http://packdeps.haskellers.com/feed?needle=hledger) [![](https://img.shields.io/hackage-deps/v/hledger-ui.svg?label=hledger-ui+bounds)](http://packdeps.haskellers.com/feed?needle=hledger-ui)

@@ -70,7 +70,7 @@   coreLine = concatMap helper $ flattenHeader $ zipHeader 0 is h   helper = either hsep (uncurry padLeftWide)   hsep :: Properties -> String-  hsep NoLine     = " "+  hsep NoLine     = "  "   hsep SingleLine = midBar pretty   hsep DoubleLine = doubleMidBar pretty @@ -98,7 +98,7 @@   coreLine        = concatMap helper $ flattenHeader $ zipHeader 0 is h   helper          = either vsep dashes   dashes (i,_)    = replicate i sep-  vsep NoLine     = [sep]+  vsep NoLine     = replicate 2 sep  -- match the double space sep in renderColumns    vsep SingleLine = sep : cross pretty : [sep]   vsep DoubleLine = sep : cross' ++ [sep]   cross' = case prop of

@@ -1,6 +1,6 @@ .\"t -.TH "hledger" "1" "August 2017" "hledger 1.3.1" "hledger User Manuals"+.TH "hledger" "1" "September 2017" "hledger 1.4" "hledger User Manuals"   @@ -156,31 +156,14 @@ .PP To see general usage help, including general options which are supported by most hledger commands, run \f[C]hledger\ \-h\f[].-(Note \-h and \-\-help are different, like git.) .PP General help options: .TP-.B \f[C]\-h\f[]+.B \f[C]\-h\ \-\-help\f[] show general usage (or after COMMAND, command usage) .RS .RE .TP-.B \f[C]\-\-help\f[]-show this program\[aq]s manual as plain text (or after an add\-on-COMMAND, the add\-on\[aq]s manual)-.RS-.RE-.TP-.B \f[C]\-\-man\f[]-show this program\[aq]s manual with man-.RS-.RE-.TP-.B \f[C]\-\-info\f[]-show this program\[aq]s manual with info-.RS-.RE-.TP .B \f[C]\-\-version\f[] show version .RS@@ -215,8 +198,8 @@ .RS .RE .TP-.B \f[C]\-\-pivot\ TAGNAME\f[]-use some other field/tag for account names+.B \f[C]\-\-pivot\ FIELDNAME\f[]+use some other field or tag for the account name .RS .RE .TP@@ -269,7 +252,7 @@ .RE .TP .B \f[C]\-\-date2\f[]-show, and match with \-b/\-e/\-p/date:, secondary dates instead+match the secondary date instead (see command help for other effects) .RS .RE .TP@@ -293,8 +276,8 @@ .RS .RE .TP-.B \f[C]\-\-depth=N\f[]-hide accounts/postings deeper than N+.B \f[C]\-NUM\ \-\-depth=NUM\f[]+hide/aggregate accounts or postings more than NUM levels deep .RS .RE .TP@@ -315,11 +298,10 @@ .RS .RE .PP-Note when multiple similar reporting options are provided, the last one-takes precedence.-Eg \f[C]\-p\ feb\ \-p\ mar\f[] is equivalent to \f[C]\-p\ mar\f[].+When a reporting option appears more than once in the command line, the+last one takes precedence. .PP-Some of these can also be written as queries.+Some reporting options can also be written as query arguments. .SS Command options .PP To see options for a particular command, including command\-specific@@ -337,6 +319,12 @@ .PP Most hledger commands accept arguments after the command name, which are often a query, filtering the data in some way.+.SS Argument expansion+.PP+You can save a set of command line options/arguments in a file, one per+line, and then reuse them by writing \f[C]\@FILE\f[] in a command line.+(To prevent this expansion of \f[C]\@\f[]\-arguments, precede them with+a \f[C]\-\-\f[] argument.) .SS Special characters .PP Option and argument values which contain problematic characters should@@ -353,13 +341,19 @@ \f[C]hledger\ balance\ cur:\[aq]\\$\[aq]\f[] or \f[C]hledger\ balance\ cur:\\\\$\f[]. .PP-There\[aq]s more..-options and arguments get de\-escaped when hledger is passing them to an-addon executable.-In this case you might need \f[I]triple\f[]\-escaping.+When hledger is invoking an addon executable (like hledger\-ui), options+and arguments get de\-escaped once more, so you might need+\f[I]triple\f[]\-escaping. Eg: \f[C]hledger\ ui\ cur:\[aq]\\\\$\[aq]\f[] or-\f[C]hledger\ ui\ cur:\\\\\\\\$\f[].+\f[C]hledger\ ui\ cur:\\\\\\\\$\f[] in bash.+(The number of backslashes in fish shell is left as an exercise for the+reader.) .PP+Inside a file used for argument expansion, one less level of escaping is+enough.+(And in this case, backslashes seem to work better than quotes.+Eg: \f[C]cur:\\$\f[]).+.PP If in doubt, keep things simple: .IP \[bu] 2 run add\-on executables directly@@ -758,29 +752,28 @@ \f[C]hledger\ register\ checking\ \-p\ "every\ 3rd\ day\ of\ week"\f[] .SS Depth limiting .PP-With the \f[C]\-\-depth\ N\f[] option, commands like account, balance-and register will show only the uppermost accounts in the account tree,-down to level N.+With the \f[C]\-\-depth\ N\f[] option (short form: \f[C]\-N\f[]),+commands like account, balance and register will show only the uppermost+accounts in the account tree, down to level N. Use this when you want a summary with less detail.+This flag has the same effect as a \f[C]depth:\f[] query argument (so+\f[C]\-2\f[], \f[C]\-\-depth=2\f[] or \f[C]depth:2\f[] are basically+equivalent). .SS Pivoting .PP Normally hledger sums amounts, and organizes them in a hierarchy, based on account name.-The \f[C]\-\-pivot\ TAGNAME\f[] option causes it to sum and organize-hierarchy based on some other field instead.-.PP-TAGNAME is the full, case\-insensitive name of a tag you have defined,-or one of the built\-in implicit tags (like \f[C]code\f[] or-\f[C]payee\f[]).-As with account names, when tag values have-\f[C]multiple:colon\-separated:parts\f[] hledger will build hierarchy,-displayed in tree\-mode reports, summarisable with a depth limit, and so-on.+The \f[C]\-\-pivot\ FIELD\f[] option causes it to sum and organize+hierarchy based on the value of some other field instead.+FIELD can be: \f[C]code\f[], \f[C]description\f[], \f[C]payee\f[],+\f[C]note\f[], or the full name (case insensitive) of any tag.+As with account names, values containing \f[C]colon:separated:parts\f[]+will be displayed hierarchically in reports. .PP \f[C]\-\-pivot\f[] is a general option affecting all reports; you can think of hledger transforming the journal before any other processing, replacing every posting\[aq]s account name with the value of the-specified tag on that posting, inheriting it from the transaction or+specified field on that posting, inheriting it from the transaction or using a blank value if it\[aq]s not present. .PP An example:@@ -957,12 +950,12 @@ after the command name, to filter the data by date, account name or other criteria. The syntax is similar to a web search: one or more space\-separated-search terms, quotes to enclose whitespace, optional prefixes to match-specific fields.-Multiple search terms are combined as follows:+search terms, quotes to enclose whitespace, prefixes to match specific+fields, a not: prefix to negate the match. .PP-All commands except print: show transactions/postings/accounts which-match (or negatively match)+We do not yet support arbitrary boolean combinations of search terms;+instead most commands show transactions/postings/accounts which match+(or negatively match): .IP \[bu] 2 any of the description terms AND .IP \[bu] 2@@ -972,7 +965,7 @@ .IP \[bu] 2 all the other terms. .PP-The print command: show transactions which+The print command instead shows transactions which: .IP \[bu] 2 match any of the description terms AND .IP \[bu] 2@@ -982,10 +975,13 @@ .IP \[bu] 2 match all the other terms. .PP-The following kinds of search terms can be used:+The following kinds of search terms can be used.+Remember these can also be prefixed with \f[B]\f[C]not:\f[]\f[], eg to+exclude a particular subaccount. .TP .B \f[B]\f[C]REGEX\f[]\f[]-match account names by this regular expression+match account names by this regular expression.+(No prefix is equivalent to \f[C]acct:\f[]). .RS .RE .TP@@ -1023,7 +1019,7 @@ .RE .TP .B \f[B]\f[C]desc:REGEX\f[]\f[]-match transaction descriptions+match transaction descriptions. .RS .RE .TP@@ -1047,6 +1043,18 @@ .RS .RE .TP+.B \f[B]\f[C]note:REGEX\f[]\f[]+match transaction notes (part of description right of \f[C]|\f[], or+whole description when there\[aq]s no \f[C]|\f[])+.RS+.RE+.TP+.B \f[B]\f[C]payee:REGEX\f[]\f[]+match transaction payee/payer names (part of description left of+\f[C]|\f[], or whole description when there\[aq]s no \f[C]|\f[])+.RS+.RE+.TP .B \f[B]\f[C]real:,\ real:0\f[]\f[] match real or virtual postings respectively .RS@@ -1065,18 +1073,13 @@ transaction. .RS .RE-.TP-.B \f[B]\f[C]not:\f[]\f[]-before any of the above negates the match.-.RS-.RE+.PP+The following special search term is used automatically in hledger\-web,+only: .TP .B \f[B]\f[C]inacct:ACCTNAME\f[]\f[]-a special term used automatically when you click an account name in-hledger\-web, specifying the account register we are currently in-(selects the transactions of that account and how to show them, can be-filtered further with \f[C]acct\f[] etc).-Not supported elsewhere in hledger.+tells hledger\-web to show the transaction register for this account.+Can be filtered further with \f[C]acct\f[] etc. .RS .RE .PP@@ -1096,12 +1099,17 @@ .PP Run a subcommand by writing its name as first argument (eg \f[C]hledger\ incomestatement\f[]).-You can also write any unambiguous prefix of a command name-(\f[C]hledger\ inc\f[]), or one of the standard short aliases displayed-in the command list (\f[C]hledger\ is\f[]).+You can also write one of the standard short aliases displayed in+parentheses in the command list (\f[C]hledger\ b\f[]), or any any+unambiguous prefix of a command name (\f[C]hledger\ inc\f[]).+.PP+Here are all the builtin commands in alphabetical order.+See also \f[C]hledger\f[] for a more organised command list, and+\f[C]hledger\ CMD\ \-h\f[] for detailed command help. .SS accounts .PP Show account names.+Alias: a. .TP .B \f[C]\-\-tree\f[] show short account names, as a tree@@ -1278,7 +1286,7 @@ .SS balance .PP Show accounts and their balances.-Alias: bal.+Aliases: b, bal. .TP .B \f[C]\-\-change\f[] show balance change in each period (default)@@ -1354,6 +1362,12 @@ Use unicode to display prettier tables. .RS .RE+.TP+.B \f[C]\-\-sort\-amount\f[]+Sort by amount (total row amount, or by average if that is displayed),+instead of account name (in flat mode)+.RS+.RE .PP The balance command displays accounts and balances. It is hledger\[aq]s most featureful and versatile command.@@ -1732,6 +1746,11 @@ in single\-column balance reports: use this custom line format .RS .RE+.TP+.B \f[C]\-\-sort\-amount\f[]+sort by amount instead of account name+.RS+.RE .PP This command displays a simple balance sheet. It currently assumes that you have top\-level accounts named@@ -1767,6 +1786,47 @@ Normally balancesheet shows historical ending balances, which is what you need for a balance sheet; note this means it ignores report begin dates.+.SS balancesheetequity+.PP+Show a balance sheet including equity.+Alias: bse.+.PP+Other than showing the equity accounts, this command is exactly the same+as the command balancesheet.+Please refer to it for the available options.+.PP+This command displays a balancesheet.+It currently assumes that you have top\-level accounts named+\f[C]asset\f[], \f[C]liability\f[] and \f[C]equity\f[] (plural forms+also allowed.)+.IP+.nf+\f[C]+$\ hledger\ balancesheetequity+Balance\ Sheet\ With\ Equity++Assets:+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ $\-2\ \ assets+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ $1\ \ \ \ bank:saving+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ $\-3\ \ \ \ cash+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ $\-2++Liabilities:+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ $1\ \ liabilities:debts+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ $1++Equity:+\ \ \ \ \ \ \ \ \ \ $1\ \ equity:owner+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\ \ \ \ \ \ \ \ \ \ $1++Total:+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 0+\f[]+.fi .SS cashflow .PP Show a cashflow statement.@@ -1830,12 +1890,17 @@ in single\-column balance reports: use this custom line format .RS .RE+.TP+.B \f[C]\-\-sort\-amount\f[]+sort by amount instead of account name+.RS+.RE .PP This command displays a simple cashflow statement It shows the change in all "cash" (ie, liquid assets) accounts for the period. It currently assumes that cash accounts are under a top\-level account-named \f[C]asset\f[] and do not contain \f[C]receivable\f[] or-\f[C]A/R\f[] (plural forms also allowed.)+named \f[C]asset\f[] and do not contain \f[C]receivable\f[],+\f[C]:A/R\f[] or \f[C]:fixed\f[]. .IP .nf \f[C]@@ -1860,44 +1925,77 @@ Normally cashflow shows changes in assets per period, though as with multicolumn balance reports you can alter the report mode with \f[C]\-\-change\f[]/\f[C]\-\-cumulative\f[]/\f[C]\-\-historical\f[].+.SS check\-dates+.PP+Check that transactions are sorted by increasing date.+With a query, only matched transactions\[aq] dates are checked.+.SS check\-dupes+.PP+Report account names having the same leaf but different prefixes.+An example: http://stefanorodighiero.net/software/hledger\-dupes.html+.SS equity+.PP+Print closing/opening transactions that bring some or all account+balances to zero and back.+Can be useful for bringing account balances across file boundaries. .SS help .PP Show any of the hledger manuals. .PP-The \f[C]help\f[] command displays any of the main hledger man pages.-(Unlike \f[C]hledger\ \-\-help\f[], which displays only the hledger man-page.) Run it with no arguments to list available topics (their names-are shortened for easier typing), and run \f[C]hledger\ help\ TOPIC\f[]-to select one.-The output is similar to a man page, but fixed width.-It may be long, so you may wish to pipe it into a pager.-See also info and man.+The \f[C]help\f[] command displays any of the main hledger manuals, in+one of several ways.+Run it with no argument to list the manuals, or provide a full or+partial manual name to select one.+.PP+hledger manuals are available in several formats.+hledger help will use the first of these display methods that it finds:+info, man, $PAGER, less, stdout (or when non\-interactive, just stdout).+You can force a particular viewer with the \f[C]\-\-info\f[],+\f[C]\-\-man\f[], \f[C]\-\-pager\f[], \f[C]\-\-cat\f[] flags. .IP .nf \f[C] $\ hledger\ help-Choose\ a\ topic,\ eg:\ hledger\ help\ cli-cli,\ ui,\ web,\ api,\ journal,\ csv,\ timeclock,\ timedot+Please\ choose\ a\ manual\ by\ typing\ "hledger\ help\ MANUAL"\ (a\ substring\ is\ ok).+Manuals:\ hledger\ hledger\-ui\ hledger\-web\ hledger\-api\ journal\ csv\ timeclock\ timedot \f[] .fi .IP .nf \f[C]-$\ hledger\ help\ cli\ |\ less--hledger(1)\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ hledger\ User\ Manuals\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ hledger(1)-+$\ hledger\ help\ h\ \-\-man +hledger(1)\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ hledger\ User\ Manuals\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ hledger(1)  NAME \ \ \ \ \ \ \ hledger\ \-\ a\ command\-line\ accounting\ tool  SYNOPSIS-\ \ \ \ \ \ \ hledger\ [\-f\ FILE]\ COMMAND\ [OPTIONS]\ [CMDARGS]-\ \ \ \ \ \ \ hledger\ [\-f\ FILE]\ ADDONCMD\ \-\-\ [OPTIONS]\ [CMDARGS]-:+\ \ \ \ \ \ \ hledger\ [\-f\ FILE]\ COMMAND\ [OPTIONS]\ [ARGS]+\ \ \ \ \ \ \ hledger\ [\-f\ FILE]\ ADDONCMD\ \-\-\ [OPTIONS]\ [ARGS]+\ \ \ \ \ \ \ hledger++DESCRIPTION+\ \ \ \ \ \ \ hledger\ \ is\ \ a\ \ cross\-platform\ \ program\ \ for\ tracking\ money,\ time,\ or\ any+\&... \f[] .fi+.SS import+.PP+Read new transactions added to each FILE since last run, and add them to+the main journal file.+.TP+.B \f[C]\-\-dry\-run\f[]+just show the transactions to be imported+.RS+.RE+.PP+Input files are provided as arguments, or glob patterns.+So eg to add new transactions from all CSV files to the main journal:+hledger import *.csv+.PP+New transactions are detected like print \-\-new (using .latest.FILE+state files). .SS incomestatement .PP Show an income statement.@@ -1961,6 +2059,11 @@ in single\-column balance reports: use this custom line format .RS .RE+.TP+.B \f[C]\-\-sort\-amount\f[]+sort by amount instead of account name+.RS+.RE .PP This command displays a simple income statement. It currently assumes that you have top\-level accounts named@@ -1997,37 +2100,13 @@ Normally incomestatement shows revenues/expenses per period, though as with multicolumn balance reports you can alter the report mode with \f[C]\-\-change\f[]/\f[C]\-\-cumulative\f[]/\f[C]\-\-historical\f[].-.SS info-.PP-Show any of the hledger manuals using info.-.PP-The \f[C]info\f[] command displays any of the hledger reference manuals-using the info hypertextual documentation viewer.-This can be a very efficient way to browse large manuals.-It requires the "info" program to be available in your PATH.-.PP-As with help, run it with no arguments to list available topics-(manuals).-.SS man-.PP-Show any of the hledger manuals using man.-.PP-The \f[C]man\f[] command displays any of the hledger reference manuals-using man, the standard documentation viewer on unix systems.-This will fit the text to your terminal width, and probably invoke a-pager automatically.-It requires the "man" program to be available in your PATH.+.SS prices .PP-As with help, run it with no arguments to list available topics-(manuals).+Print all market prices from the journal. .SS print .PP Show transactions from the journal.-.TP-.B \f[C]\-x\ \ \ \ \ \-\-explicit\f[]-show all amounts explicitly-.RS-.RE+Aliases: p, txns. .TP .B \f[C]\-m\ STR\ \-\-match=STR\f[] show the transaction whose description is most similar to STR, and is@@ -2035,6 +2114,16 @@ .RS .RE .TP+.B \f[C]\-\-new\f[]+show only newer\-dated transactions added in each file since last run+.RS+.RE+.TP+.B \f[C]\-x\ \ \ \ \ \-\-explicit\f[]+show all amounts explicitly+.RS+.RE+.TP .B \f[C]\-O\ FMT\ \-\-output\-format=FMT\f[] select the output format. Supported formats: txt, csv.@@ -2074,25 +2163,54 @@ .fi .PP The print command displays full journal entries (transactions) from the-journal file, tidily formatted.-.PP-As of hledger 1.2, print\[aq]s output is always a valid hledger journal.-However it may not preserve all original content, eg it does not print-directives or inter\-transaction comments.+journal file in date order, tidily formatted.+print\[aq]s output is always a valid hledger journal.+It preserves all transaction information, but it does not preserve+directives or inter\-transaction comments .PP-Normally, transactions\[aq] implicit/explicit amount style is preserved:-when an amount is omitted in the journal, it will be omitted in the+Normally, the journal entry\[aq]s explicit or implicit amount style is+preserved.+Ie when an amount is omitted in the journal, it will be omitted in the output.-You can use the \f[C]\-x/\-\-explicit\f[] flag to make all amounts-explicit, which can be useful for troubleshooting or for making your-journal more readable and robust against data entry errors.-Note, in this mode postings with a multi\-commodity amount (possible-with an implicit amount in a multi\-commodity transaction) will be split-into multiple single\-commodity postings, for valid journal output.+You can use the \f[C]\-x\f[]/\f[C]\-\-explicit\f[] flag to make all+amounts explicit, which can be useful for troubleshooting or for making+your journal more readable and robust against data entry errors.+Note, \f[C]\-x\f[] will cause postings with a multi\-commodity amount+(these can arise when a multi\-commodity transaction has an implicit+amount) will be split into multiple single\-commodity postings, for+valid journal output. .PP-With \-B/\-\-cost, amounts with transaction prices are converted to cost-(using the transaction price).+With \f[C]\-B\f[]/\f[C]\-\-cost\f[], amounts with transaction prices are+converted to cost using that price. .PP+With \f[C]\-m\f[]/\f[C]\-\-match\f[] and a STR argument, print will show+at most one transaction: the one one whose description is most similar+to STR, and is most recent.+STR should contain at least two characters.+If there is no similar\-enough match, no transaction will be shown.+.PP+With \f[C]\-\-new\f[], for each FILE being read, hledger reads (and+writes) a special state file (\f[C]\&.latest.FILE\f[] in the same+directory), containing the latest transaction date(s) that were seen+last time FILE was read.+When this file is found, only transactions with newer dates (and new+transactions on the latest date) are printed.+This is useful for ignoring already\-seen entries in import data, such+as downloaded CSV files.+Eg:+.IP+.nf+\f[C]+$\ hledger\ \-f\ bank1.csv\ print\ \-\-new+#\ shows\ transactions\ added\ since\ last\ print\ \-\-new\ on\ this\ file+\f[]+.fi+.PP+This assumes that transactions added to FILE always have same or+increasing dates, and that transactions on the same day do not get+reordered.+See also the import command.+.PP The print command also supports output destination and CSV output. Here\[aq]s an example of print\[aq]s CSV output: .IP@@ -2129,10 +2247,13 @@ for convenience. (Those names are not accurate in the accounting sense; it just puts negative amounts under credit and zero or greater amounts under debit.)+.SS print\-unique+.PP+Print transactions which do not reuse an already\-seen description. .SS register .PP Show postings and their running total.-Alias: reg.+Aliases: r, reg. .TP .B \f[C]\-\-cumulative\f[] show running total from report start date (default)@@ -2305,6 +2426,14 @@ The register command also supports the \f[C]\-o/\-\-output\-file\f[] and \f[C]\-O/\-\-output\-format\f[] options for controlling output destination and CSV output.+.SS register\-match+.PP+Print the one posting whose transaction description is closest to DESC,+in the style of the register command.+Helps ledger\-autosync detect already\-seen transactions when importing.+.SS rewrite+.PP+Print all transactions, adding custom postings to the matched ones. .SS stats .PP Show some journal statistics.@@ -2337,6 +2466,9 @@ .PP The stats command also supports \f[C]\-o/\-\-output\-file\f[] for controlling output destination.+.SS tags+.PP+List all the tag names in use. .SS test .PP Run built\-in unit tests.@@ -2440,33 +2572,6 @@ .SS check .PP hledger\-check.hs checks more powerful account balance assertions.-.SS check\-dates-.PP-hledger\-check\-dates.hs checks that journal entries are ordered by-date.-.SS check\-dupes-.PP-hledger\-check\-dupes.hs checks for account names sharing the same leaf-name.-.SS equity-.PP-hledger\-equity.hs prints balance\-resetting transactions, useful for-bringing account balances across file boundaries.-.SS prices-.PP-hledger\-prices.hs prints all prices from the journal.-.SS print\-unique-.PP-hledger\-print\-unique.hs prints transactions which do not reuse an-already\-seen description.-.SS register\-match-.PP-hledger\-register\-match.hs helps ledger\-autosync detect already\-seen-transactions when importing.-.SS rewrite-.PP-hledger\-rewrite.hs Adds one or more custom postings to matched-transactions. .SH ENVIRONMENT .PP \f[B]COLUMNS\f[] The screen width used by the register command.