diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-19 16:08:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-19 16:08:37 -0400 |
| commit | aff09a1f33be7b3df182a7c85b30a2d3e04833c7 (patch) | |
| tree | 6d7cb4ed4e9483c14bdd832c9af848dc1b866789 /Remote/Helper/Encryptable.hs | |
| parent | 3c81d70c1beccb50571281ef35c9123bac006b7c (diff) | |
add a progress callback to storeKey, and threaded it all the way through
Transfer info files are updated when the callback is called, updating
the number of bytes transferred.
Left unused p variables at every place the callback should be used.
Which is rather a lot..
Diffstat (limited to 'Remote/Helper/Encryptable.hs')
| -rw-r--r-- | Remote/Helper/Encryptable.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 6d5405d9e..e3cb40df4 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -45,7 +45,7 @@ encryptionSetup c = case (M.lookup "encryption" c, extractCipher c) of - to support storing and retrieving encrypted content. -} encryptableRemote :: Maybe RemoteConfig - -> ((Cipher, Key) -> Key -> Annex Bool) + -> ((Cipher, Key) -> Key -> ProgressCallback -> Annex Bool) -> ((Cipher, Key) -> Key -> FilePath -> Annex Bool) -> Remote -> Remote @@ -59,9 +59,9 @@ encryptableRemote c storeKeyEncrypted retrieveKeyFileEncrypted r = cost = cost r + encryptedRemoteCostAdj } where - store k f = cip k >>= maybe - (storeKey r k f) - (`storeKeyEncrypted` k) + store k f p = cip k >>= maybe + (storeKey r k f p) + (\enck -> storeKeyEncrypted enck k p) retrieve k f d = cip k >>= maybe (retrieveKeyFile r k f d) (\enck -> retrieveKeyFileEncrypted enck k d) |