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

remove webUUID special case

Browse source 
Now bittorrent is another special case like web.

If the only remotes are web and bittorrent, it might as well scan those.
This commit is contained in:
Joey Hess 2014-12-17 13:50:46 -04:00
parent af05ac3ec2
commit 8d1e372a8b
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/TransferScanner.hs
View file

@ -19,7 +19,6 @@ import Assistant.Types.UrlRenderer
import Logs.Transfer import Logs.Transfer
import Logs.Location import Logs.Location
import Logs.Group import Logs.Group
import Logs.Web (webUUID)
import qualified Remote import qualified Remote
import qualified Types.Remote as Remote import qualified Types.Remote as Remote
import Utility.ThreadScheduler import Utility.ThreadScheduler
@ -115,7 +114,7 @@ failedTransferScan r = do
- since we need to look at the locations of all keys anyway. - since we need to look at the locations of all keys anyway.
-} -}
expensiveScan :: UrlRenderer -> [Remote] -> Assistant () expensiveScan :: UrlRenderer -> [Remote] -> Assistant ()
expensiveScan urlrenderer rs = unless onlyweb $ batch <~> do expensiveScan urlrenderer rs = batch <~> do
debug ["starting scan of", show visiblers] debug ["starting scan of", show visiblers]
let us = map Remote.uuid rs let us = map Remote.uuid rs
@ -135,7 +134,6 @@ expensiveScan urlrenderer rs = unless onlyweb $ batch <~> do
remove <- asIO1 $ removableRemote urlrenderer remove <- asIO1 $ removableRemote urlrenderer
liftIO $ mapM_ (void . tryNonAsync . remove) $ S.toList removablers liftIO $ mapM_ (void . tryNonAsync . remove) $ S.toList removablers
where where
onlyweb = all (== webUUID) $ map Remote.uuid rs
visiblers = let rs' = filter (not . Remote.readonly) rs visiblers = let rs' = filter (not . Remote.readonly) rs
in if null rs' then rs else rs' in if null rs' then rs else rs'