From dba423a56865e14741c83af94d0222a263f3e6aa Mon Sep 17 00:00:00 2001
From: Joseph Turian <turian@gmail.com>
Date: Mon, 12 Sep 2022 20:36:23 +0000
Subject: [PATCH] A few more youtube-dl tweaks

---
 archivebox/config.py           | 2 ++
 archivebox/extractors/media.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 4d839805..d5666e87 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -149,6 +149,8 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = {
                                                                 '--yes-playlist',
                                                                 '--continue',
                                                                 '--ignore-errors',
+                                                                # This flag doesn't exist in youtube-dl
+                                                                # only in yt-dlp
                                                                 '--no-abort-on-error',
                                                                 '--geo-bypass',
                                                                 '--add-metadata',
diff --git a/archivebox/extractors/media.py b/archivebox/extractors/media.py
index 17e7a6a6..c6388a1f 100644
--- a/archivebox/extractors/media.py
+++ b/archivebox/extractors/media.py
@@ -33,7 +33,7 @@ def should_save_media(link: Link, out_dir: Optional[Path]=None, overwrite: Optio
 
 @enforce_types
 def save_media(link: Link, out_dir: Optional[Path]=None, timeout: int=MEDIA_TIMEOUT) -> ArchiveResult:
-    """Download playlists or individual video, audio, and subtitles using youtube-dl"""
+    """Download playlists or individual video, audio, and subtitles using youtube-dl or yt-dlp"""
 
     out_dir = out_dir or Path(link.link_dir)
     output: ArchiveOutput = 'media'
@@ -61,7 +61,7 @@ def save_media(link: Link, out_dir: Optional[Path]=None, timeout: int=MEDIA_TIME
                 pass
             else:
                 hints = (
-                    'Got youtube-dl response code: {}.'.format(result.returncode),
+                    'Got youtube-dl (or yt-dlp) response code: {}.'.format(result.returncode),
                     *result.stderr.decode().split('\n'),
                 )
                 raise ArchiveError('Failed to save media', hints)