Added remote.name.annex-web-options configuration setting, which can be used to provide parameters to whichever of wget or curl git-annex uses (depends on which is available, but most of their important options suitable for use here are the same).
This commit is contained in:
parent
50ebfd265f
commit
aa0882691b
7 changed files with 36 additions and 13 deletions
|
@ -209,10 +209,8 @@ copyFromRemote r key file
|
|||
loc <- liftIO $ gitAnnexLocation key r
|
||||
rsyncOrCopyFile params loc file
|
||||
| Git.repoIsSsh r = rsyncHelper =<< rsyncParamsRemote r True key file
|
||||
| Git.repoIsHttp r = liftIO $ downloadurls $ keyUrls r key
|
||||
| Git.repoIsHttp r = Annex.Content.downloadUrl (keyUrls r key) file
|
||||
| otherwise = error "copying from non-ssh, non-http repo not supported"
|
||||
where
|
||||
downloadurls us = untilTrue us $ \u -> Url.download u file
|
||||
|
||||
{- Tries to copy a key's content to a remote's annex. -}
|
||||
copyToRemote :: Git.Repo -> Key -> Annex Bool
|
||||
|
|
|
@ -11,6 +11,7 @@ import Common.Annex
|
|||
import Types.Remote
|
||||
import qualified Git
|
||||
import qualified Git.Construct
|
||||
import Annex.Content
|
||||
import Config
|
||||
import Logs.Web
|
||||
import qualified Utility.Url as Url
|
||||
|
@ -55,7 +56,7 @@ downloadKey key file = get =<< getUrls key
|
|||
return False
|
||||
get urls = do
|
||||
showOutput -- make way for download progress bar
|
||||
liftIO $ anyM (`Url.download` file) urls
|
||||
downloadUrl urls file
|
||||
|
||||
uploadKey :: Key -> Annex Bool
|
||||
uploadKey _ = do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue