Merge pull request #59 from apauley/reports

Use the correct years available for each owner in reports

Author: apauley

CONTRIBUTING.org

@@ -22,7 +22,9 @@ username) to the list below, and include it in a new or existing pull request.
 
 Hledger Flow is brought to you by:
 - [[https://github.com/apauley][Andreas Pauley]]
-- [[https://github.com/jecaro][Jean-Charles Quillet]]
+
+Miscellaneous contributors:
+- [[https://github.com/jecaro][Jean-Charles Quillet]] (improved command-line parameters)
 
 * Contributing
   :PROPERTIES:

ChangeLog.md

@@ -1,5 +1,13 @@
 # Changelog for [hledger-flow](https://github.com/apauley/hledger-flow)
 
+## 0.12.2
+
+Slightly smarter reporting.
+
+- Get the available report years for each individual owner. Only generate reports for those years.
+- Create uniform output directories.
+- Add system info to version output
+
 ## 0.12.1
 
 Generate some reports per owner.

bin/time-check

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+BASEDIRS="$@"
+
+date
+echo -e "A simple script to get a rough idea of execution time."
+echo -e "Each script argument is a base directory.\n"
+
+hledger-flow --version|head -n 1
+echo
+
+for bd in ${BASEDIRS}
+do
+    DIRNAME=$(basename ${bd})
+    echo "$(date) BEGIN: ${DIRNAME}"
+    for subcommand in $(echo "import report")
+    do
+        /usr/bin/time --format="${DIRNAME} ${subcommand} sequential real %es" hledger-flow --sequential ${subcommand} ${bd} 2>&1 | grep 'Generated.*reports\|Imported.*journals\|real'
+        echo
+        /usr/bin/time --format="${DIRNAME} ${subcommand} parallel   real %es" hledger-flow ${subcommand} ${bd} 2>&1 | grep 'Generated.*reports\|Imported.*journals\|real'
+        echo
+    done
+    echo -e "$(date) END: ${DIRNAME}\n"
+done
+
+echo "***"

package.yaml

@@ -1,5 +1,5 @@
 name:                hledger-flow
-version:             0.12.1.99
+version:             0.12.2.0
 synopsis:            An hledger workflow focusing on automated statement import and classification.
 category:            Finance, Console
 license:             GPL-3

src/Hledger/Flow/CSVImport.hs

@@ -47,7 +47,7 @@ importCSVs' opts ch = do
     do
       channelOutLn ch $ format ("Found "%d%" input files in "%s%". Proceeding with import...") fileCount (repr diff)
       let actions = map (extractAndImport opts ch) inputFiles :: [IO FilePath]
-      importedJournals <- if (sequential opts) then sequence actions else single . shellToList $ parallel actions
+      importedJournals <- parAwareActions opts actions
       sh $ writeIncludesUpTo opts ch "import" importedJournals
       return importedJournals
 

src/Hledger/Flow/Common.hs

@@ -35,7 +35,10 @@ versionInfo :: NE.NonEmpty Line
 versionInfo = textToLines versionInfo'
 
 versionInfo' :: Text
-versionInfo' = T.pack ("hledger-flow " ++ Version.showVersion version)
+versionInfo' = T.pack ("hledger-flow " ++ Version.showVersion version ++ " " ++
+                       os systemInfo ++ " " ++ arch systemInfo ++ " " ++
+                       compilerName systemInfo ++ " " ++
+                       Version.showVersion (compilerVersion systemInfo))
 
 systemInfo :: SystemInfo
 systemInfo = SystemInfo { os = Sys.os
@@ -181,6 +184,11 @@ procWithEmptyOutput cmd args stdinput = do
 parAwareProc :: HasSequential o => o -> ProcFun
 parAwareProc opts = if (sequential opts) then procWithEmptyOutput else procStrictWithErr
 
+parAwareActions :: HasSequential o => o -> [IO a] -> IO [a]
+parAwareActions opts = parAwareFun opts
+  where
+    parAwareFun op = if (sequential op) then sequence else single . shellToList . parallel
+
 inprocWithErrFun :: (Text -> IO ()) -> ProcInput -> Shell Line
 inprocWithErrFun errFun (cmd, args, standardInput) = do
   result <- inprocWithErr cmd args standardInput

src/Hledger/Flow/Reports.hs

@@ -15,6 +15,12 @@ import qualified Data.Text as T
 import qualified Hledger.Flow.Types as FlowTypes
 import qualified Data.List as List
 
+data ReportParams = ReportParams { ledgerFile :: FilePath
+                                 , reportYears :: [Integer]
+                                 , outputDir :: FilePath
+                                 }
+                  deriving (Show)
+
 generateReports :: ReportOptions -> IO ()
 generateReports opts = sh (
   do
@@ -38,15 +44,16 @@ generateReports' opts ch = do
   channelOutLn ch wipMsg
   owners <- single $ shellToList $ listOwners opts
   let baseJournal = journalFile opts []
-  let baseReportDir = outputDir opts ["all"]
-  years <- includeYears ch baseJournal
-  let baseParams = if length owners > 1 then [(baseJournal, baseReportDir)] else []
-  let reportParams = baseParams ++  map (ownerParams opts) owners
-  let actions = List.concat $ fmap (generateReports'' opts ch years) reportParams
-  if (sequential opts) then sequence actions else single $ shellToList $ parallel actions
+  let baseReportDir = outputReportDir opts ["all"]
+  baseYears <- includeYears ch baseJournal
+  let baseParams = if length owners > 1 then [(ReportParams baseJournal baseYears baseReportDir)] else []
+  ownerParams <- ownerParameters opts ch owners
+  let reportParams = baseParams ++ ownerParams
+  let actions = List.concat $ fmap (generateReports'' opts ch) reportParams
+  parAwareActions opts actions
 
-generateReports'' :: ReportOptions -> TChan FlowTypes.LogMessage -> [Integer] -> (FilePath, FilePath) -> [IO (Either FilePath FilePath)]
-generateReports'' opts ch years (journal, reportsDir) = do
+generateReports'' :: ReportOptions -> TChan FlowTypes.LogMessage -> ReportParams -> [IO (Either FilePath FilePath)]
+generateReports'' opts ch (ReportParams journal years reportsDir) = do
   y <- years
   let actions = map (\r -> r opts ch journal reportsDir y) [accountList, incomeStatement]
   map (fmap fst) actions
@@ -87,8 +94,16 @@ generateReport opts ch journal baseOutDir year fileName args = do
 journalFile :: ReportOptions -> [FilePath] -> FilePath
 journalFile opts dirs = (foldl (</>) (baseDir opts) dirs) </> "all-years" <.> "journal"
 
-outputDir :: ReportOptions -> [FilePath] -> FilePath
-outputDir opts dirs = foldl (</>) (baseDir opts) ("reports":dirs)
+outputReportDir :: ReportOptions -> [FilePath] -> FilePath
+outputReportDir opts dirs = foldl (</>) (baseDir opts) ("reports":dirs)
+
+ownerParameters :: ReportOptions -> TChan FlowTypes.LogMessage -> [FilePath] -> IO [ReportParams]
+ownerParameters opts ch owners = do
+  let actions = map (ownerParameters' opts ch) owners
+  parAwareActions opts actions
 
-ownerParams :: ReportOptions -> FilePath -> (FilePath, FilePath)
-ownerParams opts owner = (journalFile opts ["import", owner], outputDir opts [owner])
+ownerParameters' :: ReportOptions -> TChan FlowTypes.LogMessage -> FilePath -> IO ReportParams
+ownerParameters' opts ch owner = do
+  let ownerJournal = journalFile opts ["import", owner]
+  years <- includeYears ch ownerJournal
+  return $ ReportParams ownerJournal years (outputReportDir opts [owner])

stack.yaml

@@ -18,7 +18,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-13.20
+resolver: nightly-2019-05-16
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.