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

When youtube-dl is not available in PATH, use yt-dlp instead

Browse source 
Debian is going to drop youtube-dl which is not active upstream, and yt-dlp
is the replacement. This will make it be used if youtube-dl gets removed.

If an old version of youtube-dl remains installed, git-annex will still use
it. That might not be desirable, but changing git-annex to use yt-dlp in
preference to youtube-dl when both are installed risks breaking when
the user has annex.youtube-dl-options set to something that is supported
by youtube-dl, but not by yt-dlp.

Sponsored-by: Boyd Stephen Smith Jr. on Patreon
This commit is contained in:
Joey Hess 2022-11-21 14:39:26 -04:00
parent 63b33d4181
commit 5256be61c1
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Annex/YoutubeDl.hs
View file

@ -249,8 +249,9 @@ youtubeDlOpts addopts = do
return (opts ++ addopts)
youtubeDlCommand :: Annex String
youtubeDlCommand = fromMaybe "youtube-dl" . annexYoutubeDlCommand
<$> Annex.getGitConfig
youtubeDlCommand = annexYoutubeDlCommand <$> Annex.getGitConfig >>= \case
Just c -> pure c
Nothing -> fromMaybe "yt-dlp" <$> liftIO (searchPath "youtube-dl")
supportedScheme :: UrlOptions -> URLString -> Bool
supportedScheme uo url = case parseURIRelaxed url of

1
CHANGELOG
View file

@ -4,6 +4,7 @@ git-annex (10.20221105) UNRELEASED; urgency=medium
* Sped up the initial scan for annexed files by 21%.
* init: Avoid scanning for annexed files, which can be lengthy in a
large repository. Instead that scan is done on demand.
* When youtube-dl is not available in PATH, use yt-dlp instead.
-- Joey Hess <id@joeyh.name> Fri, 18 Nov 2022 12:58:06 -0400

2
debian/control vendored
View file

@ -111,7 +111,7 @@ Recommends:
lsof,
gnupg,
bind9-host,
youtube-dl,
yt-dlp,
git-remote-gcrypt (>= 0.20130908-6),
nocache,
aria2,

7
doc/git-annex.mdwn
View file

@ -1719,8 +1719,8 @@ Remotes are configured using these settings in `.git/config`.
* `annex.youtube-dl-options`
Options to pass to youtube-dl when using it to find the url to download
for a video.
Options to pass to youtube-dl (or yt-dlp) when using it to find the url
to download for a video.
Some options may break git-annex's integration with youtube-dl. For
example, the --output option could cause it to store files somewhere
@ -1730,7 +1730,8 @@ Remotes are configured using these settings in `.git/config`.
* `annex.youtube-dl-command`
Command to run for youtube-dl. Default is "youtube-dl".
Command to run for youtube-dl. Default is to use "youtube-dl" or
if that is not available in the PATH, to use "yt-dlp".
* `annex.aria-torrent-options`