Align imports

2017-01-22 21:19:44 +05:30 · 2017-01-22 21:19:44 +05:30 · a12fa8a077
commit a12fa8a077
parent 0d9235b86a
10 changed files with 71 additions and 81 deletions
--- a/src/Network/Minio.hs
+++ b/src/Network/Minio.hs
@ -1,30 +1,30 @@
 module Network.Minio
  (

-    D.ConnectInfo(..)
-  , D.connect
+    ConnectInfo(..)
+  , connect

-  , D.Minio
-  , D.runMinio
+  , Minio
+  , runMinio

  -- * Error handling
  -----------------------
  -- | Test
-  , D.MinioErr(..)
-  , D.MErrV(..)
+  , MinioErr(..)
+  , MErrV(..)

  -- * Data Types
  ----------------
  -- | Data types representing various object store concepts.
-  , D.Bucket
-  , D.Object
-  , D.BucketInfo(..)
-  , D.UploadId
+  , Bucket
+  , Object
+  , BucketInfo(..)
+  , UploadId

  -- * Bucket and Object Operations
  ---------------------------------
-  , S.getService
-  , S.getLocation
+  , getService
+  , getLocation

  , fGetObject
  , fPutObject
@ -34,20 +34,16 @@ module Network.Minio
 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 Data.Conduit as C
 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.S3API
-import Network.Minio.Utils
+import           Network.Minio.Data
+import           Network.Minio.S3API
+import           Network.Minio.Utils

 -- | Fetch the object and write it to the given file safely. The
 -- object is first written to a temporary file in the same directory
--- a/src/Network/Minio/API.hs
+++ b/src/Network/Minio/API.hs
@ -7,19 +7,18 @@ module Network.Minio.API
  , mkStreamRequest
  ) 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 qualified Network.HTTP.Conduit as NC
-import qualified Data.Conduit as C
-import Data.Conduit.Binary (sourceHandleRange)
+import qualified Network.HTTP.Types as HT

 import           Lib.Prelude

-
 import           Network.Minio.Data
 import           Network.Minio.Data.Crypto
 import           Network.Minio.Sign.V4
-import Network.Minio.Utils
+import           Network.Minio.Utils

 -- runRequestDebug r mgr = do
 --   print $ "runRequestDebug"
--- a/src/Network/Minio/Data.hs
+++ b/src/Network/Minio/Data.hs
@ -1,18 +1,16 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving, TypeFamilies #-}
 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           Data.Default (Default(..))
 import           Network.HTTP.Client (defaultManagerSettings, HttpException)
-import           Network.HTTP.Types (Method, Header, Query)
 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 Control.Monad.Trans.Resource
-import Control.Monad.Trans.Control
-import Control.Monad.Base
-
-import Text.XML
+import           Text.XML

 import           Lib.Prelude

--- a/src/Network/Minio/Data/Crypto.hs
+++ b/src/Network/Minio/Data/Crypto.hs
@ -8,14 +8,14 @@ module Network.Minio.Data.Crypto
  , digestToBase16
  ) where

-import Crypto.Hash (SHA256(..), hashWith, Digest)
-import Crypto.MAC.HMAC (hmac, HMAC)
-import Data.ByteArray (ByteArrayAccess, convert)
-import Data.ByteArray.Encoding (convertToBase, Base(Base16))
+import           Crypto.Hash (SHA256(..), hashWith, Digest)
+import           Crypto.Hash.Conduit (sinkHash)
+import           Crypto.MAC.HMAC (hmac, HMAC)
+import           Data.ByteArray (ByteArrayAccess, convert)
+import           Data.ByteArray.Encoding (convertToBase, Base(Base16))
 import qualified Data.Conduit as C
-import Crypto.Hash.Conduit (sinkHash)

-import Lib.Prelude
+import           Lib.Prelude

 hashSHA256 :: ByteString -> ByteString
 hashSHA256 = digestToBase16 . hashWith SHA256
--- a/src/Network/Minio/S3API.hs
+++ b/src/Network/Minio/S3API.hs
@ -32,18 +32,18 @@ module Network.Minio.S3API
  , abortMultipartUpload
  ) where

-import qualified Network.HTTP.Types as HT
-import qualified Network.HTTP.Conduit as NC
 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           Network.Minio.Data
-import Network.Minio.API
-import Network.Minio.Utils
-import Network.Minio.XmlParser
-import Network.Minio.XmlGenerator
+import           Network.Minio.API
+import           Network.Minio.Utils
+import           Network.Minio.XmlParser
+import           Network.Minio.XmlGenerator


 -- | Fetch all buckets from the service.
--- a/src/Network/Minio/Utils.hs
+++ b/src/Network/Minio/Utils.hs
@ -1,21 +1,19 @@
 module Network.Minio.Utils where

+import qualified Control.Exception.Lifted as ExL
 import qualified Control.Monad.Trans.Resource as R
-import qualified System.IO as IO
-import qualified Network.HTTP.Conduit as NC
+import qualified Data.ByteString.Lazy as LBS
+import qualified Data.Conduit as C
+import           Data.Text.Encoding.Error (lenientDecode)
 import qualified Network.HTTP.Client as NClient
 import           Network.HTTP.Conduit (Response)
-import qualified Data.Conduit as C
-import qualified Data.ByteString.Lazy as LBS
-import Data.Text.Encoding.Error (lenientDecode)
-- import Data.Text.Encoding (decodeUtf8With)
+import qualified Network.HTTP.Conduit as NC
 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)
                 => FilePath -> m (R.ReleaseKey, Handle)
--- a/src/Network/Minio/XmlGenerator.hs
+++ b/src/Network/Minio/XmlGenerator.hs
@ -3,14 +3,15 @@ module Network.Minio.XmlGenerator
  , mkCompleteMultipartUploadRequest
  ) where

-import Lib.Prelude

-import qualified Data.Text as T
 import qualified Data.ByteString.Lazy as LBS
-import Text.XML
 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
--- a/src/Network/Minio/XmlParser.hs
+++ b/src/Network/Minio/XmlParser.hs
@ -6,16 +6,16 @@ module Network.Minio.XmlParser
  , parseListObjectsResponse
  ) where

-import Text.XML
-import Text.XML.Cursor
+import           Data.List (zip4)
 import qualified Data.Text as T
-import Data.Time
-import Data.Text.Read (decimal)
-import Data.List (zip4)
+import           Data.Text.Read (decimal)
+import           Data.Time
+import           Text.XML
+import           Text.XML.Cursor

 import           Lib.Prelude

-import Network.Minio.Data
+import           Network.Minio.Data

 -- | Represent the time format string returned by S3 API calls.
 s3TimeFormat :: [Char]
--- a/test/Network/Minio/XmlParser/Test.hs
+++ b/test/Network/Minio/XmlParser/Test.hs
@ -3,9 +3,9 @@ module Network.Minio.XmlParser.Test
    xmlParserTests
  ) where

+import Data.Time (addGregorianYearsClip, fromGregorian, UTCTime(..))
 import Test.Tasty
 import Test.Tasty.HUnit
-import Data.Time (addGregorianYearsClip, fromGregorian, UTCTime(..))

 import Lib.Prelude

--- a/test/Spec.hs
+++ b/test/Spec.hs
@ -1,21 +1,19 @@
-import Test.Tasty
-import Test.Tasty.HUnit
+import           Test.Tasty
+import           Test.Tasty.HUnit

-import Lib.Prelude
+import           Lib.Prelude

 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 Data.Default (Default(..))
-- import qualified Conduit as C
-- import Data.Conduit.Binary
+import           Data.Default (Default(..))

-import Network.Minio
-import Network.Minio.Data
-import Network.Minio.S3API
-import Network.Minio.XmlGenerator.Test
-import Network.Minio.XmlParser.Test
+import           Network.Minio
+import           Network.Minio.Data
+import           Network.Minio.S3API
+import           Network.Minio.XmlGenerator.Test
+import           Network.Minio.XmlParser.Test

 main :: IO ()
 main = defaultMain tests