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

Added remote.name.annex-web-options config

Browse source 
Which is a per-remote version of the annex.web-options config.

Had to plumb RemoteGitConfig through to getUrlOptions. In cases where a
special remote does not use curl, there was no need to do that and I used
Nothing instead.

In the case of the addurl and importfeed commands, it seemed best to say
that running these commands is not using the web special remote per se,
so the config is not used for those commands.
This commit is contained in:
Joey Hess 2025-04-01 10:17:38 -04:00
parent 932fac7772
commit e81fd72018
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
19 changed files with 152 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Remote/BitTorrent.hs
View file

@ -66,7 +66,7 @@ gen r _ rc gc rs = do
, cost = cst
, name = Git.repoDescribe r
, storeKey = uploadKey
, retrieveKeyFile = downloadKey
, retrieveKeyFile = downloadKey gc
-- Bittorrent downloads out of order, but downloadTorrentContent
-- moves the downloaded file to the destination at the end.
, retrieveKeyFileInOrder = pure True
@ -94,12 +94,12 @@ gen r _ rc gc rs = do
, mkUnavailable = return Nothing
, getInfo = return []
, claimUrl = Just (pure . isSupportedUrl)
, checkUrl = Just checkTorrentUrl
, checkUrl = Just (checkTorrentUrl gc)
, remoteStateHandle = rs
}
downloadKey :: Key -> AssociatedFile -> OsPath -> MeterUpdate -> VerifyConfig -> Annex Verification
downloadKey key _file dest p _ = do
downloadKey :: RemoteGitConfig -> Key -> AssociatedFile -> OsPath -> MeterUpdate -> VerifyConfig -> Annex Verification
downloadKey gc key _file dest p _ = do
get . map (torrentUrlNum . fst . getDownloader) =<< getBitTorrentUrls key
-- While bittorrent verifies the hash in the torrent file,
-- the torrent file itself is downloaded without verification,
@ -112,7 +112,7 @@ downloadKey key _file dest p _ = do
ok <- untilTrue urls $ \(u, filenum) -> do
registerTorrentCleanup u
checkDependencies
ifM (downloadTorrentFile u)
ifM (downloadTorrentFile gc u)
( downloadTorrentContent key u dest filenum p
, return False
)
@ -151,11 +151,11 @@ isTorrentMagnetUrl u = "magnet:" `isPrefixOf` u && checkbt (parseURIPortable u)
checkbt (Just uri) | "xt=urn:btih:" `isInfixOf` uriQuery uri = True
checkbt _ = False
checkTorrentUrl :: URLString -> Annex UrlContents
checkTorrentUrl u = do
checkTorrentUrl :: RemoteGitConfig -> URLString -> Annex UrlContents
checkTorrentUrl gc u = do
checkDependencies
registerTorrentCleanup u
ifM (downloadTorrentFile u)
ifM (downloadTorrentFile gc u)
( torrentContents u
, giveup "could not download torrent file"
)
@ -192,8 +192,8 @@ registerTorrentCleanup u = Annex.addCleanupAction (TorrentCleanup u) $
liftIO . removeWhenExistsWith removeFile =<< tmpTorrentFile u
{- Downloads the torrent file. (Not its contents.) -}
downloadTorrentFile :: URLString -> Annex Bool
downloadTorrentFile u = do
downloadTorrentFile :: RemoteGitConfig -> URLString -> Annex Bool
downloadTorrentFile gc u = do
torrent <- tmpTorrentFile u
ifM (liftIO $ doesFileExist torrent)
( return True
@ -213,7 +213,7 @@ downloadTorrentFile u = do
withTmpFileIn othertmp (literalOsPath "torrent") $ \f h -> do
liftIO $ hClose h
resetAnnexFilePerm f
ok <- Url.withUrlOptions $
ok <- Url.withUrlOptions (Just gc) $
Url.download nullMeterUpdate Nothing u f
when ok $
liftIO $ moveFile f torrent