diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-29 20:31:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-29 20:31:16 -0400 |
| commit | ca57baac3e607e8ed878071278cc0c24746f4282 (patch) | |
| tree | 8cea2d82862c1409236d2eb62df29adfdeed9b18 /Remote/Helper/Chunked.hs | |
| parent | 3e0549147034cbb0eab8b3d66cb284c11419e7bb (diff) | |
update progress after each chunk, at least
This way, when the remote implementation neglects to update progress,
there will still be a somewhat useful progress display, as long as chunks
are used.
Diffstat (limited to 'Remote/Helper/Chunked.hs')
| -rw-r--r-- | Remote/Helper/Chunked.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs index 00c089e80..d9ab3c3e6 100644 --- a/Remote/Helper/Chunked.hs +++ b/Remote/Helper/Chunked.hs @@ -127,6 +127,7 @@ storeChunks u chunkconfig k f p storer checker = chunksStored u k (FixedSizeChunks chunksize) numchunks return True | otherwise = do + liftIO $ meterupdate' zeroBytesProcessed let (chunkkey, chunkkeys') = nextChunkKeyStream chunkkeys ifM (storer chunkkey (ByteContent chunk) meterupdate') ( do @@ -269,6 +270,7 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink getrest _ _ _ _ [] = return True getrest p h sz bytesprocessed (k:ks) = do let p' = offsetMeterUpdate p bytesprocessed + liftIO $ p' zeroBytesProcessed ifM (retriever (encryptor k) p' $ tosink (Just h) p') ( getrest p h sz (addBytesProcessed bytesprocessed sz) ks , giveup "chunk retrieval failed" @@ -292,7 +294,8 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink - However, if the Retriever generates a lazy ByteString, - it is not responsible for updating progress (often it cannot). - Instead, the sink is passed a meter to update as it consumes - - the ByteString. -} + - the ByteString. + -} tosink h p content = sink h p' content where p' |