diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-23 16:37:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-23 16:44:02 -0400 |
| commit | 5112650348f6bf04cebe1fb97ed900b24e4aaac1 (patch) | |
| tree | 4e207b96021812213d237e68d156e2e0bbdf32c3 /Assistant/TransferQueue.hs | |
| parent | 425c6ddfcd84b6bf26f3a277d010df1fb6b018da (diff) | |
fix transfers of key with no associated file
Several places assumed this would not happen, and when the AssociatedFile
was Nothing, did nothing.
As part of this, preferred content checks pass the Key around.
Note that checkMatcher is sometimes now called with Just Key and Just File.
It currently constructs a FileMatcher, ignoring the Key. However, if it
constructed a FileKeyMatcher, which contained both, then it might be
possible to speed up parts of Limit, which currently call the somewhat
expensive lookupFileKey to get the Key.
I have not made this optimisation yet, because I am not sure if the key is
always the same. Will need some significant checking to satisfy myself
that's the case..
Diffstat (limited to 'Assistant/TransferQueue.hs')
| -rw-r--r-- | Assistant/TransferQueue.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/TransferQueue.hs b/Assistant/TransferQueue.hs index 6d8e72852..86dd36d04 100644 --- a/Assistant/TransferQueue.hs +++ b/Assistant/TransferQueue.hs @@ -58,7 +58,7 @@ queueTransfers = queueTransfersMatching (const True) - condition. Honors preferred content settings. -} queueTransfersMatching :: (UUID -> Bool) -> Reason -> Schedule -> Key -> AssociatedFile -> Direction -> Assistant () queueTransfersMatching matching reason schedule k f direction - | direction == Download = whenM (liftAnnex $ wantGet True f) go + | direction == Download = whenM (liftAnnex $ wantGet True (Just k) f) go | otherwise = go where go = do @@ -82,7 +82,7 @@ queueTransfersMatching matching reason schedule k f direction - already have it. -} | otherwise = do s <- locs - filterM (wantSend True f . Remote.uuid) $ + filterM (wantSend True (Just k) f . Remote.uuid) $ filter (\r -> not (inset s r || Remote.readonly r)) rs where locs = S.fromList <$> Remote.keyLocations k |