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

Improve resuming interrupted download when using yt-dlp or youtube-dl

Browse source 
Fixes a failure like this:

curl: (33) HTTP server doesn't seem to support byte ranges. Cannot resume.

That happens because the whole web page has already been downloaded
previously, and kept, so now addurl tries to download it, and curl asks the
server to resume from the last byte. And youtube.com can't, for whatever
stupid reason.

So, delete the temp file after determining that youtube-dl can be used.
This commit is contained in:
Joey Hess 2023-06-19 15:01:47 -04:00
parent a36a81dea3
commit 958c2fa6d2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -93,7 +93,7 @@ git-annex (10.20230408) UNRELEASED; urgency=medium
* Fix display when run with -J1.
* assistant: Fix a crash when a small file is deleted immediately after
being created.
* Improve resuming interrupted download when using yt-dlp.
* Improve resuming interrupted download when using yt-dlp or youtube-dl.
-- Joey Hess <id@joeyh.name> Sat, 08 Apr 2023 13:57:18 -0400

5
Command/AddUrl.hs
View file

@ -343,9 +343,10 @@ downloadWeb addunlockedmatcher o url urlinfo file =
-- Ask youtube-dl what filename it will download first,
-- so it's only used when the file contains embedded media.
tryyoutubedl tmp backend = youtubeDlFileNameHtmlOnly url >>= \case
Right mediafile ->
Right mediafile -> do
liftIO $ liftIO $ removeWhenExistsWith R.removeLink tmp
let f = youtubeDlDestFile o file (toRawFilePath mediafile)
in lookupKey f >>= \case
lookupKey f >>= \case
Just k -> alreadyannexed f k
Nothing -> dl f
Left err -> checkRaw (Just err) o (pure Nothing) (normalfinish tmp backend)