X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=6357062bcf9baa9c27b5ba02d6031ad727036d68;hb=77e9f859c6ad75ba179dec74e5410cc651eaa49b;hp=eb46ea01f5d0bbc78d14a633f5096296221fbf69;hpb=818c449b3c34e9f324ac744120c8774e724ab25e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index eb46ea01f..6357062bc 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -1,11 +1,24 @@ import * as express from 'express' +import { move } from 'fs-extra' import { extname } from 'path' -import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared' -import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' -import { logger } from '../../../helpers/logger' +import toInt from 'validator/lib/toInt' +import { addOptimizeOrMergeAudioJob } from '@server/helpers/video' +import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' +import { changeVideoChannelShare } from '@server/lib/activitypub/share' +import { getVideoActivityPubUrl } from '@server/lib/activitypub/url' +import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video' +import { getVideoFilePath } from '@server/lib/video-paths' +import { getServerActor } from '@server/models/application/application' +import { MVideoDetails, MVideoFullLight } from '@server/types/models' +import { VideoCreate, VideoState, VideoUpdate } from '../../../../shared' +import { VideoFilter } from '../../../../shared/models/videos/video-query.type' import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger' -import { getFormattedObjects, getServerActor } from '../../../helpers/utils' -import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist' +import { resetSequelizeInstance } from '../../../helpers/database-utils' +import { buildNSFWFilter, createReqFiles, getCountVideos } from '../../../helpers/express-utils' +import { getMetadataFromFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' +import { logger } from '../../../helpers/logger' +import { getFormattedObjects } from '../../../helpers/utils' +import { CONFIG } from '../../../initializers/config' import { DEFAULT_AUDIO_RESOLUTION, MIMETYPES, @@ -14,14 +27,15 @@ import { VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers/constants' -import { - changeVideoChannelShare, - federateVideoIfNeeded, - fetchRemoteVideoDescription, - getVideoActivityPubUrl -} from '../../../lib/activitypub' +import { sequelizeTypescript } from '../../../initializers/database' +import { sendView } from '../../../lib/activitypub/send/send-view' +import { federateVideoIfNeeded, fetchRemoteVideoDescription } from '../../../lib/activitypub/videos' import { JobQueue } from '../../../lib/job-queue' +import { Notifier } from '../../../lib/notifier' +import { Hooks } from '../../../lib/plugins/hooks' import { Redis } from '../../../lib/redis' +import { generateVideoMiniature } from '../../../lib/thumbnail' +import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist' import { asyncMiddleware, asyncRetryTransactionMiddleware, @@ -31,7 +45,8 @@ import { optionalAuthenticate, paginationValidator, setDefaultPagination, - setDefaultSort, + setDefaultVideosSort, + videoFileMetadataGetValidator, videosAddValidator, videosCustomGetValidator, videosGetValidator, @@ -39,33 +54,18 @@ import { videosSortValidator, videosUpdateValidator } from '../../../middlewares' -import { TagModel } from '../../../models/video/tag' +import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update' import { VideoModel } from '../../../models/video/video' import { VideoFileModel } from '../../../models/video/video-file' import { abuseVideoRouter } from './abuse' import { blacklistRouter } from './blacklist' -import { videoCommentRouter } from './comment' -import { rateVideoRouter } from './rate' -import { ownershipVideoRouter } from './ownership' -import { VideoFilter } from '../../../../shared/models/videos/video-query.type' -import { buildNSFWFilter, createReqFiles, getCountVideos } from '../../../helpers/express-utils' -import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update' import { videoCaptionsRouter } from './captions' +import { videoCommentRouter } from './comment' import { videoImportsRouter } from './import' -import { resetSequelizeInstance } from '../../../helpers/database-utils' -import { move } from 'fs-extra' +import { liveRouter } from './live' +import { ownershipVideoRouter } from './ownership' +import { rateVideoRouter } from './rate' 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' -import { MVideoDetails, MVideoFullLight } from '@server/typings/models' -import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' -import { getVideoFilePath } from '@server/lib/video-paths' const auditLogger = auditLoggerFactory('videos') const videosRouter = express.Router() @@ -96,6 +96,7 @@ videosRouter.use('/', videoCaptionsRouter) videosRouter.use('/', videoImportsRouter) videosRouter.use('/', ownershipVideoRouter) videosRouter.use('/', watchingRouter) +videosRouter.use('/', liveRouter) videosRouter.get('/categories', listVideoCategories) videosRouter.get('/licences', listVideoLicences) @@ -105,7 +106,7 @@ videosRouter.get('/privacies', listVideoPrivacies) videosRouter.get('/', paginationValidator, videosSortValidator, - setDefaultSort, + setDefaultVideosSort, setDefaultPagination, optionalAuthenticate, commonVideosFiltersValidator, @@ -128,6 +129,10 @@ videosRouter.get('/:id/description', asyncMiddleware(videosGetValidator), asyncMiddleware(getVideoDescription) ) +videosRouter.get('/:id/metadata/:videoFileId', + asyncMiddleware(videoFileMetadataGetValidator), + asyncMiddleware(getVideoFileMetadata) +) videosRouter.get('/:id', optionalAuthenticate, asyncMiddleware(videosCustomGetValidator('only-video-with-rights')), @@ -180,25 +185,9 @@ async function addVideo (req: express.Request, res: express.Response) { const videoPhysicalFile = req.files['videofile'][0] const videoInfo: VideoCreate = req.body - // Prepare data so we don't block the transaction - const videoData = { - name: videoInfo.name, - remote: false, - category: videoInfo.category, - licence: videoInfo.licence, - language: videoInfo.language, - commentsEnabled: videoInfo.commentsEnabled !== false, // If the value is not "false", the default is "true" - downloadEnabled: videoInfo.downloadEnabled !== false, - waitTranscoding: videoInfo.waitTranscoding || false, - state: CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED, - nsfw: videoInfo.nsfw || false, - description: videoInfo.description, - support: videoInfo.support, - privacy: videoInfo.privacy || VideoPrivacy.PRIVATE, - duration: videoPhysicalFile['duration'], // duration was added by a previous middleware - channelId: res.locals.videoChannel.id, - originallyPublishedAt: videoInfo.originallyPublishedAt - } + const videoData = buildLocalVideoFromReq(videoInfo, res.locals.videoChannel.id) + videoData.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED + videoData.duration = videoPhysicalFile['duration'] // duration was added by a previous middleware const video = new VideoModel(videoData) as MVideoDetails video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object @@ -206,7 +195,8 @@ async function addVideo (req: express.Request, res: express.Response) { const videoFile = new VideoFileModel({ extname: extname(videoPhysicalFile.filename), size: videoPhysicalFile.size, - videoStreamingPlaylistId: null + videoStreamingPlaylistId: null, + metadata: await getMetadataFromFile(videoPhysicalFile.path) }) if (videoFile.isAudio()) { @@ -223,17 +213,11 @@ async function addVideo (req: express.Request, res: express.Response) { videoPhysicalFile.filename = getVideoFilePath(video, videoFile) videoPhysicalFile.path = destination - // Process thumbnail or create it from the video - const thumbnailField = req.files['thumbnailfile'] - const thumbnailModel = thumbnailField - ? await createVideoMiniatureFromExisting(thumbnailField[0].path, video, ThumbnailType.MINIATURE, false) - : await generateVideoMiniature(video, videoFile, ThumbnailType.MINIATURE) - - // Process preview or create it from the video - const previewField = req.files['previewfile'] - const previewModel = previewField - ? await createVideoMiniatureFromExisting(previewField[0].path, video, ThumbnailType.PREVIEW, false) - : await generateVideoMiniature(video, videoFile, ThumbnailType.PREVIEW) + const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({ + video, + files: req.files, + fallback: type => generateVideoMiniature(video, videoFile, type) + }) // Create the torrent file await createTorrentAndSetInfoHash(video, videoFile) @@ -254,13 +238,7 @@ async function addVideo (req: express.Request, res: express.Response) { video.VideoFiles = [ videoFile ] - // Create tags - if (videoInfo.tags !== undefined) { - const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t) - - await video.$set('Tags', tagInstances, sequelizeOptions) - video.Tags = tagInstances - } + await setVideoTags({ video, tags: videoInfo.tags, transaction: t }) // Schedule an update in the future? if (videoInfo.scheduleUpdate) { @@ -289,25 +267,7 @@ async function addVideo (req: express.Request, res: express.Response) { Notifier.Instance.notifyOnNewVideoIfNeeded(videoCreated) if (video.state === VideoState.TO_TRANSCODE) { - // Put uuid because we don't have id auto incremented for now - 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.createJobWithPromise({ type: 'video-transcoding', payload: dataInput }) + await addOptimizeOrMergeAudioJob(videoCreated, videoFile) } Hooks.runAction('action:api.video.uploaded', { video: videoCreated }) @@ -317,7 +277,7 @@ async function addVideo (req: express.Request, res: express.Response) { id: videoCreated.id, uuid: videoCreated.uuid } - }).end() + }) } async function updateVideo (req: express.Request, res: express.Response) { @@ -329,14 +289,12 @@ async function updateVideo (req: express.Request, res: express.Response) { const wasConfidentialVideo = videoInstance.isConfidential() const hadPrivacyForFederation = videoInstance.hasPrivacyForFederation() - // Process thumbnail or create it from the video - const thumbnailModel = req.files && req.files['thumbnailfile'] - ? await createVideoMiniatureFromExisting(req.files['thumbnailfile'][0].path, videoInstance, ThumbnailType.MINIATURE, false) - : undefined - - const previewModel = req.files && req.files['previewfile'] - ? await createVideoMiniatureFromExisting(req.files['previewfile'][0].path, videoInstance, ThumbnailType.PREVIEW, false) - : undefined + const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({ + video: videoInstance, + files: req.files, + fallback: () => Promise.resolve(undefined), + automaticallyGenerated: false + }) try { const videoInstanceUpdated = await sequelizeTypescript.transaction(async t => { @@ -377,12 +335,12 @@ async function updateVideo (req: express.Request, res: express.Response) { if (previewModel) await videoInstanceUpdated.addAndSaveThumbnail(previewModel, t) // Video tags update? - if (videoInfoToUpdate.tags !== undefined) { - const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t) - - await videoInstanceUpdated.$set('Tags', tagInstances, sequelizeOptions) - videoInstanceUpdated.Tags = tagInstances - } + await setVideoTags({ + video: videoInstanceUpdated, + tags: videoInfoToUpdate.tags, + transaction: t, + defaultValue: videoInstanceUpdated.Tags + }) // Video channel update? if (res.locals.videoChannel && videoInstanceUpdated.channelId !== res.locals.videoChannel.id) { @@ -427,7 +385,7 @@ async function updateVideo (req: express.Request, res: express.Response) { Notifier.Instance.notifyOnNewVideoIfNeeded(videoInstanceUpdated) } - Hooks.runAction('action:api.video.updated', { video: videoInstanceUpdated }) + Hooks.runAction('action:api.video.updated', { video: videoInstanceUpdated, body: req.body }) } catch (err) { // Force fields we want to update // If the transaction is retried, sequelize will think the object has not changed @@ -493,6 +451,12 @@ async function getVideoDescription (req: express.Request, res: express.Response) return res.json({ description }) } +async function getVideoFileMetadata (req: express.Request, res: express.Response) { + const videoFile = await VideoFileModel.loadWithMetadata(toInt(req.params.videoFileId)) + + return res.json(videoFile.metadata) +} + async function listVideos (req: express.Request, res: express.Response) { const countVideos = getCountVideos(req)