assistant: Now honors preferred content settings when deciding what to transfer.

Both when queueing downloads, and uploads, consults the preferred content
settings.

I didn't make it check yet when requeing failed transfers or queuing
deferred downloads; dealing with the preferred content settings (or indeed,
other settings) changing while the assistant is running still needs work.

1 files changed, 3 insertions, 4 deletions

diff --git a/Annex/Wanted.hs b/Annex/Wanted.hs
index 8310fdd8f..d7c28efad 100644
--- a/Annex/Wanted.hs
+++ b/Annex/Wanted.hs
@@ -10,7 +10,6 @@ module Annex.Wanted where
 import Common.Annex
 import Logs.PreferredContent
 import Git.FilePath
-import qualified Annex
 import Annex.UUID
 import Types.Remote
 
@@ -24,9 +23,9 @@ wantGet (Just file) = do
 	isPreferredContent Nothing S.empty fp
 
 {- Check if a file is preferred content for a remote. -}
-wantSend :: UUID -> AssociatedFile -> Annex Bool
-wantSend _ Nothing = return True
-wantSend to (Just file) = do
+wantSend :: AssociatedFile -> UUID -> Annex Bool
+wantSend Nothing _ = return True
+wantSend (Just file) to = do
 	fp <- inRepo $ toTopFilePath file
 	isPreferredContent (Just to) S.empty fp