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/Bup.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/Bup.hs')
| -rw-r--r-- | Remote/Bup.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 1c69d0a1c..77d506d7c 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -136,8 +136,8 @@ storeEncrypted r buprepo (cipher, enck) k _p = encrypt (getGpgOpts r) cipher (feedFile src) $ \h -> pipeBup params (Just h) Nothing -retrieve :: BupRepo -> Key -> AssociatedFile -> FilePath -> Annex Bool -retrieve buprepo k _f d = do +retrieve :: BupRepo -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool +retrieve buprepo k _f d _p = do let params = bupParams "join" buprepo [Param $ bupRef k] liftIO $ catchBoolIO $ do tofile <- openFile d WriteMode @@ -146,8 +146,8 @@ retrieve buprepo k _f d = do retrieveCheap :: BupRepo -> Key -> FilePath -> Annex Bool retrieveCheap _ _ _ = return False -retrieveEncrypted :: BupRepo -> (Cipher, Key) -> Key -> FilePath -> Annex Bool -retrieveEncrypted buprepo (cipher, enck) _ f = liftIO $ catchBoolIO $ +retrieveEncrypted :: BupRepo -> (Cipher, Key) -> Key -> FilePath -> MeterUpdate -> Annex Bool +retrieveEncrypted buprepo (cipher, enck) _ f _p = liftIO $ catchBoolIO $ withHandle StdoutHandle createProcessSuccess p $ \h -> do decrypt cipher (\toh -> L.hPut toh =<< L.hGetContents h) $ readBytes $ L.writeFile f |