summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2014-12-17 13:50:46 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2014-12-17 13:52:08 -0400
commitcbb5cb34a61d45769eac2b4930b3b233939ee61e (patch)
tree30a29243fe2e27ec96c1d1b62c2922c936e0a91a /Assistant
parent7d1c36942a0c32bc5639174112cd89a5acfd9c59 (diff)
remove webUUID special case
Now bittorrent is another special case like web. If the only remotes are web and bittorrent, it might as well scan those.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/TransferScanner.hs4
1 files changed, 1 insertions, 3 deletions
diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs
index daced8d21..fc2394e62 100644
--- a/Assistant/Threads/TransferScanner.hs
+++ b/Assistant/Threads/TransferScanner.hs
@@ -19,7 +19,6 @@ import Assistant.Types.UrlRenderer
import Logs.Transfer
import Logs.Location
import Logs.Group
-import Logs.Web (webUUID)
import qualified Remote
import qualified Types.Remote as Remote
import Utility.ThreadScheduler
@@ -115,7 +114,7 @@ failedTransferScan r = do
- since we need to look at the locations of all keys anyway.
-}
expensiveScan :: UrlRenderer -> [Remote] -> Assistant ()
-expensiveScan urlrenderer rs = unless onlyweb $ batch <~> do
+expensiveScan urlrenderer rs = batch <~> do
debug ["starting scan of", show visiblers]
let us = map Remote.uuid rs
@@ -135,7 +134,6 @@ expensiveScan urlrenderer rs = unless onlyweb $ batch <~> do
remove <- asIO1 $ removableRemote urlrenderer
liftIO $ mapM_ (void . tryNonAsync . remove) $ S.toList removablers
where
- onlyweb = all (== webUUID) $ map Remote.uuid rs
visiblers = let rs' = filter (not . Remote.readonly) rs
in if null rs' then rs else rs'