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

preserve bytesComplete when updating a transfer info

Browse source 
Avoids flicker to 0% when resuming a paused transfer.
This commit is contained in:
Joey Hess 2012-08-31 13:06:27 -04:00
parent 8335a7ff7a
commit 38a292fd36
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Assistant/DaemonStatus.hs
View file

@ -196,8 +196,8 @@ alterTransferInfo :: DaemonStatusHandle -> Transfer -> (TransferInfo -> Transfer
alterTransferInfo dstatus t a = updateTransferInfo' dstatus $ M.adjust a t alterTransferInfo dstatus t a = updateTransferInfo' dstatus $ M.adjust a t
{- Updates a transfer's info. Adds the transfer to the map if necessary, {- Updates a transfer's info. Adds the transfer to the map if necessary,
- or if already present, updates it while preserving the old transferTid - or if already present, updates it while preserving the old transferTid,
- and transferPaused values, which are not written to disk. -} - transferPaused, and bytesComplete values, which are not written to disk. -}
updateTransferInfo :: DaemonStatusHandle -> Transfer -> TransferInfo -> IO () updateTransferInfo :: DaemonStatusHandle -> Transfer -> TransferInfo -> IO ()
updateTransferInfo dstatus t info = updateTransferInfo' dstatus $ updateTransferInfo dstatus t info = updateTransferInfo' dstatus $
M.insertWith' merge t info M.insertWith' merge t info
@ -205,6 +205,7 @@ updateTransferInfo dstatus t info = updateTransferInfo' dstatus $
merge new old = new merge new old = new
{ transferTid = maybe (transferTid new) Just (transferTid old) { transferTid = maybe (transferTid new) Just (transferTid old)
, transferPaused = transferPaused new || transferPaused old , transferPaused = transferPaused new || transferPaused old
, bytesComplete = maybe (bytesComplete new) Just (bytesComplete old)
} }
updateTransferInfo' :: DaemonStatusHandle -> (TransferMap -> TransferMap) -> IO () updateTransferInfo' :: DaemonStatusHandle -> (TransferMap -> TransferMap) -> IO ()