X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=a3b1dde29bda01cbaf924c5b47a1d100e162bc97;hb=b4055e1c23eeefb0c8a85a77f312b2827d98f483;hp=db4f4c96ffc99078fb6e4db0a73fcbed442ba9ff;hpb=dae86118ed5d4026d04acb9d0e36829b9ad8eb4e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index db4f4c96f..a3b1dde29 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -2,21 +2,18 @@ import * as express from 'express' import { extname, join } from 'path' import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared' import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' -import { processImage } from '../../../helpers/image-utils' import { logger } from '../../../helpers/logger' import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger' import { getFormattedObjects, getServerActor } from '../../../helpers/utils' +import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist' import { - CONFIG, + DEFAULT_AUDIO_RESOLUTION, MIMETYPES, - PREVIEWS_SIZE, - sequelizeTypescript, - THUMBNAILS_SIZE, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES -} from '../../../initializers' +} from '../../../initializers/constants' import { changeVideoChannelShare, federateVideoIfNeeded, @@ -60,6 +57,12 @@ import { move } from 'fs-extra' import { watchingRouter } from './watching' import { Notifier } from '../../../lib/notifier' import { sendView } from '../../../lib/activitypub/send/send-view' +import { CONFIG } from '../../../initializers/config' +import { sequelizeTypescript } from '../../../initializers/database' +import { createVideoMiniatureFromExisting, generateVideoMiniature } from '../../../lib/thumbnail' +import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' +import { VideoTranscodingPayload } from '../../../lib/job-queue/handlers/video-transcoding' +import { Hooks } from '../../../lib/plugins/hooks' const auditLogger = auditLoggerFactory('videos') const videosRouter = express.Router() @@ -188,25 +191,26 @@ async function addVideo (req: express.Request, res: express.Response) { nsfw: videoInfo.nsfw || false, description: videoInfo.description, support: videoInfo.support, - privacy: videoInfo.privacy, + privacy: videoInfo.privacy || VideoPrivacy.PRIVATE, duration: videoPhysicalFile['duration'], // duration was added by a previous middleware channelId: res.locals.videoChannel.id, originallyPublishedAt: videoInfo.originallyPublishedAt } + const video = new VideoModel(videoData) video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object - // Build the file object - const { videoFileResolution } = await getVideoFileResolution(videoPhysicalFile.path) - const fps = await getVideoFileFPS(videoPhysicalFile.path) - - const videoFileData = { + const videoFile = new VideoFileModel({ extname: extname(videoPhysicalFile.filename), - resolution: videoFileResolution, - size: videoPhysicalFile.size, - fps + size: videoPhysicalFile.size + }) + + if (videoFile.isAudio()) { + videoFile.resolution = DEFAULT_AUDIO_RESOLUTION + } else { + videoFile.fps = await getVideoFileFPS(videoPhysicalFile.path) + videoFile.resolution = (await getVideoFileResolution(videoPhysicalFile.path)).videoFileResolution } - const videoFile = new VideoFileModel(videoFileData) // Move physical file const videoDir = CONFIG.STORAGE.VIDEOS_DIR @@ -218,29 +222,27 @@ async function addVideo (req: express.Request, res: express.Response) { // Process thumbnail or create it from the video const thumbnailField = req.files['thumbnailfile'] - if (thumbnailField) { - const thumbnailPhysicalFile = thumbnailField[0] - await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName()), THUMBNAILS_SIZE) - } else { - await video.createThumbnail(videoFile) - } + const thumbnailModel = thumbnailField + ? await createVideoMiniatureFromExisting(thumbnailField[0].path, video, ThumbnailType.MINIATURE) + : await generateVideoMiniature(video, videoFile, ThumbnailType.MINIATURE) // Process preview or create it from the video const previewField = req.files['previewfile'] - if (previewField) { - const previewPhysicalFile = previewField[0] - await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName()), PREVIEWS_SIZE) - } else { - await video.createPreview(videoFile) - } + const previewModel = previewField + ? await createVideoMiniatureFromExisting(previewField[0].path, video, ThumbnailType.PREVIEW) + : await generateVideoMiniature(video, videoFile, ThumbnailType.PREVIEW) // Create the torrent file await video.createTorrentAndSetInfoHash(videoFile) - const videoCreated = await sequelizeTypescript.transaction(async t => { + const { videoCreated, videoWasAutoBlacklisted } = await sequelizeTypescript.transaction(async t => { const sequelizeOptions = { transaction: t } const videoCreated = await video.save(sequelizeOptions) + + await videoCreated.addAndSaveThumbnail(thumbnailModel, t) + await videoCreated.addAndSaveThumbnail(previewModel, t) + // Do not forget to add video channel information to the created video videoCreated.VideoChannel = res.locals.videoChannel @@ -266,26 +268,42 @@ async function addVideo (req: express.Request, res: express.Response) { }, { transaction: t }) } - await federateVideoIfNeeded(video, true, t) + const videoWasAutoBlacklisted = await autoBlacklistVideoIfNeeded(video, res.locals.oauth.token.User, t) + if (!videoWasAutoBlacklisted) await federateVideoIfNeeded(video, true, t) auditLogger.create(getAuditIdFromRes(res), new VideoAuditView(videoCreated.toFormattedDetailsJSON())) logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid) - return videoCreated + return { videoCreated, videoWasAutoBlacklisted } }) - Notifier.Instance.notifyOnNewVideo(videoCreated) + if (videoWasAutoBlacklisted) Notifier.Instance.notifyOnVideoAutoBlacklist(videoCreated) + else Notifier.Instance.notifyOnNewVideo(videoCreated) if (video.state === VideoState.TO_TRANSCODE) { // Put uuid because we don't have id auto incremented for now - const dataInput = { - videoUUID: videoCreated.uuid, - isNewVideo: true + let dataInput: VideoTranscodingPayload + + if (videoFile.isAudio()) { + dataInput = { + type: 'merge-audio' as 'merge-audio', + resolution: DEFAULT_AUDIO_RESOLUTION, + videoUUID: videoCreated.uuid, + isNewVideo: true + } + } else { + dataInput = { + type: 'optimize' as 'optimize', + videoUUID: videoCreated.uuid, + isNewVideo: true + } } - await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput }) + await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput }) } + Hooks.runAction('action:api.video.uploaded', { video: videoCreated }) + return res.json({ video: { id: videoCreated.id, @@ -299,20 +317,19 @@ async function updateVideo (req: express.Request, res: express.Response) { const videoFieldsSave = videoInstance.toJSON() const oldVideoAuditView = new VideoAuditView(videoInstance.toFormattedDetailsJSON()) const videoInfoToUpdate: VideoUpdate = req.body + const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE + const wasNotPrivateVideo = videoInstance.privacy !== VideoPrivacy.PRIVATE const wasUnlistedVideo = videoInstance.privacy === VideoPrivacy.UNLISTED // Process thumbnail or create it from the video - if (req.files && req.files['thumbnailfile']) { - const thumbnailPhysicalFile = req.files['thumbnailfile'][0] - await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, videoInstance.getThumbnailName()), THUMBNAILS_SIZE) - } + const thumbnailModel = req.files && req.files['thumbnailfile'] + ? await createVideoMiniatureFromExisting(req.files['thumbnailfile'][0].path, videoInstance, ThumbnailType.MINIATURE) + : undefined - // Process preview or create it from the video - if (req.files && req.files['previewfile']) { - const previewPhysicalFile = req.files['previewfile'][0] - await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, videoInstance.getPreviewName()), PREVIEWS_SIZE) - } + const previewModel = req.files && req.files['previewfile'] + ? await createVideoMiniatureFromExisting(req.files['previewfile'][0].path, videoInstance, ThumbnailType.PREVIEW) + : undefined try { const videoInstanceUpdated = await sequelizeTypescript.transaction(async t => { @@ -331,20 +348,29 @@ async function updateVideo (req: express.Request, res: express.Response) { if (videoInfoToUpdate.downloadEnabled !== undefined) videoInstance.set('downloadEnabled', videoInfoToUpdate.downloadEnabled) if (videoInfoToUpdate.originallyPublishedAt !== undefined && videoInfoToUpdate.originallyPublishedAt !== null) { - videoInstance.set('originallyPublishedAt', videoInfoToUpdate.originallyPublishedAt) + videoInstance.originallyPublishedAt = new Date(videoInfoToUpdate.originallyPublishedAt) } if (videoInfoToUpdate.privacy !== undefined) { const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10) - videoInstance.set('privacy', newPrivacy) + videoInstance.privacy = newPrivacy + // The video was private, and is not anymore -> publish it if (wasPrivateVideo === true && newPrivacy !== VideoPrivacy.PRIVATE) { - videoInstance.set('publishedAt', new Date()) + videoInstance.publishedAt = new Date() + } + + // The video was not private, but now it is -> we need to unfederate it + if (wasNotPrivateVideo === true && newPrivacy === VideoPrivacy.PRIVATE) { + await VideoModel.sendDelete(videoInstance, { transaction: t }) } } const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) + if (thumbnailModel) await videoInstanceUpdated.addAndSaveThumbnail(thumbnailModel, t) + if (previewModel) await videoInstanceUpdated.addAndSaveThumbnail(previewModel, t) + // Video tags update? if (videoInfoToUpdate.tags !== undefined) { const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t) @@ -392,6 +418,8 @@ async function updateVideo (req: express.Request, res: express.Response) { if (wasUnlistedVideo || wasPrivateVideo) { Notifier.Instance.notifyOnNewVideo(videoInstanceUpdated) } + + Hooks.runAction('action:api.video.updated', { video: videoInstanceUpdated }) } catch (err) { // Force fields we want to update // If the transaction is retried, sequelize will think the object has not changed @@ -407,7 +435,11 @@ async function updateVideo (req: express.Request, res: express.Response) { async function getVideo (req: express.Request, res: express.Response) { // We need more attributes const userId: number = res.locals.oauth ? res.locals.oauth.token.User.id : null - const video = await VideoModel.loadForGetAPI(res.locals.video.id, undefined, userId) + + const video = await Hooks.wrapPromise( + VideoModel.loadForGetAPI(res.locals.video.id, undefined, userId), + 'filter:api.video.get.result' + ) if (video.isOutdated()) { JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: video.url } }) @@ -435,6 +467,8 @@ async function viewVideo (req: express.Request, res: express.Response) { const serverActor = await getServerActor() await sendView(serverActor, videoInstance, undefined) + Hooks.runAction('action:api.video.viewed', { video: videoInstance, ip }) + return res.status(204).end() } @@ -452,7 +486,7 @@ async function getVideoDescription (req: express.Request, res: express.Response) } async function listVideos (req: express.Request, res: express.Response) { - const resultList = await VideoModel.listForApi({ + const apiOptions = await Hooks.wrapObject({ start: req.query.start, count: req.query.count, sort: req.query.sort, @@ -466,7 +500,12 @@ async function listVideos (req: express.Request, res: express.Response) { filter: req.query.filter as VideoFilter, withFiles: false, user: res.locals.oauth ? res.locals.oauth.token.User : undefined - }) + }, 'filter:api.videos.list.params') + + const resultList = await Hooks.wrapPromise( + VideoModel.listForApi(apiOptions), + 'filter:api.videos.list.result' + ) return res.json(getFormattedObjects(resultList.data, resultList.total)) } @@ -481,5 +520,7 @@ async function removeVideo (req: express.Request, res: express.Response) { auditLogger.delete(getAuditIdFromRes(res), new VideoAuditView(videoInstance.toFormattedDetailsJSON())) logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid) + Hooks.runAction('action:api.video.deleted', { video: videoInstance }) + return res.type('json').status(204).end() }