From 50ad0a1c1699fb1799c9ba2a99bf888894f88df4 Mon Sep 17 00:00:00 2001
From: kimsible <kimsible@users.noreply.github.com>
Date: Sat, 11 Apr 2020 04:24:42 +0200
Subject: Add getSubs to YoutubeDL video import

---
 server/helpers/youtube-dl.ts | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'server/helpers')

diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts
index 07c85797a..277422645 100644
--- a/server/helpers/youtube-dl.ts
+++ b/server/helpers/youtube-dl.ts
@@ -20,6 +20,12 @@ export type YoutubeDLInfo = {
   originallyPublishedAt?: Date
 }
 
+export type YoutubeDLSubs = {
+  language: string,
+  filename: string,
+  path: string
+}[]
+
 const processOptions = {
   maxBuffer: 1024 * 1024 * 10 // 10MB
 }
@@ -45,6 +51,35 @@ function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo>
   })
 }
 
+function getYoutubeDLSubs (url: string, opts?: object): Promise<YoutubeDLSubs> {
+  return new Promise<YoutubeDLSubs>((res, rej) => {
+    const cwd = CONFIG.STORAGE.TMP_DIR
+    const options = opts || { all: true, format: 'vtt', cwd }
+
+    safeGetYoutubeDL()
+      .then(youtubeDL => {
+        youtubeDL.getSubs(url, options, (err, files) => {
+          if (err) return rej(err)
+
+          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
+              }]
+            }
+          }, [])
+
+          return res(subtitles)
+        })
+      })
+      .catch(err => rej(err))
+  })
+}
+
 function downloadYoutubeDLVideo (url: string, extension: string, timeout: number) {
   const path = generateVideoImportTmpPath(url, extension)
   let timer
@@ -185,6 +220,7 @@ function buildOriginallyPublishedAt (obj: any) {
 export {
   updateYoutubeDLBinary,
   downloadYoutubeDLVideo,
+  getYoutubeDLSubs,
   getYoutubeDLInfo,
   safeGetYoutubeDL,
   buildOriginallyPublishedAt
-- 
cgit v1.2.3


From 652c64165b3d8d1c5d5fc646c29e5cd1c82a3330 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 15 Apr 2020 14:15:44 +0200
Subject: Fix import captions test

---
 server/helpers/youtube-dl.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'server/helpers')

diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts
index 277422645..6d2e6f6d1 100644
--- a/server/helpers/youtube-dl.ts
+++ b/server/helpers/youtube-dl.ts
@@ -21,8 +21,8 @@ export type YoutubeDLInfo = {
 }
 
 export type YoutubeDLSubs = {
-  language: string,
-  filename: string,
+  language: string
+  filename: string
   path: string
 }[]
 
@@ -61,15 +61,20 @@ function getYoutubeDLSubs (url: string, opts?: object): Promise<YoutubeDLSubs> {
         youtubeDL.getSubs(url, options, (err, files) => {
           if (err) return rej(err)
 
+          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[1]) {
-              return [...acc, {
-                language: matched[1],
-                path: join(cwd, filename),
-                filename
-              }]
+              return [
+                ...acc,
+                {
+                  language: matched[1],
+                  path: join(cwd, filename),
+                  filename
+                }
+              ]
             }
           }, [])
 
-- 
cgit v1.2.3