mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

update progress after each chunk, at least

Browse source 
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.
This commit is contained in:
Joey Hess 2014-07-29 20:31:16 -04:00
parent 444944c7a9
commit a963d790d3
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Remote/Helper/Chunked.hs
View file

@ -127,6 +127,7 @@ storeChunks u chunkconfig k f p storer checker =
chunksStored u k (FixedSizeChunks chunksize) numchunks chunksStored u k (FixedSizeChunks chunksize) numchunks
return True return True
| otherwise = do | otherwise = do
liftIO $ meterupdate' zeroBytesProcessed
let (chunkkey, chunkkeys') = nextChunkKeyStream chunkkeys let (chunkkey, chunkkeys') = nextChunkKeyStream chunkkeys
ifM (storer chunkkey (ByteContent chunk) meterupdate') ifM (storer chunkkey (ByteContent chunk) meterupdate')
( do ( do
@ -269,6 +270,7 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink
getrest _ _ _ _ [] = return True getrest _ _ _ _ [] = return True
getrest p h sz bytesprocessed (k:ks) = do getrest p h sz bytesprocessed (k:ks) = do
let p' = offsetMeterUpdate p bytesprocessed let p' = offsetMeterUpdate p bytesprocessed
liftIO $ p' zeroBytesProcessed
ifM (retriever (encryptor k) p' $ tosink (Just h) p') ifM (retriever (encryptor k) p' $ tosink (Just h) p')
( getrest p h sz (addBytesProcessed bytesprocessed sz) ks ( getrest p h sz (addBytesProcessed bytesprocessed sz) ks
, giveup "chunk retrieval failed" , 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, - However, if the Retriever generates a lazy ByteString,
- it is not responsible for updating progress (often it cannot). - it is not responsible for updating progress (often it cannot).
- Instead, the sink is passed a meter to update as it consumes - Instead, the sink is passed a meter to update as it consumes
- the ByteString. -} - the ByteString.
-}
tosink h p content = sink h p' content tosink h p content = sink h p' content
where where
p' p'