From 050fd603f8695ec9924f222e40e39b9eae71d8fc Mon Sep 17 00:00:00 2001 From: Vehbi Sinan Tunalioglu Date: Sat, 27 Apr 2024 12:08:49 +0800 Subject: [PATCH] feat: make server list output information in JSON and tabular format --- package.yaml | 3 ++ src/Clompse/Cli.hs | 77 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/package.yaml b/package.yaml index b012158..6cd8390 100644 --- a/package.yaml +++ b/package.yaml @@ -27,6 +27,7 @@ library: - autodocodec-schema - bytestring - conduit + - format-numbers - githash - hetzner - ip @@ -35,12 +36,14 @@ library: - optparse-applicative - scientific - string-interpolate + - table-layout - template-haskell - text - time - typed-process - unordered-containers - yaml + executables: clompse: main: Main.hs diff --git a/src/Clompse/Cli.hs b/src/Clompse/Cli.hs index c95cf45..36b0406 100644 --- a/src/Clompse/Cli.hs +++ b/src/Clompse/Cli.hs @@ -1,4 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeApplications #-} -- | This module provides top-level definitions for the CLI program. @@ -8,14 +10,19 @@ import qualified Autodocodec.Schema as ADC.Schema import Clompse.Config (Config, readConfigFile) import qualified Clompse.Meta as Meta import qualified Clompse.Programs.ListServers as Programs +import qualified Clompse.Types as Types import Control.Applicative ((<**>), (<|>)) import Control.Monad (join) import qualified Data.Aeson as Aeson import qualified Data.ByteString.Lazy.Char8 as BLC +import Data.Maybe (fromMaybe) import qualified Data.Text as T +import qualified Data.Text.Format.Numbers as Fmt.Number import qualified Data.Text.IO as TIO import qualified Options.Applicative as OA import System.Exit (ExitCode (..)) +import qualified Text.Layout.Table as Tab +import qualified Zamazingo.Text as Z.Text -- * Entrypoint @@ -105,20 +112,84 @@ commandList = OA.hsubparser (OA.command "list" (OA.info parser infomod) <> OA.me parser = doList <$> OA.strOption (OA.short 'c' <> OA.long "config" <> OA.metavar "CONFIG" <> OA.help "Configuration file to use.") + <*> OA.switch (OA.short 'j' <> OA.long "json" <> OA.help "Format output in JSON.") -- | @list@ CLI command program. -doList :: FilePath -> IO ExitCode -doList fp = do +doList :: FilePath -> Bool -> IO ExitCode +doList fp json = do eCfg <- readConfigFile fp case eCfg of Left err -> TIO.putStrLn ("Error reading configuration: " <> err) >> pure (ExitFailure 1) Right cfg -> do servers <- Programs.listServers cfg - BLC.putStrLn (Aeson.encode servers) + (if json then doListPrintJson else doListTabulate) servers pure ExitSuccess +-- | Prints list server results in JSON format. +doListPrintJson :: [Programs.ListServersResult] -> IO () +doListPrintJson = BLC.putStrLn . Aeson.encode + + +-- | Prints list server results in tabular format. +doListTabulate :: [Programs.ListServersResult] -> IO () +doListTabulate rs = + let cs = + [ Tab.numCol + , Tab.column Tab.expand Tab.left Tab.noAlign Tab.noCutMark + , Tab.column Tab.expand Tab.left Tab.noAlign Tab.noCutMark + , Tab.column Tab.expand Tab.left Tab.noAlign Tab.noCutMark + , Tab.column Tab.expand Tab.left Tab.noAlign Tab.noCutMark + , Tab.column Tab.expand Tab.left Tab.noAlign Tab.noCutMark + , Tab.column Tab.expand Tab.left Tab.noAlign Tab.noCutMark + , Tab.numCol + , Tab.numCol + , Tab.numCol + , Tab.column Tab.expand Tab.left Tab.noAlign Tab.noCutMark + , Tab.column Tab.expand Tab.left Tab.noAlign Tab.noCutMark + ] + hs = + Tab.titlesH + [ "#" + , "Profile" + , "Provider" + , "Region" + , "ID" + , "Name" + , "State" + , "CPU" + , "Ram" + , "Disk" + , "Type" + , "Created" + ] + mkRows i p Types.Server {..} = + Tab.rowG . fmap T.unpack $ + [ formatIntegral i + , p + , Types.providerCode _serverProvider + , _serverRegion + , _serverId + , fromMaybe "" _serverName + , Types.stateCode _serverState + , maybe "" formatIntegral _serverCpu + , maybe "" formatIntegral _serverRam + , maybe "" formatIntegral _serverDisk + , fromMaybe "" _serverType + , maybe "" Z.Text.tshow _serverCreatedAt + ] + rows = + fmap (\(i, (p, s)) -> mkRows i p s) . zip [1 :: Int ..] $ + concatMap (\(Programs.ListServersResult p is) -> fmap (p,) is) rs + in putStrLn $ Tab.tableString cs Tab.unicodeS hs rows + + +formatIntegral :: Integral a => a -> T.Text +formatIntegral = + Fmt.Number.prettyI (Just ',') . fromIntegral + + -- ** version