From 9d6ec0f6e556a559824ccd9ef3900d1e82fe5b3e Mon Sep 17 00:00:00 2001
From: Aditya Manthramurthy <aditya.mmy@gmail.com>
Date: Sun, 18 Dec 2016 22:17:12 +0530
Subject: [PATCH] more progress

---
 app/Main.hs               | 21 ++++++++++++++++++---
 minio-hs.cabal            |  7 ++++++-
 src/Network/Minio/API.hs  | 11 +++++------
 src/Network/Minio/Data.hs | 14 +++++---------
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/app/Main.hs b/app/Main.hs
index 61bfd5e..e303f48 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -7,10 +7,25 @@ import Protolude
 import Network.Minio.Data
 
 import Network.Minio.API
-import Control.Monad.Trans.Resource (MonadResource, ResourceT, runResourceT)
+import Control.Monad.Trans.Resource (runResourceT)
+import qualified Data.Conduit as C
+import qualified Data.Conduit.List as CL
+import qualified Network.HTTP.Conduit as NC
 
 main :: IO ()
 main = do
   mc <- connect defaultConnectInfo
-  res <- runResourceT $ runMinio mc $ getService
-  print $ rpiStatus <$> res
+  t <- runResourceT $ runMinio mc $ do
+    res <- getService
+    liftIO $ print $ NC.responseStatus res
+    liftIO $ print $ NC.responseHeaders res
+    --    liftIO print $ NC.responseHeaders <$> res
+    -- let bodyE = NC.responseBody <$> res
+    -- case bodyE of
+    --   Left x -> print x
+    --   Right body -> body C.$$+- CL.mapM_ putStrLn
+    -- body <- NC.responseBody <$> res
+    NC.responseBody res C.$$+- CL.mapM_ putStrLn
+
+  print "Hello"
+  print t
diff --git a/minio-hs.cabal b/minio-hs.cabal
index c255dcd..9c760a2 100644
--- a/minio-hs.cabal
+++ b/minio-hs.cabal
@@ -37,10 +37,14 @@ library
                      , resourcet
                      , text
                      , time
+                     , transformers
                      , transformers-base
   default-language:    Haskell2010
-  default-extensions:  OverloadedStrings
+  default-extensions:  FlexibleContexts
+                     , FlexibleInstances
+                     , OverloadedStrings
                      , NoImplicitPrelude
+                     , MultiParamTypeClasses
                      , MultiWayIf
 
 executable minio-hs-exe
@@ -48,6 +52,7 @@ executable minio-hs-exe
   main-is:             Main.hs
   ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
   build-depends:       base
+                     , conduit
                      , minio-hs
                      , protolude >= 0.1.6 && < 0.2
                      , http-conduit
diff --git a/src/Network/Minio/API.hs b/src/Network/Minio/API.hs
index abd24a6..555ea67 100644
--- a/src/Network/Minio/API.hs
+++ b/src/Network/Minio/API.hs
@@ -16,6 +16,8 @@ import Control.Monad.Trans.Resource (MonadResource, ResourceT, runResourceT)
 
 import           Lib.Prelude
 
+import qualified Data.Conduit as C
+
 import           Network.Minio.Data
 import           Network.Minio.Data.Crypto
 import           Network.Minio.Sign.V4
@@ -32,7 +34,7 @@ import           Network.Minio.Sign.V4
 --   -- print $ NC.requestBody r
 --   NC.httpLbs r mgr
 
-mkSRequest :: RequestInfo -> Minio ResponseInfo
+mkSRequest :: RequestInfo -> Minio (Response (C.ResumableSource Minio ByteString))
 mkSRequest ri = do
   let PayloadSingle pload = payload ri
       phash = hashSHA256 pload
@@ -59,17 +61,14 @@ mkSRequest ri = do
         }
 
   response <- NC.http req mgr
-  return $ ResponseInfo
-    (NC.responseStatus response)
-    (NC.responseHeaders response)
-    (NC.responseBody response)
+  return response
 
 requestInfo :: Method -> Maybe Bucket -> Maybe Object
             -> Query -> [Header] -> Payload
             -> RequestInfo
 requestInfo m b o q h p = RequestInfo m b o q h p ""
 
-getService :: Minio ResponseInfo
+-- getService :: Minio _ -- ResponseInfo
 getService = mkSRequest $
   requestInfo HT.methodGet Nothing Nothing [] [] $
   PayloadSingle ""
diff --git a/src/Network/Minio/Data.hs b/src/Network/Minio/Data.hs
index e7797af..e72c307 100644
--- a/src/Network/Minio/Data.hs
+++ b/src/Network/Minio/Data.hs
@@ -3,7 +3,7 @@ module Network.Minio.Data
   (
     ConnectInfo(..)
   , RequestInfo(..)
-  , ResponseInfo(..)
+--  , ResponseInfo(..)
   , MinioConn(..)
   , Bucket
   , Object
@@ -17,12 +17,13 @@ module Network.Minio.Data
 
 import qualified Data.ByteString as B
 import qualified Data.Conduit as C
-import           Network.HTTP.Client (defaultManagerSettings)
+import           Network.HTTP.Client (defaultManagerSettings, HttpException)
 import           Network.HTTP.Types (Method, Header, Query, Status)
 import qualified Network.HTTP.Conduit as NC
 
+import Control.Monad.Trans.Class (MonadTrans(..))
 import Control.Monad.Trans.Resource (MonadThrow, MonadResource, ResourceT, ResIO)
-import Control.Monad.Base (MonadBase)
+import Control.Monad.Base (MonadBase(..))
 
 import           Lib.Prelude
 
@@ -55,11 +56,6 @@ data RequestInfo = RequestInfo {
   , payloadHash :: ByteString
   }
 
-data ResponseInfo = ResponseInfo {
-    rpiStatus :: Status
-  , rpiHeaders :: [Header]
-  , rpiBody :: C.ResumableSource Minio ByteString
-  }
 
 getPathFromRI :: RequestInfo -> ByteString
 getPathFromRI ri = B.concat $ parts
@@ -68,6 +64,7 @@ getPathFromRI ri = B.concat $ parts
     parts = maybe ["/"] (\b -> "/" : b : objPart) $ bucket ri
 
 data MinioErr = MErrMsg ByteString
+              | MErrHttp HttpException
   deriving (Show)
 
 newtype Minio a = Minio {
@@ -85,7 +82,6 @@ newtype Minio a = Minio {
     , MonadResource
     )
 
-
 -- MinioConn holds connection info and a connection pool
 data MinioConn = MinioConn {
     mcConnInfo :: ConnectInfo