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/Threads | |
| 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/Threads')
| -rw-r--r-- | Assistant/Threads/TransferScanner.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs index 60f6dc28b..6aefb2920 100644 --- a/Assistant/Threads/TransferScanner.hs +++ b/Assistant/Threads/TransferScanner.hs @@ -164,9 +164,9 @@ expensiveScan urlrenderer rs = unless onlyweb $ batch <~> do let slocs = S.fromList locs let use a = return $ mapMaybe (a key slocs) syncrs ts <- if present - then filterM (wantSend True (Just f) . Remote.uuid . fst) + then filterM (wantSend True (Just key) (Just f) . Remote.uuid . fst) =<< use (genTransfer Upload False) - else ifM (wantGet True $ Just f) + else ifM (wantGet True (Just key) (Just f)) ( use (genTransfer Download True) , return [] ) let unwanted' = S.difference unwanted slocs return (unwanted', ts) |