haskell/minio-hs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make FileUploader to use positional argument. (#32)

Browse Source
This commit is contained in:
Krishnan Parthasarathi 2017-03-16 18:05:15 +05:30 committed by Aditya Manthramurthy
parent 06542032ac
commit e835e6ed72
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

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

18
examples/FileUploader.hs
View File

@ -21,7 +21,7 @@
{-# Language OverloadedStrings, ScopedTypeVariables #-} {-# Language OverloadedStrings, ScopedTypeVariables #-}
import Network.Minio import Network.Minio
import Control.Monad.Catch (catch) import Control.Monad.Catch (catchIf)
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Options.Applicative import Options.Applicative
import Prelude import Prelude
@ -36,19 +36,21 @@ import Data.Text (pack)
-- --
-- optparse-applicative package based command-line parsing. -- optparse-applicative package based command-line parsing.
fileNameOpts :: Parser FilePath fileNameArgs :: Parser FilePath
fileNameOpts = strOption fileNameArgs = strArgument
(long "filename" (metavar "FILENAME"
<> metavar "FILENAME"
<> help "Name of file to upload to AWS S3 or a Minio server") <> help "Name of file to upload to AWS S3 or a Minio server")
cmdParser = info cmdParser = info
(helper <*> fileNameOpts) (helper <*> fileNameArgs)
(fullDesc (fullDesc
<> progDesc "FileUploader" <> progDesc "FileUploader"
<> header <> header
"FileUploader - a simple file-uploader program using minio-hs") "FileUploader - a simple file-uploader program using minio-hs")
ignoreMinioErr :: ServiceErr -> Minio ()
ignoreMinioErr = return . const ()
main :: IO () main :: IO ()
main = do main = do
@ -60,9 +62,7 @@ main = do
res <- runResourceT $ runMinio minioPlayCI $ do res <- runResourceT $ runMinio minioPlayCI $ do
-- Make a bucket; catch bucket already exists exception if thrown. -- Make a bucket; catch bucket already exists exception if thrown.
catch catchIf (== BucketAlreadyOwnedByYou) (makeBucket bucket Nothing) ignoreMinioErr
(makeBucket bucket Nothing)
(\(_ :: MinioErr) -> liftIO $ putStrLn "Bucket already exists, proceeding with upload file.")
-- Upload filepath to bucket; object is derived from filepath. -- Upload filepath to bucket; object is derived from filepath.
fPutObject bucket object filepath fPutObject bucket object filepath