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

got alterTransferInfo and updateTransferInfo mixed up

Browse source 
The poller only alters, to avoid re-adding transfers that get removed.
The watcher updates, to add new transfers.
This commit is contained in:
Joey Hess 2012-08-29 14:05:56 -04:00
parent 7ebe1d4875
commit d2a4ffe669
2 changed files with 2 additions and 2 deletions

2
Assistant/Threads/TransferPoller.hs
View file

@ -42,7 +42,7 @@ transferPollerThread st dstatus = do
fromIntegral . fileSize fromIntegral . fileSize
<$> getFileStatus f <$> getFileStatus f
when (bytesComplete info /= sz && isJust sz) $ when (bytesComplete info /= sz && isJust sz) $
updateTransferInfo dstatus t info alterTransferInfo dstatus t info
{ bytesComplete = sz } { bytesComplete = sz }
{- can't poll uploads -} {- can't poll uploads -}
| otherwise = noop | otherwise = noop

2
Assistant/Threads/TransferWatcher.hs
View file

@ -64,7 +64,7 @@ onAdd st dstatus file _ = case parseTransferFile file of
] ]
r <- headMaybe . filter (sameuuid t) . knownRemotes r <- headMaybe . filter (sameuuid t) . knownRemotes
<$> getDaemonStatus dstatus <$> getDaemonStatus dstatus
alterTransferInfo dstatus t info updateTransferInfo dstatus t info
{ transferRemote = r } { transferRemote = r }
sameuuid t r = Remote.uuid r == transferUUID t sameuuid t r = Remote.uuid r == transferUUID t