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

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

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`