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 /Remote/Web.hs | |
| 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 'Remote/Web.hs')
| -rw-r--r-- | Remote/Web.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Web.hs b/Remote/Web.hs index 257eba2e1..143bdb997 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -72,7 +72,7 @@ gen r _ c gc = } downloadKey :: Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification) -downloadKey key _file dest _p = unVerified $ get =<< getWebUrls key +downloadKey key _af dest p = unVerified $ get =<< getWebUrls key where get [] = do warning "no known url" @@ -84,13 +84,13 @@ downloadKey key _file dest _p = unVerified $ get =<< getWebUrls key case downloader of QuviDownloader -> do #ifdef WITH_QUVI - flip downloadUrl dest + flip (downloadUrl key p) dest =<< withQuviOptions Quvi.queryLinks [Quvi.httponly, Quvi.quiet] u' #else warning "quvi support needed for this url" return False #endif - _ -> downloadUrl [u'] dest + _ -> downloadUrl key p [u'] dest downloadKeyCheap :: Key -> AssociatedFile -> FilePath -> Annex Bool downloadKeyCheap _ _ _ = return False |