From d2a4ffe669b6aeec0b660b08099aa56d3208daa7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Aug 2012 14:05:56 -0400 Subject: [PATCH] got alterTransferInfo and updateTransferInfo mixed up The poller only alters, to avoid re-adding transfers that get removed. The watcher updates, to add new transfers. --- Assistant/Threads/TransferPoller.hs | 2 +- Assistant/Threads/TransferWatcher.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assistant/Threads/TransferPoller.hs b/Assistant/Threads/TransferPoller.hs index 12394373fa..8839045df7 100644 --- a/Assistant/Threads/TransferPoller.hs +++ b/Assistant/Threads/TransferPoller.hs @@ -42,7 +42,7 @@ transferPollerThread st dstatus = do fromIntegral . fileSize <$> getFileStatus f when (bytesComplete info /= sz && isJust sz) $ - updateTransferInfo dstatus t info + alterTransferInfo dstatus t info { bytesComplete = sz } {- can't poll uploads -} | otherwise = noop diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs index 31116a7243..fe8af9aad0 100644 --- a/Assistant/Threads/TransferWatcher.hs +++ b/Assistant/Threads/TransferWatcher.hs @@ -64,7 +64,7 @@ onAdd st dstatus file _ = case parseTransferFile file of ] r <- headMaybe . filter (sameuuid t) . knownRemotes <$> getDaemonStatus dstatus - alterTransferInfo dstatus t info + updateTransferInfo dstatus t info { transferRemote = r } sameuuid t r = Remote.uuid r == transferUUID t