From: Chocobozzz <me@florianbigard.com>
Date: Wed, 22 Jan 2020 16:19:03 +0000 (+0100)
Subject: Proxy youtube-dl format command too
X-Git-Tag: v2.1.0-rc.1~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=93905586ee198d4ac0a0fd5141a9fcbb10a94652;p=oweals%2Fpeertube.git

Proxy youtube-dl format command too
---

diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts
index d17c9d554..577a59dbf 100644
--- a/server/helpers/youtube-dl.ts
+++ b/server/helpers/youtube-dl.ts
@@ -25,7 +25,8 @@ const processOptions = {
 
 function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> {
   return new Promise<YoutubeDLInfo>(async (res, rej) => {
-    const args = opts || [ '-j', '--flat-playlist' ]
+    let args = opts || [ '-j', '--flat-playlist' ]
+    args = wrapWithProxyOptions(args)
 
     const youtubeDL = await safeGetYoutubeDL()
     youtubeDL.getInfo(url, args, processOptions, (err, info) => {
@@ -47,12 +48,7 @@ function downloadYoutubeDLVideo (url: string, timeout: number) {
   logger.info('Importing youtubeDL video %s', url)
 
   let options = [ '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best', '-o', path ]
-
-  if (CONFIG.IMPORT.VIDEOS.HTTP.PROXY.ENABLED) {
-    logger.debug('Using proxy for YoutubeDL')
-
-    options = [ '--proxy', CONFIG.IMPORT.VIDEOS.HTTP.PROXY.URL ].concat(options)
-  }
+  options = wrapWithProxyOptions(options)
 
   if (process.env.FFMPEG_PATH) {
     options = options.concat([ '--ffmpeg-location', process.env.FFMPEG_PATH ])
@@ -270,3 +266,13 @@ function getCategory (categories: string[]) {
 
   return undefined
 }
+
+function wrapWithProxyOptions (options: string[]) {
+  if (CONFIG.IMPORT.VIDEOS.HTTP.PROXY.ENABLED) {
+    logger.debug('Using proxy for YoutubeDL')
+
+    return [ '--proxy', CONFIG.IMPORT.VIDEOS.HTTP.PROXY.URL ].concat(options)
+  }
+
+  return options
+}