X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=6e8601fa1c65cdab1c8e3b81961f91c31c6a718d;hb=0883b3245bf0deb9106c4041e9afbd3521b79280;hp=c2fdb4f95ad7092d03d3e7605724516394ae1eda;hpb=f05a1c30c15d2ae35c11e241ca039a72eeb7d6ad;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index c2fdb4f95..6e8601fa1 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -3,19 +3,43 @@ import { extname, join } from 'path' import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared' import { renamePromise } from '../../../helpers/core-utils' import { retryTransactionWrapper } from '../../../helpers/database-utils' -import { getVideoFileHeight } from '../../../helpers/ffmpeg-utils' +import { getVideoFileResolution } from '../../../helpers/ffmpeg-utils' +import { processImage } from '../../../helpers/image-utils' import { logger } from '../../../helpers/logger' import { createReqFiles, getFormattedObjects, getServerActor, resetSequelizeInstance } from '../../../helpers/utils' import { - CONFIG, sequelizeTypescript, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, + CONFIG, + IMAGE_MIMETYPE_EXT, + PREVIEWS_SIZE, + sequelizeTypescript, + THUMBNAILS_SIZE, + VIDEO_CATEGORIES, + VIDEO_LANGUAGES, + VIDEO_LICENCES, + VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers' -import { fetchRemoteVideoDescription, getVideoActivityPubUrl, shareVideoByServerAndChannel } from '../../../lib/activitypub' -import { sendCreateVideo, sendCreateViewToOrigin, sendCreateViewToVideoFollowers, sendUpdateVideo } from '../../../lib/activitypub/send' -import { transcodingJobScheduler } from '../../../lib/jobs/transcoding-job-scheduler' import { - asyncMiddleware, authenticate, paginationValidator, setDefaultSort, setDefaultPagination, videosAddValidator, videosGetValidator, - videosRemoveValidator, videosSearchValidator, videosSortValidator, videosUpdateValidator + fetchRemoteVideoDescription, + getVideoActivityPubUrl, + shareVideoByServerAndChannel +} from '../../../lib/activitypub' +import { sendCreateVideo, sendCreateView, sendUpdateVideo } from '../../../lib/activitypub/send' +import { JobQueue } from '../../../lib/job-queue' +import { Redis } from '../../../lib/redis' +import { + asyncMiddleware, + authenticate, + optionalAuthenticate, + paginationValidator, + setDefaultPagination, + setDefaultSort, + videosAddValidator, + videosGetValidator, + videosRemoveValidator, + videosSearchValidator, + videosSortValidator, + videosUpdateValidator } from '../../../middlewares' import { TagModel } from '../../../models/video/tag' import { VideoModel } from '../../../models/video/video' @@ -25,10 +49,29 @@ import { blacklistRouter } from './blacklist' import { videoChannelRouter } from './channel' import { videoCommentRouter } from './comment' import { rateVideoRouter } from './rate' +import { User } from '../../../../shared/models/users' +import { VideoFilter } from '../../../../shared/models/videos/video-query.type' +import { VideoSortField } from '../../../../client/src/app/shared/video/sort-field.type' const videosRouter = express.Router() -const reqVideoFile = createReqFiles('videofile', CONFIG.STORAGE.VIDEOS_DIR, VIDEO_MIMETYPE_EXT) +const reqVideoFileAdd = createReqFiles( + [ 'videofile', 'thumbnailfile', 'previewfile' ], + Object.assign({}, VIDEO_MIMETYPE_EXT, IMAGE_MIMETYPE_EXT), + { + videofile: CONFIG.STORAGE.VIDEOS_DIR, + thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, + previewfile: CONFIG.STORAGE.PREVIEWS_DIR + } +) +const reqVideoFileUpdate = createReqFiles( + [ 'thumbnailfile', 'previewfile' ], + IMAGE_MIMETYPE_EXT, + { + thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, + previewfile: CONFIG.STORAGE.PREVIEWS_DIR + } +) videosRouter.use('/', abuseVideoRouter) videosRouter.use('/', blacklistRouter) @@ -46,6 +89,7 @@ videosRouter.get('/', videosSortValidator, setDefaultSort, setDefaultPagination, + optionalAuthenticate, asyncMiddleware(listVideos) ) videosRouter.get('/search', @@ -54,16 +98,18 @@ videosRouter.get('/search', videosSortValidator, setDefaultSort, setDefaultPagination, + optionalAuthenticate, asyncMiddleware(searchVideos) ) videosRouter.put('/:id', authenticate, + reqVideoFileUpdate, asyncMiddleware(videosUpdateValidator), asyncMiddleware(updateVideoRetryWrapper) ) videosRouter.post('/upload', authenticate, - reqVideoFile, + reqVideoFileAdd, asyncMiddleware(videosAddValidator), asyncMiddleware(addVideoRetryWrapper) ) @@ -143,6 +189,7 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi commentsEnabled: videoInfo.commentsEnabled, nsfw: videoInfo.nsfw, description: videoInfo.description, + support: videoInfo.support, privacy: videoInfo.privacy, duration: videoPhysicalFile['duration'], // duration was added by a previous middleware channelId: res.locals.videoChannel.id @@ -150,43 +197,44 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi const video = new VideoModel(videoData) video.url = getVideoActivityPubUrl(video) - const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename) - const videoFileHeight = await getVideoFileHeight(videoFilePath) + const { videoFileResolution } = await getVideoFileResolution(videoPhysicalFile.path) const videoFileData = { extname: extname(videoPhysicalFile.filename), - resolution: videoFileHeight, + resolution: videoFileResolution, size: videoPhysicalFile.size } const videoFile = new VideoFileModel(videoFileData) const videoDir = CONFIG.STORAGE.VIDEOS_DIR - const source = join(videoDir, videoPhysicalFile.filename) const destination = join(videoDir, video.getVideoFilename(videoFile)) - await renamePromise(source, destination) + await renamePromise(videoPhysicalFile.path, destination) // This is important in case if there is another attempt in the retry process videoPhysicalFile.filename = video.getVideoFilename(videoFile) + videoPhysicalFile.path = destination - const tasks = [] - - tasks.push( - video.createTorrentAndSetInfoHash(videoFile), - video.createThumbnail(videoFile), - video.createPreview(videoFile) - ) - await Promise.all(tasks) + // 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) + } - return sequelizeTypescript.transaction(async t => { - const sequelizeOptions = { transaction: t } + // 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) + } - if (CONFIG.TRANSCODING.ENABLED === true) { - // Put uuid because we don't have id auto incremented for now - const dataInput = { - videoUUID: video.uuid - } + await video.createTorrentAndSetInfoHash(videoFile) - await transcodingJobScheduler.createJob(t, 'videoFileOptimizer', dataInput) - } + const videoCreated = await sequelizeTypescript.transaction(async t => { + const sequelizeOptions = { transaction: t } const videoCreated = await video.save(sequelizeOptions) // Do not forget to add video channel information to the created video @@ -216,6 +264,17 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi return videoCreated }) + + if (CONFIG.TRANSCODING.ENABLED === true) { + // Put uuid because we don't have id auto incremented for now + const dataInput = { + videoUUID: videoCreated.uuid + } + + await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput }) + } + + return videoCreated } async function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { @@ -235,6 +294,18 @@ async function updateVideo (req: express.Request, res: express.Response) { const videoInfoToUpdate: VideoUpdate = req.body const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE + // 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) + } + + // 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) + } + try { await sequelizeTypescript.transaction(async t => { const sequelizeOptions = { @@ -246,9 +317,17 @@ async function updateVideo (req: express.Request, res: express.Response) { if (videoInfoToUpdate.licence !== undefined) videoInstance.set('licence', videoInfoToUpdate.licence) if (videoInfoToUpdate.language !== undefined) videoInstance.set('language', videoInfoToUpdate.language) if (videoInfoToUpdate.nsfw !== undefined) videoInstance.set('nsfw', videoInfoToUpdate.nsfw) - if (videoInfoToUpdate.privacy !== undefined) videoInstance.set('privacy', parseInt(videoInfoToUpdate.privacy.toString(), 10)) + if (videoInfoToUpdate.support !== undefined) videoInstance.set('support', videoInfoToUpdate.support) if (videoInfoToUpdate.description !== undefined) videoInstance.set('description', videoInfoToUpdate.description) if (videoInfoToUpdate.commentsEnabled !== undefined) videoInstance.set('commentsEnabled', videoInfoToUpdate.commentsEnabled) + if (videoInfoToUpdate.privacy !== undefined) { + const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10) + videoInstance.set('privacy', newPrivacy) + + if (wasPrivateVideo === true && newPrivacy !== VideoPrivacy.PRIVATE) { + videoInstance.set('publishedAt', new Date()) + } + } const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) @@ -291,14 +370,19 @@ function getVideo (req: express.Request, res: express.Response) { async function viewVideo (req: express.Request, res: express.Response) { const videoInstance = res.locals.video + const ip = req.ip + const exists = await Redis.Instance.isViewExists(ip, videoInstance.uuid) + if (exists) { + logger.debug('View for ip %s and video %s already exists.', ip, videoInstance.uuid) + return res.status(204).end() + } + await videoInstance.increment('views') + await Redis.Instance.setView(ip, videoInstance.uuid) + const serverAccount = await getServerActor() - if (videoInstance.isOwned()) { - await sendCreateViewToVideoFollowers(serverAccount, videoInstance, undefined) - } else { - await sendCreateViewToOrigin(serverAccount, videoInstance, undefined) - } + await sendCreateView(serverAccount, videoInstance, undefined) return res.status(204).end() } @@ -317,7 +401,13 @@ async function getVideoDescription (req: express.Request, res: express.Response) } async function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - const resultList = await VideoModel.listForApi(req.query.start, req.query.count, req.query.sort) + const resultList = await VideoModel.listForApi( + req.query.start as number, + req.query.count as number, + req.query.sort as VideoSortField, + isNSFWHidden(res), + req.query.filter as VideoFilter + ) return res.json(getFormattedObjects(resultList.data, resultList.total)) } @@ -344,12 +434,22 @@ async function removeVideo (req: express.Request, res: express.Response) { } async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - const resultList = await VideoModel.searchAndPopulateAccountAndServerAndTags( - req.query.search, - req.query.start, - req.query.count, - req.query.sort + const resultList = await VideoModel.searchAndPopulateAccountAndServer( + req.query.search as string, + req.query.start as number, + req.query.count as number, + req.query.sort as VideoSortField, + isNSFWHidden(res) ) return res.json(getFormattedObjects(resultList.data, resultList.total)) } + +function isNSFWHidden (res: express.Response) { + if (res.locals.oauth) { + const user: User = res.locals.oauth.token.User + if (user) return user.nsfwPolicy === 'do_not_list' + } + + return CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list' +}