X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fyoutube-dl.ts;h=bb593095205223d0f618ddcc8ef88b5d6c7b16f5;hb=8546fe878d5f92161b83517c4bc1ecb7dedf3e9d;hp=277422645cdaa923f88202f1ce952ac2d33f0127;hpb=50ad0a1c1699fb1799c9ba2a99bf888894f88df4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts
index 277422645..bb5930952 100644
--- a/server/helpers/youtube-dl.ts
+++ b/server/helpers/youtube-dl.ts
@@ -1,4 +1,4 @@
-import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES } from '../initializers/constants'
+import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES } from '../initializers/constants'
 import { logger } from './logger'
 import { generateVideoImportTmpPath } from './utils'
 import { join } from 'path'
@@ -12,6 +12,7 @@ export type YoutubeDLInfo = {
   name?: string
   description?: string
   category?: number
+  language?: string
   licence?: number
   nsfw?: boolean
   tags?: string[]
@@ -21,8 +22,8 @@ export type YoutubeDLInfo = {
 }
 
 export type YoutubeDLSubs = {
-  language: string,
-  filename: string,
+  language: string
+  filename: string
   path: string
 }[]
 
@@ -60,17 +61,22 @@ function getYoutubeDLSubs (url: string, opts?: object): Promise<YoutubeDLSubs> {
       .then(youtubeDL => {
         youtubeDL.getSubs(url, options, (err, files) => {
           if (err) return rej(err)
+          if (!files) return []
+
+          logger.debug('Get subtitles from youtube dl.', { url, files })
 
           const subtitles = files.reduce((acc, filename) => {
             const matched = filename.match(/\.([a-z]{2})\.(vtt|ttml)/i)
+            if (!matched || !matched[1]) return acc
 
-            if (matched[1]) {
-              return [...acc, {
+            return [
+              ...acc,
+              {
                 language: matched[1],
                 path: join(cwd, filename),
                 filename
-              }]
-            }
+              }
+            ]
           }, [])
 
           return res(subtitles)
@@ -247,12 +253,13 @@ function normalizeObject (obj: any) {
   return newObj
 }
 
-function buildVideoInfo (obj: any) {
+function buildVideoInfo (obj: any): YoutubeDLInfo {
   return {
     name: titleTruncation(obj.title),
     description: descriptionTruncation(obj.description),
     category: getCategory(obj.categories),
     licence: getLicence(obj.license),
+    language: getLanguage(obj.language),
     nsfw: isNSFW(obj),
     tags: getTags(obj.tags),
     thumbnailUrl: obj.thumbnail || undefined,
@@ -297,6 +304,11 @@ function getLicence (licence: string) {
 
   if (licence.includes('Creative Commons Attribution')) return 1
 
+  for (const key of Object.keys(VIDEO_LICENCES)) {
+    const peertubeLicence = VIDEO_LICENCES[key]
+    if (peertubeLicence.toLowerCase() === licence.toLowerCase()) return parseInt(key, 10)
+  }
+
   return undefined
 }
 
@@ -316,6 +328,10 @@ function getCategory (categories: string[]) {
   return undefined
 }
 
+function getLanguage (language: string) {
+  return VIDEO_LANGUAGES[language] ? language : undefined
+}
+
 function wrapWithProxyOptions (options: string[]) {
   if (CONFIG.IMPORT.VIDEOS.HTTP.PROXY.ENABLED) {
     logger.debug('Using proxy for YoutubeDL')