Don't reject accounts with empty description

[github/Chocobozzz/PeerTube.git] / server / helpers / youtube-dl.ts

diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts
index 2014aab0a486ae5f0007bbb35c638594e6f6a95c..74e5f896c1a49929315c931c4efb6c2ca76a78bd 100644 (file)
--- a/server/helpers/youtube-dl.ts
+++ b/server/helpers/youtube-dl.ts
@@ -7,6 +7,7 @@ import { ensureDir, remove, writeFile } from 'fs-extra'
 import * as request from 'request'
 import { createWriteStream } from 'fs'
 import { CONFIG } from '@server/initializers/config'
+import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
 
 export type YoutubeDLInfo = {
   name?: string
@@ -34,6 +35,11 @@ const processOptions = {
 function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> {
   return new Promise<YoutubeDLInfo>((res, rej) => {
     let args = opts || [ '-j', '--flat-playlist' ]
+
+    if (CONFIG.IMPORT.VIDEOS.HTTP.FORCE_IPV4) {
+      args.push('--force-ipv4')
+    }
+
     args = wrapWithProxyOptions(args)
 
     safeGetYoutubeDL()
@@ -67,17 +73,16 @@ function getYoutubeDLSubs (url: string, opts?: object): Promise<YoutubeDLSubs> {
 
           const subtitles = files.reduce((acc, filename) => {
             const matched = filename.match(/\.([a-z]{2})\.(vtt|ttml)/i)
-
-            if (matched[1]) {
-              return [
-                ...acc,
-                {
-                  language: matched[1],
-                  path: join(cwd, filename),
-                  filename
-                }
-              ]
-            }
+            if (!matched || !matched[1]) return acc
+
+            return [
+              ...acc,
+              {
+                language: matched[1],
+                path: join(cwd, filename),
+                filename
+              }
+            ]
           }, [])
 
           return res(subtitles)
@@ -139,7 +144,7 @@ async function updateYoutubeDLBinary () {
   const binDirectory = join(root(), 'node_modules', 'youtube-dl', 'bin')
   const bin = join(binDirectory, 'youtube-dl')
   const detailsPath = join(binDirectory, 'details')
-  const url = 'https://yt-dl.org/downloads/latest/youtube-dl'
+  const url = process.env.YOUTUBE_DL_DOWNLOAD_HOST || 'https://yt-dl.org/downloads/latest/youtube-dl'
 
   await ensureDir(binDirectory)
 
@@ -150,7 +155,7 @@ async function updateYoutubeDLBinary () {
         return res()
       }
 
-      if (result.statusCode !== 302) {
+      if (result.statusCode !== HttpStatusCode.FOUND_302) {
         logger.error('youtube-dl update error: did not get redirect for the latest version link. Status %d', result.statusCode)
         return res()
       }
@@ -160,12 +165,17 @@ async function updateYoutubeDLBinary () {
       const newVersion = /yt-dl\.org\/downloads\/(\d{4}\.\d\d\.\d\d(\.\d)?)\/youtube-dl/.exec(url)[1]
 
       downloadFile.on('response', result => {
-        if (result.statusCode !== 200) {
+        if (result.statusCode !== HttpStatusCode.OK_200) {
           logger.error('Cannot update youtube-dl: new version response is not 200, it\'s %d.', result.statusCode)
           return res()
         }
 
-        downloadFile.pipe(createWriteStream(bin, { mode: 493 }))
+        const writeStream = createWriteStream(bin, { mode: 493 }).on('error', err => {
+          logger.error('youtube-dl update error in write stream', { err })
+          return res()
+        })
+
+        downloadFile.pipe(writeStream)
       })
 
       downloadFile.on('error', err => {