diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-11-03 20:04:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-03 20:04:42 -0400 |
| commit | 0dd5559b4946ed8d4714bd9ce2e18b9944568039 (patch) | |
| tree | fed08ce4ed65f067a6a0bae5d97f757297906ee2 /Remote | |
| parent | 76c97f4ea90293b04a416368c107d1cc19cc381b (diff) | |
WIP 3
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/S3.hs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 685f95bbb..73518c65c 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -26,10 +26,6 @@ import Network.HTTP.Types import Control.Monad.Trans.Resource import Control.Monad.Catch import Data.Conduit -#if MIN_VERSION_aws(0,10,6) -import qualified Data.Conduit.List as CL -import qualified Data.Conduit.Binary as CB -#endif import Common.Annex import Types.Remote @@ -188,16 +184,17 @@ store r h = fileStorer $ \k f p -> do -- Send parts of the file, taking care to stream each part -- w/o buffering in memory, since the parts can be large. etags <- bracketIO (openBinaryFile f ReadMode) hClose $ \fh -> do - let sendparts etags partnum = ifM (hIsEOF fh) + let sendparts meter etags partnum = ifM (liftIO $ hIsOpen fh) ( return (reverse etags) , do - b <- liftIO $ hGetUntilMetered fh (< partsz) p - let body = RequestBodyStream (L.length b) (mkPopper b) + b <- liftIO $ hGetUntilMetered fh (< partsz) meter + let sz = L.length b + let body = RequestBodyStream sz (mkPopper b) S3.UploadPartResponse _ etag <- sendS3Handle h $ S3.uploadPart (bucket info) object partnum uploadid body - sendparts (etag:etags) (partnum + 1) + sendparts (offsetMeterUpdate meter (toBytesProcessed sz)) (etag:etags) (partnum + 1) ) - sendparts [] 1 + sendparts p [] 1 void $ sendS3Handle h $ S3.postCompleteMultipartUpload (bucket info) object uploadid (zip [1..] etags) |