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

Align imports

Browse Source
This commit is contained in:
Aditya Manthramurthy 2017-01-22 21:19:44 +05:30
parent 0d9235b86a
commit a12fa8a077
10 changed files with 71 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Network/Minio.hs
View File

@ -1,30 +1,30 @@
module Network.Minio module Network.Minio
( (
D.ConnectInfo(..) ConnectInfo(..)
, D.connect , connect
, D.Minio , Minio
, D.runMinio , runMinio
-- * Error handling -- * Error handling
----------------------- -----------------------
-- | Test -- | Test
, D.MinioErr(..) , MinioErr(..)
, D.MErrV(..) , MErrV(..)
-- * Data Types -- * Data Types
---------------- ----------------
-- | Data types representing various object store concepts. -- | Data types representing various object store concepts.
, D.Bucket , Bucket
, D.Object , Object
, D.BucketInfo(..) , BucketInfo(..)
, D.UploadId , UploadId
-- * Bucket and Object Operations -- * Bucket and Object Operations
--------------------------------- ---------------------------------
, S.getService , getService
, S.getLocation , getLocation
, fGetObject , fGetObject
, fPutObject , fPutObject
@ -34,20 +34,16 @@ module Network.Minio
This module exports the high-level Minio API for object storage. This module exports the high-level Minio API for object storage.
-} -}
import qualified Network.Minio.S3API as S
import qualified Network.Minio.Data as D
import qualified System.IO as IO
import qualified Data.Conduit as C
import qualified Control.Monad.Trans.Resource as R import qualified Control.Monad.Trans.Resource as R
import qualified Data.Conduit as C
import qualified Data.Conduit.Binary as CB import qualified Data.Conduit.Binary as CB
import qualified System.IO as IO
import Lib.Prelude import Lib.Prelude
import Network.Minio.Data import Network.Minio.Data
import Network.Minio.S3API import Network.Minio.S3API
import Network.Minio.Utils import Network.Minio.Utils
-- | Fetch the object and write it to the given file safely. The -- | Fetch the object and write it to the given file safely. The
-- object is first written to a temporary file in the same directory -- object is first written to a temporary file in the same directory

9
src/Network/Minio/API.hs
View File

@ -7,19 +7,18 @@ module Network.Minio.API
, mkStreamRequest , mkStreamRequest
) where ) where
import qualified Network.HTTP.Types as HT import qualified Data.Conduit as C
import Data.Conduit.Binary (sourceHandleRange)
import Network.HTTP.Conduit (Response) import Network.HTTP.Conduit (Response)
import qualified Network.HTTP.Conduit as NC import qualified Network.HTTP.Conduit as NC
import qualified Data.Conduit as C import qualified Network.HTTP.Types as HT
import Data.Conduit.Binary (sourceHandleRange)
import Lib.Prelude import Lib.Prelude
import Network.Minio.Data import Network.Minio.Data
import Network.Minio.Data.Crypto import Network.Minio.Data.Crypto
import Network.Minio.Sign.V4 import Network.Minio.Sign.V4
import Network.Minio.Utils import Network.Minio.Utils
-- runRequestDebug r mgr = do -- runRequestDebug r mgr = do
-- print $ "runRequestDebug" -- print $ "runRequestDebug"

14
src/Network/Minio/Data.hs
View File

@ -1,18 +1,16 @@
{-# LANGUAGE GeneralizedNewtypeDeriving, TypeFamilies #-} {-# LANGUAGE GeneralizedNewtypeDeriving, TypeFamilies #-}
module Network.Minio.Data where module Network.Minio.Data where
import Control.Monad.Base
import Control.Monad.Trans.Control
import Control.Monad.Trans.Resource
import qualified Data.ByteString as B import qualified Data.ByteString as B
import Data.Default (Default(..))
import Network.HTTP.Client (defaultManagerSettings, HttpException) import Network.HTTP.Client (defaultManagerSettings, HttpException)
import Network.HTTP.Types (Method, Header, Query)
import qualified Network.HTTP.Conduit as NC import qualified Network.HTTP.Conduit as NC
import Data.Default (Default(..)) import Network.HTTP.Types (Method, Header, Query)
import qualified Network.HTTP.Types as HT import qualified Network.HTTP.Types as HT
import Text.XML
import Control.Monad.Trans.Resource
import Control.Monad.Trans.Control
import Control.Monad.Base
import Text.XML
import Lib.Prelude import Lib.Prelude

12
src/Network/Minio/Data/Crypto.hs
View File

@ -8,14 +8,14 @@ module Network.Minio.Data.Crypto
, digestToBase16 , digestToBase16
) where ) where
import Crypto.Hash (SHA256(..), hashWith, Digest) import Crypto.Hash (SHA256(..), hashWith, Digest)
import Crypto.MAC.HMAC (hmac, HMAC) import Crypto.Hash.Conduit (sinkHash)
import Data.ByteArray (ByteArrayAccess, convert) import Crypto.MAC.HMAC (hmac, HMAC)
import Data.ByteArray.Encoding (convertToBase, Base(Base16)) import Data.ByteArray (ByteArrayAccess, convert)
import Data.ByteArray.Encoding (convertToBase, Base(Base16))
import qualified Data.Conduit as C import qualified Data.Conduit as C
import Crypto.Hash.Conduit (sinkHash)
import Lib.Prelude import Lib.Prelude
hashSHA256 :: ByteString -> ByteString hashSHA256 :: ByteString -> ByteString
hashSHA256 = digestToBase16 . hashWith SHA256 hashSHA256 = digestToBase16 . hashWith SHA256

14
src/Network/Minio/S3API.hs
View File

@ -32,18 +32,18 @@ module Network.Minio.S3API
, abortMultipartUpload , abortMultipartUpload
) where ) where
import qualified Network.HTTP.Types as HT
import qualified Network.HTTP.Conduit as NC
import qualified Data.Conduit as C import qualified Data.Conduit as C
import Data.Default (def) import Data.Default (def)
import qualified Network.HTTP.Conduit as NC
import qualified Network.HTTP.Types as HT
import Lib.Prelude import Lib.Prelude
import Network.Minio.Data import Network.Minio.Data
import Network.Minio.API import Network.Minio.API
import Network.Minio.Utils import Network.Minio.Utils
import Network.Minio.XmlParser import Network.Minio.XmlParser
import Network.Minio.XmlGenerator import Network.Minio.XmlGenerator
-- | Fetch all buckets from the service. -- | Fetch all buckets from the service.

18
src/Network/Minio/Utils.hs
View File

@ -1,21 +1,19 @@
module Network.Minio.Utils where module Network.Minio.Utils where
import qualified Control.Exception.Lifted as ExL
import qualified Control.Monad.Trans.Resource as R import qualified Control.Monad.Trans.Resource as R
import qualified System.IO as IO import qualified Data.ByteString.Lazy as LBS
import qualified Network.HTTP.Conduit as NC import qualified Data.Conduit as C
import Data.Text.Encoding.Error (lenientDecode)
import qualified Network.HTTP.Client as NClient import qualified Network.HTTP.Client as NClient
import Network.HTTP.Conduit (Response) import Network.HTTP.Conduit (Response)
import qualified Data.Conduit as C import qualified Network.HTTP.Conduit as NC
import qualified Data.ByteString.Lazy as LBS
import Data.Text.Encoding.Error (lenientDecode)
-- import Data.Text.Encoding (decodeUtf8With)
import qualified Network.HTTP.Types as HT import qualified Network.HTTP.Types as HT
import qualified Control.Exception.Lifted as ExL import qualified System.IO as IO
import Lib.Prelude
import Lib.Prelude import Network.Minio.Data
import Network.Minio.Data
allocateReadFile :: (R.MonadResource m, MonadError MinioErr m) allocateReadFile :: (R.MonadResource m, MonadError MinioErr m)
=> FilePath -> m (R.ReleaseKey, Handle) => FilePath -> m (R.ReleaseKey, Handle)

9
src/Network/Minio/XmlGenerator.hs
View File

@ -3,14 +3,15 @@ module Network.Minio.XmlGenerator
, mkCompleteMultipartUploadRequest , mkCompleteMultipartUploadRequest
) where ) where
import Lib.Prelude
import qualified Data.Text as T
import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy as LBS
import Text.XML
import qualified Data.Map as M import qualified Data.Map as M
import qualified Data.Text as T
import Text.XML
import Network.Minio.Data import Lib.Prelude
import Network.Minio.Data
-- | Create a bucketConfig request body XML -- | Create a bucketConfig request body XML

12
src/Network/Minio/XmlParser.hs
View File

@ -6,16 +6,16 @@ module Network.Minio.XmlParser
, parseListObjectsResponse , parseListObjectsResponse
) where ) where
import Text.XML import Data.List (zip4)
import Text.XML.Cursor
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time import Data.Text.Read (decimal)
import Data.Text.Read (decimal) import Data.Time
import Data.List (zip4) import Text.XML
import Text.XML.Cursor
import Lib.Prelude import Lib.Prelude
import Network.Minio.Data import Network.Minio.Data
-- | Represent the time format string returned by S3 API calls. -- | Represent the time format string returned by S3 API calls.
s3TimeFormat :: [Char] s3TimeFormat :: [Char]

2
test/Network/Minio/XmlParser/Test.hs
View File

@ -3,9 +3,9 @@ module Network.Minio.XmlParser.Test
xmlParserTests xmlParserTests
) where ) where
import Data.Time (addGregorianYearsClip, fromGregorian, UTCTime(..))
import Test.Tasty import Test.Tasty
import Test.Tasty.HUnit import Test.Tasty.HUnit
import Data.Time (addGregorianYearsClip, fromGregorian, UTCTime(..))
import Lib.Prelude import Lib.Prelude

22
test/Spec.hs
View File

@ -1,21 +1,19 @@
import Test.Tasty import Test.Tasty
import Test.Tasty.HUnit import Test.Tasty.HUnit
import Lib.Prelude import Lib.Prelude
import qualified System.IO as SIO import qualified System.IO as SIO
import Control.Monad.Trans.Resource (runResourceT) import Control.Monad.Trans.Resource (runResourceT)
import qualified Data.Text as T import qualified Data.Text as T
import Data.Default (Default(..)) import Data.Default (Default(..))
-- import qualified Conduit as C
-- import Data.Conduit.Binary
import Network.Minio import Network.Minio
import Network.Minio.Data import Network.Minio.Data
import Network.Minio.S3API import Network.Minio.S3API
import Network.Minio.XmlGenerator.Test import Network.Minio.XmlGenerator.Test
import Network.Minio.XmlParser.Test import Network.Minio.XmlParser.Test
main :: IO () main :: IO ()
main = defaultMain tests main = defaultMain tests