combine 2 checks

This commit is contained in:
Joey Hess 2014-11-04 14:47:18 -04:00
parent 0f78f197eb
commit 29871e320c

View file

@ -188,10 +188,11 @@ 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 meter etags partnum = ifM (liftIO $ hIsClosed fh)
( return (reverse etags)
, do
let sendparts meter etags partnum = do
pos <- liftIO $ hTell fh
if pos >= fsz
then return (reverse etags)
else do
-- Calculate size of part that will
-- be read.
let sz = if fsz - pos < partsz'
@ -202,7 +203,6 @@ store r h = fileStorer $ \k f p -> do
S3.UploadPartResponse _ etag <- sendS3Handle h $
S3.uploadPart (bucket info) object partnum uploadid body
sendparts (offsetMeterUpdate meter (toBytesProcessed sz)) (etag:etags) (partnum + 1)
)
sendparts p [] 1
void $ sendS3Handle h $ S3.postCompleteMultipartUpload