diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-16 21:00:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-16 21:00:54 -0400 |
| commit | 89e8441c62b985a6bcf37024fc051e99fbce8e37 (patch) | |
| tree | ef9d04b7f73633a27c187b472efc5142fde62130 /Command | |
| parent | d77b7936adc49a98172a16a3fea89fb2ad9fd642 (diff) | |
Display progress meter in -J mode when downloading from the web.
Including in addurl, and get --from web, but also in S3 and External
special remotes when a web url is known for content in those remotes.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/AddUrl.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index 6ed4fb2e2..78313f538 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -252,9 +252,9 @@ addUrlFileQuvi relaxed quviurl videourl file = do tmp <- fromRepo $ gitAnnexTmpObjectLocation key showOutput ok <- Transfer.notifyTransfer Transfer.Download (Just file) $ - Transfer.download webUUID key (Just file) Transfer.forwardRetry Transfer.noObserver $ const $ do + Transfer.download webUUID key (Just file) Transfer.forwardRetry Transfer.noObserver $ \p -> do liftIO $ createDirectoryIfMissing True (parentDir tmp) - downloadUrl [videourl] tmp + downloadUrl key p [videourl] tmp if ok then do cleanup webUUID quviurl file key (Just tmp) @@ -294,9 +294,9 @@ addUrlFile relaxed url urlinfo file = do downloadWeb :: URLString -> Url.UrlInfo -> FilePath -> Annex (Maybe Key) downloadWeb url urlinfo file = do let dummykey = addSizeUrlKey urlinfo $ Backend.URL.fromUrl url Nothing - let downloader f _ = do + let downloader f p = do showOutput - downloadUrl [url] f + downloadUrl dummykey p [url] f showAction $ "downloading " ++ url ++ " " downloadWith downloader dummykey webUUID url file |