import * as express from 'express'
-import * as multer from 'multer'
import { extname, join } from 'path'
import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared'
+import { renamePromise } from '../../../helpers/core-utils'
+import { retryTransactionWrapper } from '../../../helpers/database-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,
+ IMAGE_MIMETYPE_EXT,
+ PREVIEWS_SIZE,
+ sequelizeTypescript,
+ THUMBNAILS_SIZE,
+ VIDEO_CATEGORIES,
+ VIDEO_LANGUAGES,
+ VIDEO_LICENCES,
+ VIDEO_MIMETYPE_EXT,
+ VIDEO_PRIVACIES
+} from '../../../initializers'
import {
fetchRemoteVideoDescription,
- generateRandomString,
- getFormattedObjects,
- getVideoFileHeight,
- logger,
- renamePromise,
- resetSequelizeInstance,
- retryTransactionWrapper
-} from '../../../helpers'
-import { getActivityPubUrl } from '../../../helpers/activitypub'
-import { CONFIG, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers'
-import { database as db } from '../../../initializers/database'
-import { sendAddVideo, sendUpdateVideoChannel } from '../../../lib/activitypub/send-request'
-import { transcodingJobScheduler } from '../../../lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler'
+ 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,
- setPagination,
- setVideosSearch,
- setVideosSort,
+ setDefaultPagination,
+ setDefaultSort,
videosAddValidator,
videosGetValidator,
videosRemoveValidator,
videosSortValidator,
videosUpdateValidator
} from '../../../middlewares'
-import { VideoInstance } from '../../../models'
+import { TagModel } from '../../../models/video/tag'
+import { VideoModel } from '../../../models/video/video'
+import { VideoFileModel } from '../../../models/video/video-file'
import { abuseVideoRouter } from './abuse'
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()
-// multer configuration
-const storage = multer.diskStorage({
- destination: (req, file, cb) => {
- cb(null, CONFIG.STORAGE.VIDEOS_DIR)
- },
-
- filename: async (req, file, cb) => {
- const extension = VIDEO_MIMETYPE_EXT[file.mimetype]
- let randomString = ''
-
- try {
- randomString = await generateRandomString(16)
- } catch (err) {
- logger.error('Cannot generate random string for file name.', err)
- randomString = 'fake-random-string'
- }
-
- cb(null, randomString + '.' + extension)
+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 reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
+)
+const reqVideoFileUpdate = createReqFiles(
+ [ 'thumbnailfile', 'previewfile' ],
+ IMAGE_MIMETYPE_EXT,
+ {
+ thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR,
+ previewfile: CONFIG.STORAGE.PREVIEWS_DIR
+ }
+)
videosRouter.use('/', abuseVideoRouter)
videosRouter.use('/', blacklistRouter)
videosRouter.use('/', rateVideoRouter)
videosRouter.use('/', videoChannelRouter)
+videosRouter.use('/', videoCommentRouter)
videosRouter.get('/categories', listVideoCategories)
videosRouter.get('/licences', listVideoLicences)
videosRouter.get('/',
paginationValidator,
videosSortValidator,
- setVideosSort,
- setPagination,
+ setDefaultSort,
+ setDefaultPagination,
+ optionalAuthenticate,
asyncMiddleware(listVideos)
)
+videosRouter.get('/search',
+ videosSearchValidator,
+ paginationValidator,
+ videosSortValidator,
+ setDefaultSort,
+ setDefaultPagination,
+ optionalAuthenticate,
+ asyncMiddleware(searchVideos)
+)
videosRouter.put('/:id',
authenticate,
- videosUpdateValidator,
+ reqVideoFileUpdate,
+ asyncMiddleware(videosUpdateValidator),
asyncMiddleware(updateVideoRetryWrapper)
)
videosRouter.post('/upload',
authenticate,
- reqFiles,
- videosAddValidator,
+ reqVideoFileAdd,
+ asyncMiddleware(videosAddValidator),
asyncMiddleware(addVideoRetryWrapper)
)
videosRouter.get('/:id/description',
- videosGetValidator,
+ asyncMiddleware(videosGetValidator),
asyncMiddleware(getVideoDescription)
)
videosRouter.get('/:id',
- videosGetValidator,
+ asyncMiddleware(videosGetValidator),
getVideo
)
+videosRouter.post('/:id/views',
+ asyncMiddleware(videosGetValidator),
+ asyncMiddleware(viewVideo)
+)
videosRouter.delete('/:id',
authenticate,
- videosRemoveValidator,
+ asyncMiddleware(videosRemoveValidator),
asyncMiddleware(removeVideoRetryWrapper)
)
-videosRouter.get('/search/:value',
- videosSearchValidator,
- paginationValidator,
- videosSortValidator,
- setVideosSort,
- setPagination,
- setVideosSearch,
- asyncMiddleware(searchVideos)
-)
-
// ---------------------------------------------------------------------------
export {
errorMessage: 'Cannot insert the video with many retries.'
}
- await retryTransactionWrapper(addVideo, options)
+ const video = await retryTransactionWrapper(addVideo, options)
- // TODO : include Location of the new video -> 201
- res.type('json').status(204).end()
+ res.json({
+ video: {
+ id: video.id,
+ uuid: video.uuid
+ }
+ }).end()
}
async function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) {
const videoInfo: VideoCreate = req.body
- let videoUUID = ''
- await db.sequelize.transaction(async t => {
- const sequelizeOptions = { transaction: t }
+ // Prepare data so we don't block the transaction
+ const videoData = {
+ name: videoInfo.name,
+ remote: false,
+ extname: extname(videoPhysicalFile.filename),
+ category: videoInfo.category,
+ licence: videoInfo.licence,
+ language: videoInfo.language,
+ 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
+ }
+ const video = new VideoModel(videoData)
+ video.url = getVideoActivityPubUrl(video)
- const videoData = {
- name: videoInfo.name,
- remote: false,
- extname: extname(videoPhysicalFile.filename),
- category: videoInfo.category,
- licence: videoInfo.licence,
- language: videoInfo.language,
- nsfw: videoInfo.nsfw,
- description: videoInfo.description,
- privacy: videoInfo.privacy,
- duration: videoPhysicalFile['duration'], // duration was added by a previous middleware
- channelId: res.locals.videoChannel.id
- }
- const video = db.Video.build(videoData)
- video.url = getActivityPubUrl('video', video.uuid)
+ const { videoFileResolution } = await getVideoFileResolution(videoPhysicalFile.path)
- const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename)
- const videoFileHeight = await getVideoFileHeight(videoFilePath)
+ const videoFileData = {
+ extname: extname(videoPhysicalFile.filename),
+ resolution: videoFileResolution,
+ size: videoPhysicalFile.size
+ }
+ const videoFile = new VideoFileModel(videoFileData)
+ const videoDir = CONFIG.STORAGE.VIDEOS_DIR
+ const destination = join(videoDir, video.getVideoFilename(videoFile))
+
+ 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
+
+ // 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 videoFileData = {
- extname: extname(videoPhysicalFile.filename),
- resolution: videoFileHeight,
- size: videoPhysicalFile.size
- }
- const videoFile = db.VideoFile.build(videoFileData)
- const videoDir = CONFIG.STORAGE.VIDEOS_DIR
- const source = join(videoDir, videoPhysicalFile.filename)
- const destination = join(videoDir, video.getVideoFilename(videoFile))
-
- await renamePromise(source, destination)
- // This is important in case if there is another attempt in the retry process
- videoPhysicalFile.filename = video.getVideoFilename(videoFile)
-
- const tasks = []
-
- tasks.push(
- video.createTorrentAndSetInfoHash(videoFile),
- video.createThumbnail(videoFile),
- 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
- }
+ // 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)
+ }
- tasks.push(
- transcodingJobScheduler.createJob(t, 'videoFileOptimizer', dataInput)
- )
- }
- await Promise.all(tasks)
+ await video.createTorrentAndSetInfoHash(videoFile)
+
+ 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
videoCreated.VideoChannel = res.locals.videoChannel
- videoUUID = videoCreated.uuid
videoFile.videoId = video.id
-
await videoFile.save(sequelizeOptions)
- video.VideoFiles = [videoFile]
+
+ video.VideoFiles = [ videoFile ]
if (videoInfo.tags) {
- const tagInstances = await db.Tag.findOrCreateTags(videoInfo.tags, t)
+ const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t)
- await video.setTags(tagInstances, sequelizeOptions)
+ await video.$set('Tags', tagInstances, sequelizeOptions)
video.Tags = tagInstances
}
// Let transcoding job send the video to friends because the video file extension might change
- if (CONFIG.TRANSCODING.ENABLED === true) return undefined
+ if (CONFIG.TRANSCODING.ENABLED === true) return videoCreated
// Don't send video to remote servers, it is private
- if (video.privacy === VideoPrivacy.PRIVATE) return undefined
+ if (video.privacy === VideoPrivacy.PRIVATE) return videoCreated
- await sendAddVideo(video, t)
+ await sendCreateVideo(video, t)
+ await shareVideoByServerAndChannel(video, t)
+
+ logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid)
+
+ return videoCreated
})
- logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoUUID)
+ 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) {
}
async function updateVideo (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.video
+ const videoInstance: VideoModel = res.locals.video
const videoFieldsSave = videoInstance.toJSON()
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 db.sequelize.transaction(async t => {
+ await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = {
transaction: t
}
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', videoInfoToUpdate.privacy)
+ 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())
+ }
+ }
- await videoInstance.save(sequelizeOptions)
+ const videoInstanceUpdated = await videoInstance.save(sequelizeOptions)
if (videoInfoToUpdate.tags) {
- const tagInstances = await db.Tag.findOrCreateTags(videoInfoToUpdate.tags, t)
+ const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t)
- await videoInstance.setTags(tagInstances, sequelizeOptions)
+ await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
videoInstance.Tags = tagInstances
}
// Now we'll update the video's meta data to our friends
if (wasPrivateVideo === false) {
- await sendUpdateVideoChannel(videoInstance, t)
+ await sendUpdateVideo(videoInstanceUpdated, t)
}
// Video is not private anymore, send a create action to remote servers
- if (wasPrivateVideo === true && videoInstance.privacy !== VideoPrivacy.PRIVATE) {
- await sendAddVideo(videoInstance, t)
+ if (wasPrivateVideo === true && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE) {
+ await sendCreateVideo(videoInstanceUpdated, t)
+ await shareVideoByServerAndChannel(videoInstanceUpdated, t)
}
})
}
}
-async function getVideo (req: express.Request, res: express.Response) {
+function getVideo (req: express.Request, res: express.Response) {
const videoInstance = res.locals.video
- if (videoInstance.isOwned()) {
- // The increment is done directly in the database, not using the instance value
- // FIXME: make a real view system
- // For example, only add a view when a user watch a video during 30s etc
- videoInstance.increment('views')
- .then(() => {
- // TODO: send to followers a notification
- })
- .catch(err => logger.error('Cannot add view to video %s.', videoInstance.uuid, err))
- } else {
- // TODO: send view event to followers
+ return res.json(videoInstance.toFormattedDetailsJSON())
+}
+
+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()
}
- // Do not wait the view system
- return res.json(videoInstance.toFormattedDetailsJSON())
+ await videoInstance.increment('views')
+ await Redis.Instance.setView(ip, videoInstance.uuid)
+
+ const serverAccount = await getServerActor()
+
+ await sendCreateView(serverAccount, videoInstance, undefined)
+
+ return res.status(204).end()
}
async function getVideoDescription (req: express.Request, res: express.Response) {
}
async function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await db.Video.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))
}
}
async function removeVideo (req: express.Request, res: express.Response) {
- const videoInstance: VideoInstance = res.locals.video
+ const videoInstance: VideoModel = res.locals.video
- await db.sequelize.transaction(async t => {
+ await sequelizeTypescript.transaction(async t => {
await videoInstance.destroy({ transaction: t })
})
}
async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await db.Video.searchAndPopulateAccountAndServerAndTags(
- req.params.value,
- req.query.field,
- 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'
+}
projects / github / Chocobozzz / PeerTube.git / blobdiff