cli: Refactor compoundBalanceCommand.

hledger/Hledger/Cli/CompoundBalanceCommand.hs

@@ -13,19 +13,19 @@ module Hledger.Cli.CompoundBalanceCommand (
 ) where
 
 import Data.List (foldl')
-import Data.Maybe
+import Data.Maybe (fromMaybe, mapMaybe)
-import qualified Data.Text as TS
+import qualified Data.Text as T
 import qualified Data.Text.Lazy as TL
-import Data.Time.Calendar
+import Data.Time.Calendar (Day, addDays)
 import System.Console.CmdArgs.Explicit as C
 import Hledger.Read.CsvReader (CSV, printCSV)
 import Lucid as L hiding (value_)
-import Text.Tabular as T
+import Text.Tabular as Tab
 
 import Hledger
 import Hledger.Cli.Commands.Balance
 import Hledger.Cli.CliOptions
-import Hledger.Cli.Utils (unsupportedOutputFormatError, writeOutput)
+import Hledger.Cli.Utils (unsupportedOutputFormatError, writeOutputLazyText)
 
 -- | Description of a compound balance report command,
 -- from which we generate the command's cmdargs mode and IO action.
@@ -89,7 +89,8 @@ compoundBalanceCommandMode CompoundBalanceCommandSpec{..} =
 -- | Generate a runnable command from a compound balance command specification.
 compoundBalanceCommand :: CompoundBalanceCommandSpec -> (CliOpts -> Journal -> IO ())
 compoundBalanceCommand CompoundBalanceCommandSpec{..} opts@CliOpts{reportspec_=rspec, rawopts_=rawopts} j = do
-    let
+    writeOutputLazyText opts $ render cbr
+  where
     ropts@ReportOpts{..} = rsOpts rspec
     -- use the default balance type for this report, unless the user overrides
     mBalanceTypeOverride =
@@ -149,11 +150,11 @@ compoundBalanceCommand CompoundBalanceCommandSpec{..} opts@CliOpts{reportspec_=r
     cbr  = cbr'{cbrTitle=title}
 
     -- render appropriately
-    writeOutput opts $ case outputFormatFromOpts opts of
+    render = case outputFormatFromOpts opts of
-        "txt"  -> compoundBalanceReportAsText ropts' cbr
+        "txt"  -> TL.pack . compoundBalanceReportAsText ropts'
-        "csv"  -> printCSV (compoundBalanceReportAsCsv ropts cbr) ++ "\n"
+        "csv"  -> TL.pack . printCSV . compoundBalanceReportAsCsv ropts'
-        "html" -> (++"\n") $ TL.unpack $ L.renderText $ compoundBalanceReportAsHtml ropts cbr
+        "html" -> L.renderText . compoundBalanceReportAsHtml ropts'
-        "json" -> (++"\n") $ TL.unpack $ toJsonText cbr
+        "json" -> toJsonText
         x      -> error' $ unsupportedOutputFormatError x
 
 -- | Summarise one or more (inclusive) end dates, in a way that's
@@ -196,7 +197,7 @@ compoundBalanceReportAsText ropts
   where
     bigtable =
       case map (subreportAsTable ropts) subreports of
-        []   -> T.empty
+        []   -> Tab.empty
         r:rs -> foldl' concatTables r rs
     bigtable'
       | no_total_ ropts || length subreports == 1 =
@@ -217,11 +218,11 @@ compoundBalanceReportAsText ropts
         -- convert to table
         Table lefthdrs tophdrs cells = balanceReportAsTable ropts r
         -- tweak the layout
-        t = Table (T.Group SingleLine [Header title, lefthdrs]) tophdrs ([]:cells)
+        t = Table (Tab.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')
+    Table (Tab.Group DoubleLine [hLeft, hLeft']) hTop (dat ++ dat')
 
 -- | Render a compound balance report as CSV.
 -- Subreports' CSV is concatenated, with the headings rows replaced by a
@@ -268,7 +269,7 @@ compoundBalanceReportAsHtml :: ReportOpts -> CompoundPeriodicReport DisplayName
 compoundBalanceReportAsHtml ropts cbr =
   let
     CompoundPeriodicReport title colspans subreports (PeriodicReportRow _ coltotals grandtotal grandavg) = cbr
-    colspanattr = colspan_ $ TS.pack $ show $
+    colspanattr = colspan_ $ T.pack $ show $
       1 + length colspans + (if row_total_ ropts then 1 else 0) + (if average_ ropts then 1 else 0)
     leftattr = style_ "text-align:left"
     blankrow = tr_ $ td_ [colspanattr] $ toHtmlRaw (" "::String)
@@ -309,7 +310,7 @@ compoundBalanceReportAsHtml ropts cbr =
                     ]
 
   in do
-    style_ (TS.unlines [""
+    style_ (T.unlines [""
       ,"td { padding:0 0.5em; }"
       ,"td:nth-child(1) { white-space:nowrap; }"
       ,"tr:nth-child(even) td { background-color:#eee; }"