Switch to yt-dlp (fixes #432)

youtube-dl has no new release since 2021
Rudloff · Mar 30, 2023 · 3e45f19 · 3e45f19
1 parent 9564764
commit 3e45f19
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 28 deletions.
diff --git a/classes/Config.php b/classes/Config.php
@@ -24,7 +24,7 @@ class Config
      *
      * @var string
      */
-    public string $youtubedl = "vendor/ytdl-org/youtube-dl/youtube_dl/__main__.py";
+    public string $youtubedl = "vendor/yt-dlp/yt-dlp/yt_dlp/__main__.py";
 
     /**
      * python binary path.
@@ -39,7 +39,13 @@ class Config
      * @var string[]
      */
     public array $params = [
-        '--no-warnings', '--ignore-errors', '--flat-playlist', '--restrict-filenames', '--no-playlist'
+        '--no-warnings',
+        '--ignore-errors',
+        '--flat-playlist',
+        '--restrict-filenames',
+        '--no-playlist',
+        '--use-extractors',
+        'default,-generic',
     ];
 
     /**

diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
     "symfony/translation": "^4.0",
     "symfony/yaml": "^4.0",
     "webfontkit/open-sans": "^1.0",
-    "ytdl-org/youtube-dl": "^2021.12",
+    "yt-dlp/yt-dlp": "^2023.03",
     "zonuexe/http-accept-language": "^0.4.1"
   },
   "require-dev": {
@@ -62,11 +62,11 @@
     {
       "type": "package",
       "package": {
-        "name": "ytdl-org/youtube-dl",
-        "version": "2021.12.17",
+        "name": "yt-dlp/yt-dlp",
+        "version": "2023.03.04",
         "dist": {
           "type": "tar",
-          "url": "https://yt-dl.org/downloads/2021.12.17/youtube-dl-2021.12.17.tar.gz"
+          "url": "https://github.com/yt-dlp/yt-dlp/releases/download/2023.03.04/yt-dlp.tar.gz"
         }
       }
     }
@@ -108,11 +108,7 @@
     "installer-types": [
       "library"
     ],
-    "patches": {
-      "ytdl-org/youtube-dl": {
-        "Disable the generic extractor": "patches/youtube-dl-disable-generic.diff"
-      }
-    }
+    "patches": {}
   },
   "scripts": {
     "lint": "grumphp run --ansi",

diff --git a/composer.lock b/composer.lock
diff --git a/config/config.example.yml b/config/config.example.yml
@@ -1,6 +1,6 @@
 ---
 # Path to your youtube-dl binary
-youtubedl: vendor/ytdl-org/youtube-dl/youtube_dl/__main__.py
+youtubedl: vendor/yt-dlp/yt-dlp/yt_dlp/__main__.py
 
 # Path to your python binary
 python: /usr/bin/python
@@ -12,6 +12,8 @@ params:
     - --flat-playlist
     - --restrict-filenames
     - --no-playlist
+    - --use-extractors
+    - default,-generic
 
 # True to enable audio conversion
 convert: false

diff --git a/patches/youtube-dl-disable-generic.diff b/patches/youtube-dl-disable-generic.diff