Make FileUploader to use positional argument. (#32)
This commit is contained in:
parent
06542032ac
commit
e835e6ed72
20
README.md
20
README.md
@ -51,7 +51,7 @@ stack haddock
|
||||
{-# Language OverloadedStrings, ScopedTypeVariables #-}
|
||||
import Network.Minio
|
||||
|
||||
import Control.Monad.Catch (catch)
|
||||
import Control.Monad.Catch (catchIf)
|
||||
import Control.Monad.IO.Class (liftIO)
|
||||
import Options.Applicative
|
||||
import Prelude
|
||||
@ -66,19 +66,21 @@ import Data.Text (pack)
|
||||
--
|
||||
|
||||
-- optparse-applicative package based command-line parsing.
|
||||
fileNameOpts :: Parser FilePath
|
||||
fileNameOpts = strOption
|
||||
(long "filename"
|
||||
<> metavar "FILENAME"
|
||||
fileNameArgs :: Parser FilePath
|
||||
fileNameArgs = strArgument
|
||||
(metavar "FILENAME"
|
||||
<> help "Name of file to upload to AWS S3 or a Minio server")
|
||||
|
||||
cmdParser = info
|
||||
(helper <*> fileNameOpts)
|
||||
(helper <*> fileNameArgs)
|
||||
(fullDesc
|
||||
<> progDesc "FileUploader"
|
||||
<> header
|
||||
"FileUploader - a simple file-uploader program using minio-hs")
|
||||
|
||||
ignoreMinioErr :: ServiceErr -> Minio ()
|
||||
ignoreMinioErr = return . const ()
|
||||
|
||||
|
||||
main :: IO ()
|
||||
main = do
|
||||
@ -90,9 +92,7 @@ main = do
|
||||
|
||||
res <- runResourceT $ runMinio minioPlayCI $ do
|
||||
-- Make a bucket; catch bucket already exists exception if thrown.
|
||||
catch
|
||||
(makeBucket bucket Nothing)
|
||||
(\(_ :: MError) -> liftIO $ putStrLn "Bucket already exists, proceeding with upload file.")
|
||||
catchIf (== BucketAlreadyOwnedByYou) (makeBucket bucket Nothing) ignoreMinioErr
|
||||
|
||||
-- Upload filepath to bucket; object is derived from filepath.
|
||||
fPutObject bucket object filepath
|
||||
@ -105,7 +105,7 @@ main = do
|
||||
### Run fileuploader
|
||||
|
||||
``` sh
|
||||
./FileUploader.hs --filename "path/to/my/file"
|
||||
./FileUploader.hs "path/to/my/file"
|
||||
|
||||
```
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
{-# Language OverloadedStrings, ScopedTypeVariables #-}
|
||||
import Network.Minio
|
||||
|
||||
import Control.Monad.Catch (catch)
|
||||
import Control.Monad.Catch (catchIf)
|
||||
import Control.Monad.IO.Class (liftIO)
|
||||
import Options.Applicative
|
||||
import Prelude
|
||||
@ -36,19 +36,21 @@ import Data.Text (pack)
|
||||
--
|
||||
|
||||
-- optparse-applicative package based command-line parsing.
|
||||
fileNameOpts :: Parser FilePath
|
||||
fileNameOpts = strOption
|
||||
(long "filename"
|
||||
<> metavar "FILENAME"
|
||||
fileNameArgs :: Parser FilePath
|
||||
fileNameArgs = strArgument
|
||||
(metavar "FILENAME"
|
||||
<> help "Name of file to upload to AWS S3 or a Minio server")
|
||||
|
||||
cmdParser = info
|
||||
(helper <*> fileNameOpts)
|
||||
(helper <*> fileNameArgs)
|
||||
(fullDesc
|
||||
<> progDesc "FileUploader"
|
||||
<> header
|
||||
"FileUploader - a simple file-uploader program using minio-hs")
|
||||
|
||||
ignoreMinioErr :: ServiceErr -> Minio ()
|
||||
ignoreMinioErr = return . const ()
|
||||
|
||||
|
||||
main :: IO ()
|
||||
main = do
|
||||
@ -60,9 +62,7 @@ main = do
|
||||
|
||||
res <- runResourceT $ runMinio minioPlayCI $ do
|
||||
-- Make a bucket; catch bucket already exists exception if thrown.
|
||||
catch
|
||||
(makeBucket bucket Nothing)
|
||||
(\(_ :: MinioErr) -> liftIO $ putStrLn "Bucket already exists, proceeding with upload file.")
|
||||
catchIf (== BucketAlreadyOwnedByYou) (makeBucket bucket Nothing) ignoreMinioErr
|
||||
|
||||
-- Upload filepath to bucket; object is derived from filepath.
|
||||
fPutObject bucket object filepath
|
||||
|
||||
Loading…
Reference in New Issue
Block a user