diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-11 17:15:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-11 17:32:31 -0400 |
| commit | 67524c3a41a2c0b5e8c34bcbfde737ca50fc191b (patch) | |
| tree | 2d6e8c0fcf36efe7274c9bc1f83c85635412be59 /Remote/S3.hs | |
| parent | 90f10c58ba491a17d1b59e91d8c730f80cd25bce (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 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 017886694..00b5b5dc6 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -152,9 +152,9 @@ storeHelper (conn, bucket) r k p file = do xheaders = filter isxheader $ M.assocs $ config r isxheader (h, _) = "x-amz-" `isPrefixOf` h -retrieve :: Remote -> Key -> AssociatedFile -> FilePath -> Annex Bool -retrieve r k _f d = s3Action r False $ \(conn, bucket) -> - metered Nothing k $ \meterupdate -> do +retrieve :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool +retrieve r k _f d p = s3Action r False $ \(conn, bucket) -> + metered (Just p) k $ \meterupdate -> do res <- liftIO $ getObject conn $ bucketKey r bucket k case res of Right o -> do @@ -166,9 +166,9 @@ retrieve r k _f d = s3Action r False $ \(conn, bucket) -> retrieveCheap :: Remote -> Key -> FilePath -> Annex Bool retrieveCheap _ _ _ = return False -retrieveEncrypted :: Remote -> (Cipher, Key) -> Key -> FilePath -> Annex Bool -retrieveEncrypted r (cipher, enck) k d = s3Action r False $ \(conn, bucket) -> - metered Nothing k $ \meterupdate -> do +retrieveEncrypted :: Remote -> (Cipher, Key) -> Key -> FilePath -> MeterUpdate -> Annex Bool +retrieveEncrypted r (cipher, enck) k d p = s3Action r False $ \(conn, bucket) -> + metered (Just p) k $ \meterupdate -> do res <- liftIO $ getObject conn $ bucketKey r bucket enck case res of Right o -> liftIO $ decrypt cipher (\h -> meteredWrite meterupdate h $ obj_data o) $ |