From 67524c3a41a2c0b5e8c34bcbfde737ca50fc191b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Apr 2013 17:15:45 -0400 Subject: 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. --- Logs/Transfer.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Logs') diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs index 778932510..cfe9e49a0 100644 --- a/Logs/Transfer.hs +++ b/Logs/Transfer.hs @@ -97,8 +97,8 @@ forwardRetry old new = bytesComplete old < bytesComplete new upload :: UUID -> Key -> AssociatedFile -> RetryDecider -> (MeterUpdate -> Annex Bool) -> Annex Bool upload u key = runTransfer (Transfer Upload u key) -download :: UUID -> Key -> AssociatedFile -> RetryDecider -> Annex Bool -> Annex Bool -download u key file shouldretry a = runTransfer (Transfer Download u key) file shouldretry (const a) +download :: UUID -> Key -> AssociatedFile -> RetryDecider -> (MeterUpdate -> Annex Bool) -> Annex Bool +download u key = runTransfer (Transfer Download u key) {- Runs a transfer action. Creates and locks the lock file while the - action is running, and stores info in the transfer information -- cgit v1.2.3