From e3c9ea722629a7d2b5656299ea51aec8c903b8ae Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 27 Aug 2021 16:21:19 +0200 Subject: Add peertube import test --- server/controllers/api/videos/import.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'server/controllers/api') diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index 39fc57788..5f90e4308 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -3,6 +3,7 @@ import { move, readFile } from 'fs-extra' import { decode } from 'magnet-uri' import parseTorrent, { Instance } from 'parse-torrent' import { join } from 'path' +import { isVideoFileExtnameValid } from '@server/helpers/custom-validators/videos' import { ServerConfigManager } from '@server/lib/server-config-manager' import { setVideoTags } from '@server/lib/video' import { FilteredModelAttributes } from '@server/types' @@ -185,11 +186,14 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) // Get video subtitles await processYoutubeSubtitles(youtubeDL, targetUrl, video.id) + let fileExt = `.${youtubeDLInfo.ext}` + if (!isVideoFileExtnameValid(fileExt)) fileExt = '.mp4' + // Create job to import the video const payload = { type: 'youtube-dl' as 'youtube-dl', videoImportId: videoImport.id, - fileExt: `.${youtubeDLInfo.ext || 'mp4'}` + fileExt } await JobQueue.Instance.createJobWithPromise({ type: 'video-import', payload }) -- cgit v1.2.3