From 86ad0cde9e7e7cbe86dfd7642c9d9b807e17c172 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 20 Apr 2020 10:38:33 +0200 Subject: Add licence and language support to y-dl imports --- server/controllers/api/videos/import.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/controllers/api') diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index fb2de5dc0..be96ef42c 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -159,7 +159,7 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) thumbnailModel = await processThumbnail(req, video) // Process video thumbnail from url if processing from request.files failed - if (!thumbnailModel) { + if (!thumbnailModel && youtubeDLInfo.thumbnailUrl) { thumbnailModel = await processThumbnailFromUrl(youtubeDLInfo.thumbnailUrl, video) } @@ -169,7 +169,7 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) previewModel = await processPreview(req, video) // Process video preview from url if processing from request.files failed - if (!previewModel) { + if (!previewModel && youtubeDLInfo.thumbnailUrl) { previewModel = await processPreviewFromUrl(youtubeDLInfo.thumbnailUrl, video) } @@ -236,7 +236,7 @@ function buildVideo (channelId: number, body: VideoImportCreate, importData: You remote: false, category: body.category || importData.category, licence: body.licence || importData.licence, - language: body.language || undefined, + language: body.language || importData.language, commentsEnabled: body.commentsEnabled !== false, // If the value is not "false", the default is "true" downloadEnabled: body.downloadEnabled !== false, waitTranscoding: body.waitTranscoding || false, -- cgit v1.2.3