Rewrite youtube-dl import

Use python3 binary
Allows to use a custom youtube-dl release URL
Allows to use yt-dlp (youtube-dl fork)
Remove proxy config from configuration to use HTTP_PROXY and HTTPS_PROXY
env variables

9 files changed, 20 insertions, 11 deletions

diff --git a/config/default.yaml b/config/default.yaml
index c46d0e883..ec9622477 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -85,6 +85,7 @@ client:
 # From the project root directory
 storage:
   tmp: 'storage/tmp/' # Use to download data (imports etc), store uploaded files before and during processing...
+  bin: 'storage/bin/'
   avatars: 'storage/avatars/'
   videos: 'storage/videos/'
   streaming_playlists: 'storage/streaming-playlists/'
@@ -394,13 +395,21 @@ import:
     http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
       enabled: false
 
+      youtube_dl_release:
+        # Direct download URL to youtube-dl binary
+        # Github releases API is also supported
+        # Examples:
+        #   * https://api.github.com/repos/ytdl-org/youtube-dl/releases
+        #   * https://api.github.com/repos/yt-dlp/yt-dlp/releases
+        url: 'https://yt-dl.org/downloads/latest/youtube-dl'
+
+        # youtube-dl binary name
+        # yt-dlp is also supported
+        name: 'youtube-dl'
+
       # IPv6 is very strongly rate-limited on most sites supported by youtube-dl
       force_ipv4: false
 
-      # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
-      proxy:
-        enabled: false
-        url: ''
     torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
       enabled: false
 
diff --git a/config/production.yaml.example b/config/production.yaml.example
index d023070e3..588d6a3a5 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -83,6 +83,7 @@ client:
 # From the project root directory
 storage:
   tmp: '/var/www/peertube/storage/tmp/' # Use to download data (imports etc), store uploaded files before and during processing...
+  bin: '/var/www/peertube/storage/bin/'
   avatars: '/var/www/peertube/storage/avatars/'
   videos: '/var/www/peertube/storage/videos/'
   streaming_playlists: '/var/www/peertube/storage/streaming-playlists/'
@@ -407,10 +408,6 @@ import:
       # IPv6 is very strongly rate-limited on most sites supported by youtube-dl
       force_ipv4: false
 
-      # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
-      proxy:
-        enabled: false
-        url: ''
     torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
       enabled: false
 
diff --git a/config/test-1.yaml b/config/test-1.yaml
index fe5b3cf44..d5f8299e0 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -11,6 +11,7 @@ database:
 # From the project root directory
 storage:
   tmp: 'test1/tmp/'
+  bin: 'test1/bin/'
   avatars: 'test1/avatars/'
   videos: 'test1/videos/'
   streaming_playlists: 'test1/streaming-playlists/'
diff --git a/config/test-2.yaml b/config/test-2.yaml
index b559769c3..9da79da16 100644
--- a/config/test-2.yaml
+++ b/config/test-2.yaml
@@ -11,6 +11,7 @@ database:
 # From the project root directory
 storage:
   tmp: 'test2/tmp/'
+  bin: 'test2/bin/'
   avatars: 'test2/avatars/'
   videos: 'test2/videos/'
   streaming_playlists: 'test2/streaming-playlists/'
diff --git a/config/test-3.yaml b/config/test-3.yaml
index 9a7a944e9..594439b62 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -11,6 +11,7 @@ database:
 # From the project root directory
 storage:
   tmp: 'test3/tmp/'
+  bin: 'test3/bin/'
   avatars: 'test3/avatars/'
   videos: 'test3/videos/'
   streaming_playlists: 'test3/streaming-playlists/'
diff --git a/config/test-4.yaml b/config/test-4.yaml
index 1e4bee974..1e6368bf7 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -11,6 +11,7 @@ database:
 # From the project root directory
 storage:
   tmp: 'test4/tmp/'
+  bin: 'test4/bin/'
   avatars: 'test4/avatars/'
   videos: 'test4/videos/'
   streaming_playlists: 'test4/streaming-playlists/'
diff --git a/config/test-5.yaml b/config/test-5.yaml
index 9725e84f4..97f18a7a0 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -11,6 +11,7 @@ database:
 # From the project root directory
 storage:
   tmp: 'test5/tmp/'
+  bin: 'test5/bin/'
   avatars: 'test5/avatars/'
   videos: 'test5/videos/'
   streaming_playlists: 'test5/streaming-playlists/'
diff --git a/config/test-6.yaml b/config/test-6.yaml
index a04c8a6a9..156da84d2 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -11,6 +11,7 @@ database:
 # From the project root directory
 storage:
   tmp: 'test6/tmp/'
+  bin: 'test6/bin/'
   avatars: 'test6/avatars/'
   videos: 'test6/videos/'
   streaming_playlists: 'test6/streaming-playlists/'
diff --git a/config/test.yaml b/config/test.yaml
index 9a522a983..3eb2f04d8 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -118,9 +118,6 @@ import:
     concurrency: 2
     http:
       enabled: true
-      proxy:
-        enabled: false
-        url: ""
     torrent:
       enabled: true