X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fimport.ts;h=cd9ba046deed1656f821c9112b557cc89e20fe0f;hb=2d53be0267acc49cda46707b885096193a1f4e9c;hp=94dafcdbdc28707699f0a6a714f6b3a89962ca78;hpb=a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index 94dafcdbd..cd9ba046d 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -1,45 +1,53 @@ +import * as Bluebird from 'bluebird' import * as express from 'express' +import { move, readFile } from 'fs-extra' import * as magnetUtil from 'magnet-uri' -import 'multer' -import { auditLoggerFactory, VideoImportAuditView } from '../../../helpers/audit-logger' -import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares' +import * as parseTorrent from 'parse-torrent' +import { join } from 'path' +import { setVideoTags } from '@server/lib/video' import { - CONFIG, - IMAGE_MIMETYPE_EXT, - PREVIEWS_SIZE, - sequelizeTypescript, - THUMBNAILS_SIZE, - TORRENT_MIMETYPE_EXT -} from '../../../initializers' -import { getYoutubeDLInfo, YoutubeDLInfo } from '../../../helpers/youtube-dl' + MChannelAccountDefault, + MThumbnail, + MUser, + MVideoAccountDefault, + MVideoCaptionVideo, + MVideoTag, + MVideoThumbnailAccountDefault, + MVideoWithBlacklistLight +} from '@server/types/models' +import { MVideoImport, MVideoImportFormattable } from '@server/types/models/video/video-import' +import { VideoImportCreate, VideoImportState, VideoPrivacy, VideoState } from '../../../../shared' +import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' +import { auditLoggerFactory, getAuditIdFromRes, VideoImportAuditView } from '../../../helpers/audit-logger' +import { moveAndProcessCaptionFile } from '../../../helpers/captions-utils' +import { isArray } from '../../../helpers/custom-validators/misc' import { createReqFiles } from '../../../helpers/express-utils' import { logger } from '../../../helpers/logger' -import { VideoImportCreate, VideoImportState, VideoPrivacy, VideoState } from '../../../../shared' +import { getSecureTorrentName } from '../../../helpers/utils' +import { getYoutubeDLInfo, getYoutubeDLSubs, YoutubeDLInfo } from '../../../helpers/youtube-dl' +import { CONFIG } from '../../../initializers/config' +import { MIMETYPES } from '../../../initializers/constants' +import { sequelizeTypescript } from '../../../initializers/database' +import { getLocalVideoActivityPubUrl } from '../../../lib/activitypub/url' +import { JobQueue } from '../../../lib/job-queue/job-queue' +import { createVideoMiniatureFromExisting, createVideoMiniatureFromUrl } from '../../../lib/thumbnail' +import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist' +import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares' import { VideoModel } from '../../../models/video/video' -import { getVideoActivityPubUrl } from '../../../lib/activitypub' -import { TagModel } from '../../../models/video/tag' +import { VideoCaptionModel } from '../../../models/video/video-caption' import { VideoImportModel } from '../../../models/video/video-import' -import { JobQueue } from '../../../lib/job-queue/job-queue' -import { processImage } from '../../../helpers/image-utils' -import { join } from 'path' -import { isArray } from '../../../helpers/custom-validators/misc' -import { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model' -import { VideoChannelModel } from '../../../models/video/video-channel' -import * as Bluebird from 'bluebird' -import * as parseTorrent from 'parse-torrent' -import { readFileBufferPromise, renamePromise } from '../../../helpers/core-utils' -import { getSecureTorrentName } from '../../../helpers/utils' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' const auditLogger = auditLoggerFactory('video-imports') const videoImportsRouter = express.Router() const reqVideoFileImport = createReqFiles( [ 'thumbnailfile', 'previewfile', 'torrentfile' ], - Object.assign({}, TORRENT_MIMETYPE_EXT, IMAGE_MIMETYPE_EXT), + Object.assign({}, MIMETYPES.TORRENT.MIMETYPE_EXT, MIMETYPES.IMAGE.MIMETYPE_EXT), { - thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, - previewfile: CONFIG.STORAGE.PREVIEWS_DIR, - torrentfile: CONFIG.STORAGE.TORRENTS_DIR + thumbnailfile: CONFIG.STORAGE.TMP_DIR, + previewfile: CONFIG.STORAGE.TMP_DIR, + torrentfile: CONFIG.STORAGE.TMP_DIR } ) @@ -61,7 +69,7 @@ export { function addVideoImport (req: express.Request, res: express.Response) { if (req.body.targetUrl) return addYoutubeDLImport(req, res) - const file = req.files && req.files['torrentfile'] ? req.files['torrentfile'][0] : undefined + const file = req.files?.['torrentfile']?.[0] if (req.body.magnetUri || file) return addTorrentImport(req, res, file) } @@ -78,33 +86,41 @@ async function addTorrentImport (req: express.Request, res: express.Response, to // Rename the torrent to a secured name const newTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, getSecureTorrentName(torrentName)) - await renamePromise(torrentfile.path, newTorrentPath) + await move(torrentfile.path, newTorrentPath) torrentfile.path = newTorrentPath - const buf = await readFileBufferPromise(torrentfile.path) + const buf = await readFile(torrentfile.path) const parsedTorrent = parseTorrent(buf) - videoName = isArray(parsedTorrent.name) ? parsedTorrent.name[ 0 ] : parsedTorrent.name as string + videoName = isArray(parsedTorrent.name) ? parsedTorrent.name[0] : parsedTorrent.name as string } else { magnetUri = body.magnetUri const parsed = magnetUtil.decode(magnetUri) - videoName = isArray(parsed.name) ? parsed.name[ 0 ] : parsed.name as string + videoName = isArray(parsed.name) ? parsed.name[0] : parsed.name as string } const video = buildVideo(res.locals.videoChannel.id, body, { name: videoName }) - await processThumbnail(req, video) - await processPreview(req, video) + const thumbnailModel = await processThumbnail(req, video) + const previewModel = await processPreview(req, video) - const tags = null + const tags = body.tags || undefined const videoImportAttributes = { magnetUri, torrentName, state: VideoImportState.PENDING, userId: user.id } - const videoImport: VideoImportModel = await insertIntoDB(video, res.locals.videoChannel, tags, videoImportAttributes) + const videoImport = await insertIntoDB({ + video, + thumbnailModel, + previewModel, + videoChannel: res.locals.videoChannel, + tags, + videoImportAttributes, + user + }) // Create job to import the video const payload = { @@ -112,9 +128,9 @@ async function addTorrentImport (req: express.Request, res: express.Response, to videoImportId: videoImport.id, magnetUri } - await JobQueue.Instance.createJob({ type: 'video-import', payload }) + await JobQueue.Instance.createJobWithPromise({ type: 'video-import', payload }) - auditLogger.create(res.locals.oauth.token.User.Account.Actor.getIdentifier(), new VideoImportAuditView(videoImport.toFormattedJSON())) + auditLogger.create(getAuditIdFromRes(res), new VideoImportAuditView(videoImport.toFormattedJSON())) return res.json(videoImport.toFormattedJSON()).end() } @@ -124,21 +140,39 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) const targetUrl = body.targetUrl const user = res.locals.oauth.token.User + // Get video infos let youtubeDLInfo: YoutubeDLInfo try { youtubeDLInfo = await getYoutubeDLInfo(targetUrl) } catch (err) { logger.info('Cannot fetch information from import for URL %s.', targetUrl, { err }) - return res.status(400).json({ + return res.status(HttpStatusCode.BAD_REQUEST_400).json({ error: 'Cannot fetch remote information of this URL.' }).end() } const video = buildVideo(res.locals.videoChannel.id, body, youtubeDLInfo) - const downloadThumbnail = !await processThumbnail(req, video) - const downloadPreview = !await processPreview(req, video) + let thumbnailModel: MThumbnail + + // Process video thumbnail from request.files + thumbnailModel = await processThumbnail(req, video) + + // Process video thumbnail from url if processing from request.files failed + if (!thumbnailModel && youtubeDLInfo.thumbnailUrl) { + thumbnailModel = await processThumbnailFromUrl(youtubeDLInfo.thumbnailUrl, video) + } + + let previewModel: MThumbnail + + // Process video preview from request.files + previewModel = await processPreview(req, video) + + // Process video preview from url if processing from request.files failed + if (!previewModel && youtubeDLInfo.thumbnailUrl) { + previewModel = await processPreviewFromUrl(youtubeDLInfo.thumbnailUrl, video) + } const tags = body.tags || youtubeDLInfo.tags const videoImportAttributes = { @@ -146,19 +180,53 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) state: VideoImportState.PENDING, userId: user.id } - const videoImport: VideoImportModel = await insertIntoDB(video, res.locals.videoChannel, tags, videoImportAttributes) + const videoImport = await insertIntoDB({ + video, + thumbnailModel, + previewModel, + videoChannel: res.locals.videoChannel, + tags, + videoImportAttributes, + user + }) + + // Get video subtitles + try { + const subtitles = await getYoutubeDLSubs(targetUrl) + + logger.info('Will create %s subtitles from youtube import %s.', subtitles.length, targetUrl) + + for (const subtitle of subtitles) { + const videoCaption = new VideoCaptionModel({ + videoId: video.id, + language: subtitle.language + }) as MVideoCaptionVideo + videoCaption.Video = video + + // Move physical file + await moveAndProcessCaptionFile(subtitle, videoCaption) + + await sequelizeTypescript.transaction(async t => { + await VideoCaptionModel.insertOrReplaceLanguage(video.id, subtitle.language, null, t) + }) + } + } catch (err) { + logger.warn('Cannot get video subtitles.', { err }) + } // Create job to import the video const payload = { type: 'youtube-dl' as 'youtube-dl', videoImportId: videoImport.id, - thumbnailUrl: youtubeDLInfo.thumbnailUrl, - downloadThumbnail, - downloadPreview + generateThumbnail: !thumbnailModel, + generatePreview: !previewModel, + fileExt: youtubeDLInfo.fileExt + ? `.${youtubeDLInfo.fileExt}` + : '.mp4' } - await JobQueue.Instance.createJob({ type: 'video-import', payload }) + await JobQueue.Instance.createJobWithPromise({ type: 'video-import', payload }) - auditLogger.create(res.locals.oauth.token.User.Account.Actor.getIdentifier(), new VideoImportAuditView(videoImport.toFormattedJSON())) + auditLogger.create(getAuditIdFromRes(res), new VideoImportAuditView(videoImport.toFormattedJSON())) return res.json(videoImport.toFormattedJSON()).end() } @@ -169,8 +237,9 @@ function buildVideo (channelId: number, body: VideoImportCreate, importData: You remote: false, category: body.category || importData.category, licence: body.licence || importData.licence, - language: body.language || undefined, - commentsEnabled: body.commentsEnabled || true, + 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, state: VideoState.TO_IMPORT, nsfw: body.nsfw || importData.nsfw || false, @@ -178,10 +247,11 @@ function buildVideo (channelId: number, body: VideoImportCreate, importData: You support: body.support || null, privacy: body.privacy || VideoPrivacy.PRIVATE, duration: 0, // duration will be set by the import job - channelId: channelId + channelId: channelId, + originallyPublishedAt: body.originallyPublishedAt || importData.originallyPublishedAt } const video = new VideoModel(videoData) - video.url = getVideoActivityPubUrl(video) + video.url = getLocalVideoActivityPubUrl(video) return video } @@ -189,53 +259,90 @@ function buildVideo (channelId: number, body: VideoImportCreate, importData: You async function processThumbnail (req: express.Request, video: VideoModel) { const thumbnailField = req.files ? req.files['thumbnailfile'] : undefined if (thumbnailField) { - const thumbnailPhysicalFile = thumbnailField[ 0 ] - await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName()), THUMBNAILS_SIZE) - - return true + const thumbnailPhysicalFile = thumbnailField[0] + + return createVideoMiniatureFromExisting({ + inputPath: thumbnailPhysicalFile.path, + video, + type: ThumbnailType.MINIATURE, + automaticallyGenerated: false + }) } - return false + return undefined } async function processPreview (req: express.Request, video: VideoModel) { const previewField = req.files ? req.files['previewfile'] : undefined if (previewField) { const previewPhysicalFile = previewField[0] - await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName()), PREVIEWS_SIZE) - return true + return createVideoMiniatureFromExisting({ + inputPath: previewPhysicalFile.path, + video, + type: ThumbnailType.PREVIEW, + automaticallyGenerated: false + }) + } + + return undefined +} + +async function processThumbnailFromUrl (url: string, video: VideoModel) { + try { + return createVideoMiniatureFromUrl(url, video, ThumbnailType.MINIATURE) + } catch (err) { + logger.warn('Cannot generate video thumbnail %s for %s.', url, video.url, { err }) + return undefined } +} - return false +async function processPreviewFromUrl (url: string, video: VideoModel) { + try { + return createVideoMiniatureFromUrl(url, video, ThumbnailType.PREVIEW) + } catch (err) { + logger.warn('Cannot generate video preview %s for %s.', url, video.url, { err }) + return undefined + } } -function insertIntoDB ( - video: VideoModel, - videoChannel: VideoChannelModel, - tags: string[], - videoImportAttributes: FilteredModelAttributes -): Bluebird { +function insertIntoDB (parameters: { + video: MVideoThumbnailAccountDefault + thumbnailModel: MThumbnail + previewModel: MThumbnail + videoChannel: MChannelAccountDefault + tags: string[] + videoImportAttributes: Partial + user: MUser +}): Bluebird { + const { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes, user } = parameters + return sequelizeTypescript.transaction(async t => { const sequelizeOptions = { transaction: t } // Save video object in database - const videoCreated = await video.save(sequelizeOptions) + const videoCreated = await video.save(sequelizeOptions) as (MVideoAccountDefault & MVideoWithBlacklistLight & MVideoTag) videoCreated.VideoChannel = videoChannel - // Set tags to the video - if (tags !== undefined) { - const tagInstances = await TagModel.findOrCreateTags(tags, t) + if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t) + if (previewModel) await videoCreated.addAndSaveThumbnail(previewModel, t) - await videoCreated.$set('Tags', tagInstances, sequelizeOptions) - videoCreated.Tags = tagInstances - } + await autoBlacklistVideoIfNeeded({ + video: videoCreated, + user, + notify: false, + isRemote: false, + isNew: true, + transaction: t + }) + + await setVideoTags({ video: videoCreated, tags, transaction: t }) // Create video import object in database const videoImport = await VideoImportModel.create( Object.assign({ videoId: videoCreated.id }, videoImportAttributes), sequelizeOptions - ) + ) as MVideoImportFormattable videoImport.Video = videoCreated return videoImport