Merge pull request #374 from ambiata/topic/coding-standards

mismi-cli: Apply coding standards

Author: erikd-ambiata

mismi-cli/main/s3.hs

@@ -6,11 +6,11 @@ import           BuildInfo_ambiata_mismi_cli
 import           DependencyInfo_ambiata_mismi_cli
 
 import           Control.Lens (over, set)
-import           Control.Monad.IO.Class
-import           Control.Monad.Trans.Resource
+import           Control.Monad.IO.Class (MonadIO, liftIO)
+import           Control.Monad.Trans.Resource (runResourceT)
 
 import qualified Data.ByteString as BS
-import           Data.Conduit
+import           Data.Conduit ((=$=), ($$), ($$+-))
 import qualified Data.Conduit.List as DC
 import qualified Data.List as List
 import           Data.Map (Map)
@@ -25,22 +25,23 @@ import qualified Mismi.OpenSSL as O
 import           Mismi.S3
 import           Mismi.S3.Amazonka (s3)
 
-import           Options.Applicative
-
 import           P hiding (All)
 
-import           System.IO
+import           System.IO (BufferMode (..), FilePath, IO, hSetBuffering, print, stderr, stdout)
 import           System.Environment (lookupEnv)
-import           System.Exit
-import           System.FilePath
-import           System.Posix.Signals
-import           System.Posix.Process
+import           System.Exit (ExitCode (..), exitFailure, exitSuccess)
+import qualified System.FilePath as FP
+import           System.Posix.Signals (Handler (..), installHandler, sigINT, sigQUIT, sigTERM)
+import           System.Posix.Process (exitImmediately)
 
 import           Text.Printf (printf)
 
-import           X.Control.Monad.Trans.Either.Exit
+import           X.Control.Monad.Trans.Either.Exit (orDie)
 import           X.Control.Monad.Trans.Either (EitherT, eitherT, runEitherT, firstEitherT)
-import           X.Options.Applicative
+import           X.Options.Applicative (Completer, Parser, RunType (..), SafeCommand (..)
+                                       , action, auto, command', flag, flag', help, long, metavar
+                                       , pOption, option, short, value)
+import qualified X.Options.Applicative as XOA
 
 data Recursive =
     NotRecursive
@@ -103,7 +104,7 @@ main = do
     installHandler s (Catch . void . exitImmediately $ ExitFailure 111) Nothing
 
   f <- lookupEnv "AWS_FORCE"
-  dispatch (mismi $ parseForce f) >>= \case
+  XOA.dispatch (mismi $ parseForce f) >>= \case
       VersionCommand ->
         T.putStrLn ("s3: " <> T.pack buildInfoVersion) >> exitSuccess
       DependencyCommand ->
@@ -283,16 +284,16 @@ renderExit f =
 
 optAppendFileName :: FilePath -> Key -> FilePath
 optAppendFileName f k = fromMaybe f $ do
-  fp <- valueOrEmpty (hasTrailingPathSeparator f || takeFileName f == ".") (takeDirectory f)
+  fp <- valueOrEmpty (FP.hasTrailingPathSeparator f || FP.takeFileName f == ".") (FP.takeDirectory f)
   bn <- basename k
-  pure . combine fp $ T.unpack bn
+  pure . FP.combine fp $ T.unpack bn
 
 mismi :: Force -> Parser (SafeCommand Command)
 mismi f =
-  safeCommand (commandP' f <|> deprecatedCommandP')
+  XOA.safeCommand (commandP' f <|> deprecatedCommandP')
 
 commandP' :: Force -> Parser Command
-commandP' f = subparser $
+commandP' f = XOA.subparser $
      command' "upload"
               "Upload a file to s3."
               (Upload <$> filepath' <*> address' <*> writeMode' f)
@@ -331,8 +332,8 @@ commandP' f = subparser $
               (List <$> address' <*> recursive')
 
 deprecatedCommandP' :: Parser Command
-deprecatedCommandP' = subparser $
-  internal <> command'
+deprecatedCommandP' = XOA.subparser $
+  XOA.internal <> command'
     "read"
     "Read from an address. (Deprecated in favour of `s3 cat`.)"
     (Read <$> address')
@@ -371,26 +372,26 @@ detail' =
     <> help "Display only the combined total for a prefix."
 
 address' :: Parser Address
-address' = argument (pOption s3Parser) $
+address' = XOA.argument (pOption s3Parser) $
      metavar "S3URI"
   <> help "An s3 uri, i.e. s3://bucket/prefix/key"
-  <> completer addressCompleter
+  <> XOA.completer addressCompleter
 
 outputAddress' :: Parser Address
 outputAddress' = option (pOption s3Parser) $
      long "output"
   <> metavar "S3URI"
   <> help "An s3 uri, i.e. s3://bucket/prefix/key"
-  <> completer addressCompleter
+  <> XOA.completer addressCompleter
 
 filepath' :: Parser FilePath
-filepath' = strArgument $
+filepath' = XOA.strArgument $
      metavar "FILEPATH"
   <> help "Absolute file path, i.e. /tmp/fred"
   <> action "file"
 
 text' :: Parser Text
-text' = T.pack <$> (strArgument $
+text' = T.pack <$> (XOA.strArgument $
      metavar "STRING"
   <> help "Data to write to S3 address.")
 
@@ -414,14 +415,14 @@ syncMode' =
   <|> (flag' OverwriteSync $ long "overwrite" <> help "Overwrite files that already exist in the target location.")
 
 fork' :: Parser Int
-fork' = option auto $
+fork' = XOA.option auto $
      long "fork"
   <> metavar "INT"
   <> help "Number of threads to fork CopyObject call by."
   <> value 8
 
 addressCompleter :: Completer
-addressCompleter = mkCompleter $ \s -> do
+addressCompleter = XOA.mkCompleter $ \s -> do
   res <- runEitherT (go s)
   case res of
     Left   _ -> pure []