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

addurl --fast error message improvement

Browse source 
addurl: When run with --fast on an url that
annex.security.allowed-ip-addresses prevents accessing, display a more
useful message.

(Also importfeed --fast potentially.)
This commit is contained in:
Joey Hess 2020-04-27 13:48:14 -04:00
parent 9b1e4de31a
commit 19b5137227
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 54 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Command/ImportFeed.hs
View file

@ -162,10 +162,6 @@ performDownload addunlockedmatcher opts cache todownload = case location todownl
r <- Remote.claimingUrl url
if Remote.uuid r == webUUID || rawOption (downloadOptions opts)
then do
urlinfo <- if relaxedOption (downloadOptions opts)
then pure Url.assumeUrlExists
else Url.withUrlOptions $
Url.getUrlInfo url
let dlopts = (downloadOptions opts)
-- force using the filename
-- chosen here
@ -173,7 +169,14 @@ performDownload addunlockedmatcher opts cache todownload = case location todownl
-- don't use youtube-dl
, rawOption = True
}
maybeToList <$> addUrlFile addunlockedmatcher dlopts url urlinfo f
let go urlinfo = maybeToList <$> addUrlFile addunlockedmatcher dlopts url urlinfo f
if relaxedOption (downloadOptions opts)
then go Url.assumeUrlExists
else Url.withUrlOptions (Url.getUrlInfo url) >>= \case
Right urlinfo -> go urlinfo
Left err -> do
warning err
return []
else do
res <- tryNonAsync $ maybe
(error $ "unable to checkUrl of " ++ Remote.name r)