summaryrefslogtreecommitdiff
path: root/Types
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-11 17:15:45 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-11 17:32:31 -0400
commit67524c3a41a2c0b5e8c34bcbfde737ca50fc191b (patch)
tree2d6e8c0fcf36efe7274c9bc1f83c85635412be59 /Types
parent90f10c58ba491a17d1b59e91d8c730f80cd25bce (diff)
connect existing meters to the transfer log for downloads
Most remotes have meters in their implementations of retrieveKeyFile already. Simply hooking these up to the transfer log makes that information available. Easy peasy. This is particularly valuable information for encrypted remotes, which otherwise bypass the assistant's polling of temp files, and so don't have good progress bars yet. Still some work to do here (see progressbars.mdwn changes), but this is entirely an improvement from the lack of progress bars for encrypted downloads.
Diffstat (limited to 'Types')
-rw-r--r--Types/Remote.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Types/Remote.hs b/Types/Remote.hs
index e6536757c..98cac37e4 100644
--- a/Types/Remote.hs
+++ b/Types/Remote.hs
@@ -50,8 +50,10 @@ data RemoteA a = Remote {
cost :: Cost,
-- Transfers a key to the remote.
storeKey :: Key -> AssociatedFile -> MeterUpdate -> a Bool,
- -- retrieves a key's contents to a file
- retrieveKeyFile :: Key -> AssociatedFile -> FilePath -> a Bool,
+ -- Retrieves a key's contents to a file.
+ -- (The MeterUpdate does not need to be used if it retrieves
+ -- directly to the file, and not to an intermediate file.)
+ retrieveKeyFile :: Key -> AssociatedFile -> FilePath -> MeterUpdate -> a Bool,
-- retrieves a key's contents to a tmp file, if it can be done cheaply
retrieveKeyFileCheap :: Key -> FilePath -> a Bool,
-- removes a key's contents