Merge pull request #42 from jecaro/verbose-out

Get the verbose switch out of subcommands

Author: apauley

.circleci/config.yml

@@ -45,10 +45,10 @@ jobs:
           command: git clone --recurse-submodules https://github.com/apauley/hledger-flow-example.git $HOME/hledger-flow-example
       - run:
           name: hledger-flow import
-          command: ~/.local/bin/hledger-flow import --show-options --verbose $HOME/hledger-flow-example
+          command: ~/.local/bin/hledger-flow --verbose import --show-options $HOME/hledger-flow-example
       - run:
           name: hledger-flow report
-          command: ~/.local/bin/hledger-flow report --show-options --verbose $HOME/hledger-flow-example
+          command: ~/.local/bin/hledger-flow --verbose report --show-options $HOME/hledger-flow-example
       - run:
           name: Undo package.yaml change before cache_save
           command: git checkout HEAD package.yaml

.travis.yml

@@ -56,8 +56,8 @@ install:
 script:
   - stack test --interleaved-output
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git checkout HEAD package.yaml; fi
-  - hledger-flow import --show-options --verbose $HOME/hledger-flow-example
-  - hledger-flow report --show-options --verbose $HOME/hledger-flow-example
+  - hledger-flow --verbose import --show-options $HOME/hledger-flow-example
+  - hledger-flow --verbose report --show-options $HOME/hledger-flow-example
 
 deploy:
   - provider: releases

app/Main.hs

@@ -16,50 +16,56 @@ import Hledger.Flow.CSVImport
 
 data SubcommandParams = SubcommandParams { maybeBaseDir :: Maybe FilePath
                                          , hledgerPathOpt :: Maybe FilePath
-                                         , verbose :: Bool
                                          , showOpts :: Bool
                                          , sequential :: Bool
                                          }
                       deriving (Show)
-data Command = Version | Import SubcommandParams | Report SubcommandParams deriving (Show)
+data Command = Import SubcommandParams | Report SubcommandParams deriving (Show)
+
+data BaseCommand = Version | Command { verbose :: Bool, command :: Command } deriving (Show)
 
 main :: IO ()
 main = do
-  cmd <- options "An hledger workflow focusing on automated statement import and classification:\nhttps://github.com/apauley/hledger-flow#readme" parser
+  cmd <- options "An hledger workflow focusing on automated statement import and classification:\nhttps://github.com/apauley/hledger-flow#readme" baseCommandParser
   case cmd of
     Version          -> stdout $ select versionInfo
-    Import subParams -> toImportOptions subParams >>= importCSVs
-    Report subParams -> toReportOptions subParams >>= generateReports
+    Command verbose' (Import subParams) -> toImportOptions verbose' subParams >>= importCSVs
+    Command verbose' (Report subParams) -> toReportOptions verbose' subParams >>= generateReports
 
-toImportOptions :: SubcommandParams -> IO IT.ImportOptions
-toImportOptions params = do
+toImportOptions :: Bool -> SubcommandParams -> IO IT.ImportOptions
+toImportOptions verbose' params = do
   bd <- determineBaseDir $ maybeBaseDir params
   hli <- hledgerInfoFromPath $ hledgerPathOpt params
   return IT.ImportOptions { IT.baseDir = bd
                           , IT.hledgerInfo = hli
-                          , IT.verbose = verbose params
+                          , IT.verbose = verbose'
                           , IT.showOptions = showOpts params
                           , IT.sequential = sequential params }
 
-toReportOptions :: SubcommandParams -> IO RT.ReportOptions
-toReportOptions params = do
+toReportOptions :: Bool -> SubcommandParams -> IO RT.ReportOptions
+toReportOptions verbose' params = do
   bd <- determineBaseDir $ maybeBaseDir params
   hli <- hledgerInfoFromPath $ hledgerPathOpt params
   return RT.ReportOptions { RT.baseDir = bd
                           , RT.hledgerInfo = hli
-                          , RT.verbose = verbose params
+                          , RT.verbose = verbose'
                           , RT.showOptions = showOpts params
                           , RT.sequential = sequential params }
 
-parser :: Parser Command
-parser = fmap Import (subcommand "import" "Converts CSV transactions into categorised journal files" subcommandParser)
-  <|> fmap Report (subcommand "report" "Generate Reports" subcommandParser)
+baseCommandParser :: Parser BaseCommand
+baseCommandParser = (Command <$> verboseParser <*> commandParser)
   <|> flag' Version (long "version" <> short 'V' <> help "Display version information")
 
+commandParser :: Parser Command
+commandParser = fmap Import (subcommand "import" "Converts CSV transactions into categorised journal files" subcommandParser)
+  <|> fmap Report (subcommand "report" "Generate Reports" subcommandParser)
+
+verboseParser :: Parser Bool
+verboseParser = switch (long "verbose" <> short 'v' <> help "Print more verbose output")
+
 subcommandParser :: Parser SubcommandParams
 subcommandParser = SubcommandParams
   <$> optional (argPath "basedir" "The hledger-flow base directory")
   <*> optional (optPath "hledger-path" 'H' "The full path to an hledger executable")
-  <*> switch (long "verbose" <> short 'v' <> help "Print more verbose output")
   <*> switch (long "show-options" <> help "Print the options this program will run with")
   <*> switch (long "sequential" <> help "Disable parallel processing")