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

stats: list included journal files

Browse Source
This commit is contained in:
Simon Michael 2012-05-30 09:17:18 +00:00
parent 33b7c91e20
commit 6ccecb6ae0
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-lib/Hledger/Utils.hs
View File

@ -135,8 +135,8 @@ concatBottomPadded strs = intercalate "\n" $ map concat $ transpose padded
lss = map lines strs lss = map lines strs
h = maximum $ map length lss h = maximum $ map length lss
ypad ls = ls ++ replicate (difforzero h (length ls)) "" ypad ls = ls ++ replicate (difforzero h (length ls)) ""
xpad ls = map (padleft w) ls where w | null ls = 0 xpad ls = map (padright w) ls where w | null ls = 0
| otherwise = maximum $ map length ls | otherwise = maximum $ map length ls
padded = map (xpad . ypad) lss padded = map (xpad . ypad) lss
-- | Compose strings vertically and right-aligned. -- | Compose strings vertically and right-aligned.

14
hledger/Hledger/Cli/Stats.hs
View File

@ -34,13 +34,15 @@ stats CliOpts{reportopts_=reportopts_} j = do
showLedgerStats :: Ledger -> Day -> DateSpan -> String showLedgerStats :: Ledger -> Day -> DateSpan -> String
showLedgerStats l today span = showLedgerStats l today span =
unlines (map (uncurry (printf fmt)) stats) unlines $ map (\(label,value) -> concatBottomPadded [printf fmt1 label, value]) stats
where where
fmt = "%-" ++ show w1 ++ "s: %-" ++ show w2 ++ "s" fmt1 = "%-" ++ show w1 ++ "s: "
-- fmt2 = "%-" ++ show w2 ++ "s"
w1 = maximum $ map (length . fst) stats w1 = maximum $ map (length . fst) stats
w2 = maximum $ map (length . show . snd) stats -- w2 = maximum $ map (length . show . snd) stats
stats = [ stats = [
("Journal file", journalFilePath $ ledgerJournal l) ("Main journal file", path) -- ++ " (from " ++ source ++ ")")
,("Included journal files", unlines $ drop 1 $ journalFilePaths j)
,("Transactions span", printf "%s to %s (%d days)" (start span) (end span) days) ,("Transactions span", printf "%s to %s (%d days)" (start span) (end span) days)
,("Last transaction", maybe "none" show lastdate ++ showelapsed lastelapsed) ,("Last transaction", maybe "none" show lastdate ++ showelapsed lastelapsed)
,("Transactions", printf "%d (%0.1f per day)" tnum txnrate) ,("Transactions", printf "%d (%0.1f per day)" tnum txnrate)
@ -55,7 +57,9 @@ showLedgerStats l today span =
-- Days since last transaction : %(recentelapsed)s -- Days since last transaction : %(recentelapsed)s
] ]
where where
ts = sortBy (comparing tdate) $ filter (spanContainsDate span . tdate) $ jtxns $ ledgerJournal l j = ledgerJournal l
path = journalFilePath j
ts = sortBy (comparing tdate) $ filter (spanContainsDate span . tdate) $ jtxns j
as = nub $ map paccount $ concatMap tpostings ts as = nub $ map paccount $ concatMap tpostings ts
cs = Map.keys $ canonicaliseCommodities $ nub $ map commodity $ concatMap amounts $ map pamount $ concatMap tpostings ts cs = Map.keys $ canonicaliseCommodities $ nub $ map commodity $ concatMap amounts $ map pamount $ concatMap tpostings ts
lastdate | null ts = Nothing lastdate | null ts = Nothing