Port `gargantext-admin` into `gargantext-cli`

bin/gargantext-admin/Main.hs

-{-|
-Module      : Main.hs
-Description : Gargantext Admin tools
-Copyright   : (c) CNRS, 2017-Present
-License     : AGPL + CECILL v3
-Maintainer  : team@gargantext.org
-Stability   : experimental
-Portability : POSIX
-
-
-
- -}
-
-{-# LANGUAGE Strict            #-}
-
-module Main where
-
-import Gargantext.API.Dev (withDevEnv, runCmdDev)
-import Gargantext.API.Errors.Types
-import Gargantext.Database.Action.User.New (newUsers)
-import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude (Cmd'')
-import Gargantext.Prelude
-import Gargantext.API.Admin.EnvTypes (DevEnv)
-import qualified Data.List.NonEmpty as NE
-
-main :: IO ()
-main = do
-  (iniPath:mails) <- getArgs
-
-  withDevEnv iniPath $ \env -> do
-    x <- runCmdDev env ((newUsers $ NE.map cs (NE.fromList mails)) :: Cmd'' DevEnv BackendInternalError (NonEmpty UserId))
-    putStrLn (show x :: Text)
-  pure ()

bin/gargantext-cli/CLI/Admin.hs

+
+module CLI.Admin (
+    adminCLI
+  , adminCmd
+  ) where
+
+import CLI.Types
+import Data.List.NonEmpty qualified as NE
+import Data.Text qualified as T
+import Gargantext.API.Admin.EnvTypes
+import Gargantext.API.Dev
+import Gargantext.API.Errors
+import Gargantext.Core.Types
+import Gargantext.Database.Action.User.New
+import Gargantext.Database.Prelude
+import Gargantext.Prelude
+import Options.Applicative
+import Prelude (String)
+
+adminCLI :: AdminArgs -> IO ()
+adminCLI (AdminArgs iniPath mails) = do
+  withDevEnv iniPath $ \env -> do
+    x <- runCmdDev env ((newUsers $ NE.map cs (NE.fromList mails)) :: Cmd'' DevEnv BackendInternalError (NonEmpty UserId))
+    putStrLn (show x :: Text)
+
+adminCmd :: HasCallStack => Mod CommandFields CLI
+adminCmd = command "admin" (info (helper <*> fmap CLISub admin_p) (progDesc "Create users."))
+
+admin_p :: Parser CLICmd
+admin_p = fmap CCMD_admin $ AdminArgs
+  <$> ( strOption ( long "ini-path"
+                    <> metavar "FILEPATH"
+                    <> help "Location of the .ini path"
+                    ) )
+  <*> ( option (maybeReader emails_p) ( long "emails"
+                      <> metavar "email1,email2,..."
+                      <> help "A comma-separated list of emails."
+                      ) )
+
+emails_p :: String -> Maybe [String]
+emails_p s = case T.splitOn "," (T.pack s) of
+  [] -> Nothing
+  xs -> pure $ map T.unpack xs

bin/gargantext-cli/CLI/Types.hs

@@ -22,11 +22,16 @@ data ObfuscateDBArgs = ObfuscateDBArgs {
   , dbPassword :: !Text
   } deriving (Show, Eq)
 
+data AdminArgs = AdminArgs
+  { iniPath :: !FilePath
+  , emails  :: [String]
+  } deriving (Show, Eq)
 
 data CLICmd
   = CCMD_clean_csv_corpus
   | CCMD_filter_terms_and_cooc !CorpusFile !TermListFile !OutputFile
   | CCMD_obfuscate_db !ObfuscateDBArgs
+  | CCMD_admin !AdminArgs
   deriving (Show, Eq)
 
 data CLI =

bin/gargantext-cli/Main.hs

@@ -23,6 +23,7 @@ import CLI.FilterTermsAndCooc
 import CLI.ObfuscateDB (obfuscateDB, obfuscateDBCmd)
 import CLI.Types
 import Options.Applicative
+import CLI.Admin (adminCLI, adminCmd)
 
 runCLI :: CLI -> IO ()
 runCLI = \case
@@ -32,17 +33,20 @@ runCLI = \case
     -> filterTermsAndCoocCLI corpusFile termListFile outputFile
   CLISub (CCMD_obfuscate_db args)
     -> obfuscateDB args
+  CLISub (CCMD_admin args)
+    -> adminCLI args
 
 main :: IO ()
 main = runCLI =<< execParser opts
   where
     opts = info (helper <*> allOptions)
       ( fullDesc
-     <> progDesc "CLI for the gargantext-server"
+     <> progDesc "CLI for the gargantext-server. Type --help for all the commands."
      <> header "gargantext-cli tools" )
 
 allOptions :: Parser CLI
 allOptions = subparser (
                  filterTermsAndCoocCmd <>
-                 obfuscateDBCmd
+                 obfuscateDBCmd <>
+                 adminCmd
                  )

gargantext.cabal

@@ -692,27 +692,13 @@ library
     , zip-archive ^>= 0.4.3
     , zlib ^>= 0.6.2.3
 
-executable gargantext-admin
-  import:
-      defaults
-    , optimized
-  main-is: Main.hs
-  other-modules:
-      Paths_gargantext
-  hs-source-dirs:
-      bin/gargantext-admin
-  build-depends:
-      extra
-    , gargantext
-    , gargantext-prelude
-    , text
-
 executable gargantext-cli
   import:
       defaults
     , optimized
   main-is: Main.hs
   other-modules:
+      CLI.Admin
       CLI.CleanCsvCorpus
       CLI.FilterTermsAndCooc
       CLI.ObfuscateDB