summaryrefslogtreecommitdiff
path: root/Logs/Transfer.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-21 14:50:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-21 14:50:14 -0400
commit226781c047a50747f5c60a6cf4920a43cd3a3a73 (patch)
tree0a5ead6c80110d533630db1875a9ebc10dea176d /Logs/Transfer.hs
parent6873d785f050cbfb2aa7bd67fcdb29ab585ec291 (diff)
unify types
Diffstat (limited to 'Logs/Transfer.hs')
-rw-r--r--Logs/Transfer.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index ac2606d8c..3d1040c2c 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -74,7 +74,7 @@ percentComplete :: Transfer -> TransferInfo -> Maybe Percentage
percentComplete (Transfer { transferKey = key }) info =
percentage <$> keySize key <*> Just (fromMaybe 0 $ bytesComplete info)
-upload :: UUID -> Key -> AssociatedFile -> (ProgressCallback -> Annex Bool) -> Annex Bool
+upload :: UUID -> Key -> AssociatedFile -> (MeterUpdate -> Annex Bool) -> Annex Bool
upload u key file a = runTransfer (Transfer Upload u key) file a
download :: UUID -> Key -> AssociatedFile -> Annex Bool -> Annex Bool
@@ -87,7 +87,7 @@ download u key file a = runTransfer (Transfer Download u key) file (const a)
- If the transfer action returns False, the transfer info is
- left in the failedTransferDir.
-}
-runTransfer :: Transfer -> Maybe FilePath -> (ProgressCallback -> Annex Bool) -> Annex Bool
+runTransfer :: Transfer -> Maybe FilePath -> (MeterUpdate -> Annex Bool) -> Annex Bool
runTransfer t file a = do
tfile <- fromRepo $ transferFile t
createAnnexDirectory $ takeDirectory tfile