X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fyoutube-dl.ts;h=c2aa8870ae3b5d7627899077b6138241b750ab35;hb=9ff36c2d70956d2775d207c7809adb6fe7f2f2a5;hp=07c85797a7caa496302e75c85fed19fd6e410d24;hpb=d57d1d83c6a4d98a735b21f4e8e749a5c1e1a479;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts index 07c85797a..c2aa8870a 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[] @@ -20,6 +21,12 @@ export type YoutubeDLInfo = { originallyPublishedAt?: Date } +export type YoutubeDLSubs = { + language: string + filename: string + path: string +}[] + const processOptions = { maxBuffer: 1024 * 1024 * 10 // 10MB } @@ -45,6 +52,40 @@ function getYoutubeDLInfo (url: string, opts?: string[]): Promise }) } +function getYoutubeDLSubs (url: string, opts?: object): Promise { + return new Promise((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) + 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 + + 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 @@ -97,7 +138,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) @@ -185,6 +226,7 @@ function buildOriginallyPublishedAt (obj: any) { export { updateYoutubeDLBinary, downloadYoutubeDLVideo, + getYoutubeDLSubs, getYoutubeDLInfo, safeGetYoutubeDL, buildOriginallyPublishedAt @@ -211,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, @@ -261,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 } @@ -280,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')