A peer-to-peer stack for code collaboration
daemon: Extract CLI code
Thomas Scholtes9641d4e172d8
diff --git a/exe/Daemon.hs b/exe/Daemon.hsindex b548dc5..a4f0a31 100644--- a/exe/Daemon.hs+++ b/exe/Daemon.hs@@ -23,11 +23,11 @@ import qualified Data.Map.Strict as Mapimport qualified Data.Text as Timport qualified Data.Time.Clock.System as Timeimport Network.Wai.Handler.Warp (run)-import Options.Applicativeimport Servantimport System.IO (BufferMode(..), hSetBuffering)import UnliftIO.Async+import qualified Radicle.Daemon.Cli as Cliimport Radicle.Daemon.Errorimport qualified Radicle.Daemon.HttpApi as Apiimport Radicle.Daemon.Ipfs@@ -39,53 +39,9 @@ import Radicle.Daemon.Monadimport qualified Radicle.Ipfs as Ipfsimport Radicle hiding (DaemonError, Env)-import qualified Radicle.Internal.CLI as Localimport qualified Radicle.Internal.ConcurrentMap as CMapimport qualified Radicle.Internal.UUID as UUID--- * Main--data Opts = Opts- { port :: Int- , machineConfigFile :: FilePath- , debug :: Bool- }--cliInfo :: IO (ParserInfo Opts)-cliInfo = do- defaultMachineConfigFile <- Local.getRadicleFile "machines.json"- pure $- info (opts defaultMachineConfigFile <**> helper)- ( fullDesc- <> progDesc "Run the radicle daemon"- <> header "rad-daemon-radicle"- )--opts :: FilePath -> Parser Opts-opts defaultMachineConfigFile = do- port <-- option auto- ( long "port"- <> help "daemon port"- <> metavar "PORT"- <> showDefault- <> value 8909- )- machineConfigFile <-- strOption- ( long "machine-config"- <> help "Where to store configuration for known machines"- <> metavar "FILE"- <> showDefault- <> value defaultMachineConfigFile- )- debug <-- switch- ( long "debug"- <> help "enable debug logging"- <> showDefault- )- pure $ Opts{..}-- | Repeatedly tries to connect to the Radicle IPFS daemon API until-- succesfull. Times out after five seconds and throws 'IpfsDaemonNotReachable'.@@ -123,7 +79,7 @@ waitForIpfsDaemon = domain :: IO Voidmain = dohSetBuffering stdout LineBuffering- Opts{..} <- execParser =<< cliInfo+ Cli.Opts{..} <- Cli.parsemachineConfigFileLock <- newMVar ()machines <- CachedMachines <$> CMap.emptylet env = Env{ logLevel = if debug then LogDebug else LogInfo, ..}diff --git a/package.yaml b/package.yamlindex efdda42..01a2ae9 100644--- a/package.yaml+++ b/package.yaml@@ -53,6 +53,7 @@ library:- microlens- mtl- multibase+ - optparse-applicative- pointed- prettyprinter- prettyprinter-ansi-terminal@@ -158,7 +159,6 @@ executables:dependencies:- containers- mtl- - optparse-applicative- radicle- safe-exceptions- servant-serverdiff --git a/src/Radicle/Daemon/Cli.hs b/src/Radicle/Daemon/Cli.hsnew file mode 100644index 0000000..fc4707a--- /dev/null+++ b/src/Radicle/Daemon/Cli.hs@@ -0,0 +1,55 @@+module Radicle.Daemon.Cli+ ( parse+ , Opts(..)+ ) where++import Protolude hiding (option)++import Options.Applicative++import qualified Radicle.Internal.CLI as Local++data Opts = Opts+ { port :: Int+ , machineConfigFile :: FilePath+ , debug :: Bool+ }++parse :: IO Opts+parse = execParser =<< parserInfo++parserInfo :: IO (ParserInfo Opts)+parserInfo = do+ defaultMachineConfigFile <- Local.getRadicleFile "machines.json"+ pure $+ info (opts defaultMachineConfigFile <**> helper)+ ( fullDesc+ <> progDesc "Run the radicle daemon"+ <> header "rad-daemon-radicle"+ )++opts :: FilePath -> Parser Opts+opts defaultMachineConfigFile = do+ port <-+ option auto+ ( long "port"+ <> help "daemon port"+ <> metavar "PORT"+ <> showDefault+ <> value 8909+ )+ machineConfigFile <-+ strOption+ ( long "machine-config"+ <> help "Where to store configuration for known machines"+ <> metavar "FILE"+ <> showDefault+ <> value defaultMachineConfigFile+ )+ debug <-+ switch+ ( long "debug"+ <> help "enable debug logging"+ <> showDefault+ )+ pure Opts{..}