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

addurl, youtube-dl: When --check-raw prevents downloading an url, still continue with any downloads that come after it, rather than erroring out

Browse source 
Sponsored-By: Mark Reidenbach on Patreon
This commit is contained in:
Joey Hess 2021-11-28 19:40:06 -04:00
parent 9a1f14e6f0
commit 01a5ee6998
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/ImportFeed.hs
View file

@ -202,7 +202,7 @@ performDownload' started addunlockedmatcher opts cache todownload = case locatio
let f' = fromRawFilePath f
r <- Remote.claimingUrl url
if Remote.uuid r == webUUID || rawOption (downloadOptions opts)
then checkRaw Nothing (downloadOptions opts) $ do
then checkRaw (Just url) (downloadOptions opts) Nothing $ do
let dlopts = (downloadOptions opts)
-- force using the filename
-- chosen here
@ -341,7 +341,7 @@ performDownload' started addunlockedmatcher opts cache todownload = case locatio
, downloadlink False
)
where
downloadlink started' = checkRaw Nothing (downloadOptions opts) $
downloadlink started' = checkRaw (Just linkurl) (downloadOptions opts) False $
performDownload' started' addunlockedmatcher opts cache todownload
{ location = Enclosure linkurl }