mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

download urls via tmp file, and support resuming

Browse source
This commit is contained in:
Joey Hess 2011-07-01 18:46:07 -04:00
parent 5d154b8436
commit ace9de37e8
3 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Remote/Web.hs
View file

@ -82,7 +82,9 @@ setUrl key url status = do
logChange g key webUUID (if null us then InfoMissing else InfoPresent)
downloadKey :: Key -> FilePath -> Annex Bool
downloadKey key file = download file =<< getUrls key
downloadKey key file = do
us <- getUrls key
download us file
uploadKey :: Key -> Annex Bool
uploadKey _ = do
@ -116,9 +118,9 @@ urlexists url = do
res <- perform curl
return $ res == CurlOK
download :: FilePath -> [URLString] -> Annex Bool
download _ [] = return False
download file (url:us) = do
download :: [URLString] -> FilePath -> Annex Bool
download [] _ = return False
download (url:us) file = do
showProgress -- make way for curl progress bar
ok <- liftIO $ boolSystem "curl" [Params "-# -o", File file, File url]
if ok then return ok else download file us
ok <- liftIO $ boolSystem "curl" [Params "-C - -# -o", File file, File url]
if ok then return ok else download us file