balance: support -s with account patterns

Account.hs

@@ -19,6 +19,9 @@ data Account = Account {
       abalance :: Amount
 }
 
+instance Show Account where
+    show (Account a ts b) = printf "Account %s with %d transactions" a $ length ts
+
 nullacct = Account "" [] nullamt
 
 mkAccount :: Ledger -> AccountName -> Account
@@ -108,7 +111,7 @@ ledgerAccountTreeMatching l showsubs [] =
     ledgerAccountTreeMatching l showsubs [".*"]
 ledgerAccountTreeMatching l showsubs acctpats = 
     addDataToAccountNameTree l $ 
-    filterAccountNameTree acctpats $ 
+    filterAccountNameTree acctpats showsubs $ 
     ledgerAccountNameTree l
 
 showLedgerAccounts :: Ledger -> Bool -> [String] -> String

AccountName.hs

@@ -82,10 +82,11 @@ showAccountNameTree t =
         where
           topacct = indentAccountName 0 $ root t
 
-filterAccountNameTree :: [String] -> Tree AccountName -> Tree AccountName
+filterAccountNameTree :: [String] -> Bool -> Tree AccountName -> Tree AccountName
-filterAccountNameTree pats =
+filterAccountNameTree pats keepsubs =
-    treefilter matchany
+    treefilter $ \a -> matchpats a || (keepsubs && issubofmatch a)
     where
-      matchany a = any (match a) pats
+      matchpats a = any (match a) pats
       match a pat = matchAccountName pat $ accountLeafName a
+      issubofmatch a = any matchpats $ parentAccountNames a
 

TODO

@@ -75,7 +75,6 @@ algorithm:
 2 add subaccounts if -s
 3 display account tree, eliding boring accounts
 
-include subaccounts
 elide boring accounts