Ajout : profilage du code.

[comptalang.git] / cli / Hcompta / CLI / Command.hs

diff --git a/cli/Hcompta/CLI/Command.hs b/cli/Hcompta/CLI/Command.hs
index d3d8bd5a3d4a4e9be7d9f1d180dd1c83e3cbf183..254e550690e66415cb067473fd9ab922027a4035 100644 (file)
--- a/cli/Hcompta/CLI/Command.hs
+++ b/cli/Hcompta/CLI/Command.hs
@@ -16,7 +16,7 @@ import qualified System.IO as IO
 import qualified Hcompta.CLI.Args as Args
 import qualified Hcompta.CLI.Command.Balance as Command.Balance
 import qualified Hcompta.CLI.Command.GL as Command.GL
-import qualified Hcompta.CLI.Command.Print as Command.Print
+import qualified Hcompta.CLI.Command.Journal as Command.Journal
 import           Hcompta.CLI.Context (Context)
 import qualified Hcompta.CLI.Context as Context
 import qualified Hcompta.CLI.Lang as Lang
@@ -33,8 +33,9 @@ usage = do
                , ""
                , usageInfo "OPTIONS" options
                , "COMMANDS (use "++bin++" <command> --help for specific help)"
-               , "  balance [-i FILE]"
-               , "  print   [-i FILE]"
+               , "  journal [-i FILE] [-t TRANSACTION_FILTER] [-p POSTING_FILTER]"
+               , "  balance [-i FILE] [-t TRANSACTION_FILTER] [-p POSTING_FILTER] BALANCE_FILTER"
+               , "  gl      [-i FILE] [-t TRANSACTION_FILTER] [-p POSTING_FILTER] GL_FILTER"
                ]
 
 options :: Args.Options Context
@@ -64,14 +65,14 @@ options =
        , Option "" ["color"]
         (OptArg (\arg _context context -> do
                color <- case arg of
-                Nothing       -> return $ Just True
-                Just "always" -> return $ Just True
-                Just "never"  -> return $ Just False
-                Just "auto"   -> return $ Nothing
-                Just _        -> Write.fatal context $
-                       W.text "--color option expects \"always\", \"auto\", or \"never\" as value"
+                Nothing     -> return $ Just True
+                Just "yes"  -> return $ Just True
+                Just "no"   -> return $ Just False
+                Just "auto" -> return $ Nothing
+                Just _      -> Write.fatal context $
+                       W.text "--color option expects \"auto\" (default), \"yes\", or \"no\" as value"
                return $ context{Context.color})
-         "[always|auto|never]")
+         "[auto|yes|no]")
         "colorize output"
        , Option "" ["lang"]
         (ReqArg (\lang _context context -> do
@@ -86,9 +87,9 @@ options =
 run :: Context -> String -> [String] -> IO ()
 run context cmd args =
        case cmd of
-        "print"   -> Command.Print.run   context args
         "balance" -> Command.Balance.run context args
         "gl"      -> Command.GL.run      context args
+        "journal" -> Command.Journal.run context args
         _ -> usage >>= Write.fatal context .
                ((W.text "unknown command: " <> (W.text $ TL.pack cmd) <> W.line) <>) .
                W.text . TL.pack