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/Directory.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/Directory.hs')
| -rw-r--r-- | Remote/Directory.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 0ec564ca1..2bf44634d 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -124,8 +124,8 @@ withCheckedFiles check (Just _) d k a = go $ locations d k withStoredFiles :: ChunkSize -> FilePath -> Key -> ([FilePath] -> IO Bool) -> IO Bool withStoredFiles = withCheckedFiles doesFileExist -store :: FilePath -> ChunkSize -> Key -> AssociatedFile -> Annex Bool -store d chunksize k _f = do +store :: FilePath -> ChunkSize -> Key -> AssociatedFile -> ProgressCallback -> Annex Bool +store d chunksize k _f p = do src <- inRepo $ gitAnnexLocation k metered k $ \meterupdate -> storeHelper d chunksize k $ \dests -> @@ -139,8 +139,8 @@ store d chunksize k _f = do storeSplit meterupdate chunksize dests =<< L.readFile src -storeEncrypted :: FilePath -> ChunkSize -> (Cipher, Key) -> Key -> Annex Bool -storeEncrypted d chunksize (cipher, enck) k = do +storeEncrypted :: FilePath -> ChunkSize -> (Cipher, Key) -> Key -> ProgressCallback -> Annex Bool +storeEncrypted d chunksize (cipher, enck) k p = do src <- inRepo $ gitAnnexLocation k metered k $ \meterupdate -> storeHelper d chunksize enck $ \dests -> |