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

Fix some warnings

Browse Source
This commit is contained in:
Aditya Manthramurthy 2017-01-17 23:31:46 +05:30
parent 19eda8622f
commit 6db483c2bc
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Network/Minio.hs
View File

@ -22,7 +22,7 @@ import Network.Minio.Data as
, ConnectInfo(..) , ConnectInfo(..)
) )
import System.FilePath (FilePath) -- import System.FilePath (FilePath)
import qualified System.IO as IO import qualified System.IO as IO
import qualified Data.Conduit as C import qualified Data.Conduit as C
import qualified Control.Monad.Trans.Resource as R import qualified Control.Monad.Trans.Resource as R

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

@ -13,7 +13,6 @@ import qualified Network.HTTP.Types as HT
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 Network.HTTP.Types (Method, Header, Query) import Network.HTTP.Types (Method, Header, Query)
import qualified Data.ByteString.Lazy as LBS
import qualified Data.Conduit as C import qualified Data.Conduit as C
import Data.Conduit.Binary (sourceHandleRange) import Data.Conduit.Binary (sourceHandleRange)

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

@ -8,8 +8,6 @@ import Network.HTTP.Conduit (Response)
import qualified Data.Conduit as C import qualified Data.Conduit as C
import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy as LBS
import qualified Network.HTTP.Types as HT import qualified Network.HTTP.Types as HT
import Control.Monad.Trans.Except (withExceptT, ExceptT(..), withExcept)
import Control.Monad.Base (MonadBase(..))
import qualified Control.Exception.Lifted as ExL import qualified Control.Exception.Lifted as ExL
@ -17,9 +15,6 @@ import Lib.Prelude
import Network.Minio.Data import Network.Minio.Data
-- tryIO :: (MonadIO m, MonadError MinioErr m) => IO a -> m a
-- tryIO act = either (throwError . MErrIO) return $ try act
allocateReadFile :: (R.MonadResource m, MonadError MinioErr m) allocateReadFile :: (R.MonadResource m, MonadError MinioErr m)
=> FilePath -> m (R.ReleaseKey, Handle) => FilePath -> m (R.ReleaseKey, Handle)
allocateReadFile fp = do allocateReadFile fp = do
@ -29,7 +24,7 @@ allocateReadFile fp = do
openReadFile f = runExceptT $ tryIO $ IO.openBinaryFile f IO.ReadMode openReadFile f = runExceptT $ tryIO $ IO.openBinaryFile f IO.ReadMode
cleanup = either (const $ return ()) IO.hClose cleanup = either (const $ return ()) IO.hClose
isSuccessStatus :: HT.Status -> Bool
isSuccessStatus sts = let s = HT.statusCode sts isSuccessStatus sts = let s = HT.statusCode sts
in (s >= 200 && s < 300) in (s >= 200 && s < 300)
@ -47,11 +42,9 @@ httpLbs req mgr = do
throwError $ MErrService $ LBS.toStrict $ NC.responseBody resp throwError $ MErrService $ LBS.toStrict $ NC.responseBody resp
return resp return resp
-- http :: (MonadError MinioErr m, R.MonadResourceBase m, R.MonadResource m) http :: (MonadError MinioErr m, R.MonadResourceBase m, R.MonadResource m)
-- => NC.Request -> NC.Manager => NC.Request -> NC.Manager
-- -> m (Response (C.ResumableSource m ByteString)) -> m (Response (C.ResumableSource m ByteString))
http :: NC.Request -> NC.Manager
-> Minio (Response (C.ResumableSource Minio ByteString))
http req mgr = do http req mgr = do
respE <- ExL.try $ NC.http req mgr respE <- ExL.try $ NC.http req mgr
resp <- checkEither MErrHttp respE resp <- checkEither MErrHttp respE

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

@ -12,6 +12,7 @@ import Lib.Prelude
import Network.Minio.Data import Network.Minio.Data
s3TimeFormat :: [Char]
s3TimeFormat = iso8601DateFormat $ Just "%T%QZ" s3TimeFormat = iso8601DateFormat $ Just "%T%QZ"
parseListBuckets :: (MonadError MinioErr m) => LByteString -> m [BucketInfo] parseListBuckets :: (MonadError MinioErr m) => LByteString -> m [BucketInfo]