X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=ec855ee8e12597a27707f508f9531d600d0cb24d;hb=72c7248b6fdcdb2175e726ff51b42e7555f2bd84;hp=5e8cf2d2546398119779a9ebd65842f9f3acfaeb;hpb=c3d19a49070aedb0e9accedf46465196b677406e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 5e8cf2d25..ec855ee8e 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -1,9 +1,7 @@ import * as express from 'express' -import * as Sequelize from 'sequelize' -import * as fs from 'fs' +import * as Promise from 'bluebird' import * as multer from 'multer' -import * as path from 'path' -import { waterfall } from 'async' +import { extname, join } from 'path' import { database as db } from '../../../initializers/database' import { @@ -18,7 +16,8 @@ import { addEventToRemoteVideo, quickAndDirtyUpdateVideoToFriends, addVideoToFriends, - updateVideoToFriends + updateVideoToFriends, + JobScheduler } from '../../../lib' import { authenticate, @@ -35,35 +34,41 @@ import { } from '../../../middlewares' import { logger, - commitTransaction, retryTransactionWrapper, - rollbackTransaction, - startSerializableTransaction, generateRandomString, - getFormatedObjects + getFormattedObjects, + renamePromise, + getVideoFileHeight } from '../../../helpers' +import { TagInstance, VideoInstance } from '../../../models' +import { VideoCreate, VideoUpdate } from '../../../../shared' import { abuseVideoRouter } from './abuse' import { blacklistRouter } from './blacklist' import { rateVideoRouter } from './rate' +import { videoChannelRouter } from './channel' const videosRouter = express.Router() // multer configuration const storage = multer.diskStorage({ - destination: function (req, file, cb) { + destination: (req, file, cb) => { cb(null, CONFIG.STORAGE.VIDEOS_DIR) }, - filename: function (req, file, cb) { + filename: (req, file, cb) => { let extension = '' if (file.mimetype === 'video/webm') extension = 'webm' else if (file.mimetype === 'video/mp4') extension = 'mp4' else if (file.mimetype === 'video/ogg') extension = 'ogv' - generateRandomString(16, function (err, randomString) { - const fieldname = err ? undefined : randomString - cb(null, fieldname + '.' + extension) - }) + generateRandomString(16) + .then(randomString => { + cb(null, randomString + '.' + extension) + }) + .catch(err => { + logger.error('Cannot generate random string for file name.', err) + throw err + }) } }) @@ -72,6 +77,7 @@ const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCo videosRouter.use('/', abuseVideoRouter) videosRouter.use('/', blacklistRouter) videosRouter.use('/', rateVideoRouter) +videosRouter.use('/', videoChannelRouter) videosRouter.get('/categories', listVideoCategories) videosRouter.get('/licences', listVideoLicences) @@ -89,7 +95,7 @@ videosRouter.put('/:id', videosUpdateValidator, updateVideoRetryWrapper ) -videosRouter.post('/', +videosRouter.post('/upload', authenticate, reqFiles, videosAddValidator, @@ -103,7 +109,7 @@ videosRouter.get('/:id', videosRouter.delete('/:id', authenticate, videosRemoveValidator, - removeVideo + removeVideoRetryWrapper ) videosRouter.get('/search/:value', @@ -124,15 +130,15 @@ export { // --------------------------------------------------------------------------- -function listVideoCategories (req: express.Request, res: express.Response, next: express.NextFunction) { +function listVideoCategories (req: express.Request, res: express.Response) { res.json(VIDEO_CATEGORIES) } -function listVideoLicences (req: express.Request, res: express.Response, next: express.NextFunction) { +function listVideoLicences (req: express.Request, res: express.Response) { res.json(VIDEO_LICENCES) } -function listVideoLanguages (req: express.Request, res: express.Response, next: express.NextFunction) { +function listVideoLanguages (req: express.Request, res: express.Response) { res.json(VIDEO_LANGUAGES) } @@ -140,129 +146,140 @@ function listVideoLanguages (req: express.Request, res: express.Response, next: // We need this because we run the transaction in SERIALIZABLE isolation that can fail function addVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { const options = { - arguments: [ req, res, req.files.videofile[0] ], + arguments: [ req, res, req.files['videofile'][0] ], errorMessage: 'Cannot insert the video with many retries.' } - retryTransactionWrapper(addVideo, options, function (err) { - if (err) return next(err) - - // TODO : include Location of the new video -> 201 - return res.type('json').status(204).end() - }) + retryTransactionWrapper(addVideo, options) + .then(() => { + // TODO : include Location of the new video -> 201 + res.type('json').status(204).end() + }) + .catch(err => next(err)) } -function addVideo (req: express.Request, res: express.Response, videoFile: Express.Multer.File, finalCallback: (err: Error) => void) { - const videoInfos = req.body - - waterfall([ - - startSerializableTransaction, - - function findOrCreateAuthor (t, callback) { - const user = res.locals.oauth.token.User - - const name = user.username - // null because it is OUR pod - const podId = null - const userId = user.id - - db.Author.findOrCreateAuthor(name, podId, userId, t, function (err, authorInstance) { - return callback(err, t, authorInstance) +function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) { + const videoInfo: VideoCreate = req.body + let videoUUID = '' + + return db.sequelize.transaction(t => { + let p: Promise + + if (!videoInfo.tags) p = Promise.resolve(undefined) + else p = db.Tag.findOrCreateTags(videoInfo.tags, t) + + return p + .then(tagInstances => { + 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, + duration: videoPhysicalFile['duration'], // duration was added by a previous middleware + channelId: res.locals.videoChannel.id + } + + const video = db.Video.build(videoData) + return { tagInstances, video } }) - }, - - function findOrCreateTags (t, author, callback) { - const tags = videoInfos.tags - - db.Tag.findOrCreateTags(tags, t, function (err, tagInstances) { - return callback(err, t, author, tagInstances) + .then(({ tagInstances, video }) => { + const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename) + return getVideoFileHeight(videoFilePath) + .then(height => ({ tagInstances, video, videoFileHeight: height })) }) - }, - - function createVideoObject (t, author, tagInstances, callback) { - const videoData = { - name: videoInfos.name, - remoteId: null, - extname: path.extname(videoFile.filename), - category: videoInfos.category, - licence: videoInfos.licence, - language: videoInfos.language, - nsfw: videoInfos.nsfw, - description: videoInfos.description, - duration: videoFile['duration'], // duration was added by a previous middleware - authorId: author.id - } - - const video = db.Video.build(videoData) - - return callback(null, t, author, tagInstances, video) - }, - - // Set the videoname the same as the id - function renameVideoFile (t, author, tagInstances, video, callback) { - const videoDir = CONFIG.STORAGE.VIDEOS_DIR - const source = path.join(videoDir, videoFile.filename) - const destination = path.join(videoDir, video.getVideoFilename()) - - fs.rename(source, destination, function (err) { - if (err) return callback(err) - - // This is important in case if there is another attempt - videoFile.filename = video.getVideoFilename() - return callback(null, t, author, tagInstances, video) + .then(({ tagInstances, video, videoFileHeight }) => { + const videoFileData = { + extname: extname(videoPhysicalFile.filename), + resolution: videoFileHeight, + size: videoPhysicalFile.size + } + + const videoFile = db.VideoFile.build(videoFileData) + return { tagInstances, video, videoFile } }) - }, - - function insertVideoIntoDB (t, author, tagInstances, video, callback) { - const options = { transaction: t } - - // Add tags association - video.save(options).asCallback(function (err, videoCreated) { - if (err) return callback(err) - - // Do not forget to add Author informations to the created video - videoCreated.Author = author - - return callback(err, t, tagInstances, videoCreated) + .then(({ tagInstances, video, videoFile }) => { + const videoDir = CONFIG.STORAGE.VIDEOS_DIR + const source = join(videoDir, videoPhysicalFile.filename) + const destination = join(videoDir, video.getVideoFilename(videoFile)) + + return renamePromise(source, destination) + .then(() => { + // This is important in case if there is another attempt in the retry process + videoPhysicalFile.filename = video.getVideoFilename(videoFile) + return { tagInstances, video, videoFile } + }) }) - }, - - function associateTagsToVideo (t, tagInstances, video, callback) { - const options = { transaction: t } - - video.setTags(tagInstances, options).asCallback(function (err) { - video.Tags = tagInstances - - return callback(err, t, video) + .then(({ tagInstances, video, 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 + } + + tasks.push( + JobScheduler.Instance.createJob(t, 'videoFileOptimizer', dataInput) + ) + } + + return Promise.all(tasks).then(() => ({ tagInstances, video, videoFile })) }) - }, - - function sendToFriends (t, video, callback) { - // Let transcoding job send the video to friends because the videofile extension might change - if (CONFIG.TRANSCODING.ENABLED === true) return callback(null, t) + .then(({ tagInstances, video, videoFile }) => { + const options = { transaction: t } - video.toAddRemoteJSON(function (err, remoteVideo) { - if (err) return callback(err) + return video.save(options) + .then(videoCreated => { + // Do not forget to add video channel information to the created video + videoCreated.VideoChannel = res.locals.videoChannel + videoUUID = videoCreated.uuid - // Now we'll add the video's meta data to our friends - addVideoToFriends(remoteVideo, t, function (err) { - return callback(err, t) - }) + return { tagInstances, video: videoCreated, videoFile } + }) }) - }, - - commitTransaction + .then(({ tagInstances, video, videoFile }) => { + const options = { transaction: t } + videoFile.videoId = video.id - ], function andFinally (err: Error, t: Sequelize.Transaction) { - if (err) { - // This is just a debug because we will retry the insert - logger.debug('Cannot insert the video.', { error: err }) - return rollbackTransaction(err, t, finalCallback) - } + return videoFile.save(options) + .then(() => video.VideoFiles = [ videoFile ]) + .then(() => ({ tagInstances, video })) + }) + .then(({ tagInstances, video }) => { + if (!tagInstances) return video - logger.info('Video with name %s created.', videoInfos.name) - return finalCallback(null) + const options = { transaction: t } + return video.setTags(tagInstances, options) + .then(() => { + video.Tags = tagInstances + return video + }) + }) + .then(video => { + // Let transcoding job send the video to friends because the video file extension might change + if (CONFIG.TRANSCODING.ENABLED === true) return undefined + + return video.toAddRemoteJSON() + .then(remoteVideo => { + // Now we'll add the video's meta data to our friends + return addVideoToFriends(remoteVideo, t) + }) + }) + }) + .then(() => logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoUUID)) + .catch((err: Error) => { + logger.debug('Cannot insert the video.', err) + throw err }) } @@ -272,114 +289,93 @@ function updateVideoRetryWrapper (req: express.Request, res: express.Response, n errorMessage: 'Cannot update the video with many retries.' } - retryTransactionWrapper(updateVideo, options, function (err) { - if (err) return next(err) - - // TODO : include Location of the new video -> 201 - return res.type('json').status(204).end() - }) + retryTransactionWrapper(updateVideo, options) + .then(() => { + return res.type('json').status(204).end() + }) + .catch(err => next(err)) } -function updateVideo (req: express.Request, res: express.Response, finalCallback: (err: Error) => void) { +function updateVideo (req: express.Request, res: express.Response) { const videoInstance = res.locals.video const videoFieldsSave = videoInstance.toJSON() - const videoInfosToUpdate = req.body - - waterfall([ - - startSerializableTransaction, - - function findOrCreateTags (t, callback) { - if (videoInfosToUpdate.tags) { - db.Tag.findOrCreateTags(videoInfosToUpdate.tags, t, function (err, tagInstances) { - return callback(err, t, tagInstances) - }) - } else { - return callback(null, t, null) - } - }, - - function updateVideoIntoDB (t, tagInstances, callback) { - const options = { - transaction: t - } - - if (videoInfosToUpdate.name !== undefined) videoInstance.set('name', videoInfosToUpdate.name) - if (videoInfosToUpdate.category !== undefined) videoInstance.set('category', videoInfosToUpdate.category) - if (videoInfosToUpdate.licence !== undefined) videoInstance.set('licence', videoInfosToUpdate.licence) - if (videoInfosToUpdate.language !== undefined) videoInstance.set('language', videoInfosToUpdate.language) - if (videoInfosToUpdate.nsfw !== undefined) videoInstance.set('nsfw', videoInfosToUpdate.nsfw) - if (videoInfosToUpdate.description !== undefined) videoInstance.set('description', videoInfosToUpdate.description) - - videoInstance.save(options).asCallback(function (err) { - return callback(err, t, tagInstances) - }) - }, - - function associateTagsToVideo (t, tagInstances, callback) { - if (tagInstances) { - const options = { transaction: t } - - videoInstance.setTags(tagInstances, options).asCallback(function (err) { - videoInstance.Tags = tagInstances + const videoInfoToUpdate: VideoUpdate = req.body + + return db.sequelize.transaction(t => { + let tagsPromise: Promise + if (!videoInfoToUpdate.tags) { + tagsPromise = Promise.resolve(null) + } else { + tagsPromise = db.Tag.findOrCreateTags(videoInfoToUpdate.tags, t) + } - return callback(err, t) - }) - } else { - return callback(null, t) - } - }, + return tagsPromise + .then(tagInstances => { + const options = { + transaction: t + } - function sendToFriends (t, callback) { - const json = videoInstance.toUpdateRemoteJSON() + if (videoInfoToUpdate.name !== undefined) videoInstance.set('name', videoInfoToUpdate.name) + if (videoInfoToUpdate.category !== undefined) videoInstance.set('category', videoInfoToUpdate.category) + 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.description !== undefined) videoInstance.set('description', videoInfoToUpdate.description) - // Now we'll update the video's meta data to our friends - updateVideoToFriends(json, t, function (err) { - return callback(err, t) + return videoInstance.save(options).then(() => tagInstances) }) - }, - - commitTransaction + .then(tagInstances => { + if (!tagInstances) return - ], function andFinally (err: Error, t: Sequelize.Transaction) { - if (err) { - logger.debug('Cannot update the video.', { error: err }) + const options = { transaction: t } + return videoInstance.setTags(tagInstances, options) + .then(() => { + videoInstance.Tags = tagInstances - // Force fields we want to update - // If the transaction is retried, sequelize will think the object has not changed - // So it will skip the SQL request, even if the last one was ROLLBACKed! - Object.keys(videoFieldsSave).forEach(function (key) { - const value = videoFieldsSave[key] - videoInstance.set(key, value) + return + }) }) + .then(() => { + const json = videoInstance.toUpdateRemoteJSON() - return rollbackTransaction(err, t, finalCallback) - } + // Now we'll update the video's meta data to our friends + return updateVideoToFriends(json, t) + }) + }) + .then(() => { + logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) + }) + .catch(err => { + logger.debug('Cannot update the video.', err) + + // Force fields we want to update + // If the transaction is retried, sequelize will think the object has not changed + // So it will skip the SQL request, even if the last one was ROLLBACKed! + Object.keys(videoFieldsSave).forEach(key => { + const value = videoFieldsSave[key] + videoInstance.set(key, value) + }) - logger.info('Video with name %s updated.', videoInstance.name) - return finalCallback(null) + throw err }) } -function getVideo (req: express.Request, res: express.Response, next: express.NextFunction) { +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 - videoInstance.increment('views').asCallback(function (err) { - if (err) { - logger.error('Cannot add view to video %d.', videoInstance.id) - return - } - - // FIXME: make a real view system - // For example, only add a view when a user watch a video during 30s etc - const qaduParams = { - videoId: videoInstance.id, - type: REQUEST_VIDEO_QADU_TYPES.VIEWS - } - quickAndDirtyUpdateVideoToFriends(qaduParams) - }) + videoInstance.increment('views') + .then(() => { + // FIXME: make a real view system + // For example, only add a view when a user watch a video during 30s etc + const qaduParams = { + videoId: videoInstance.id, + type: REQUEST_VIDEO_QADU_TYPES.VIEWS + } + return quickAndDirtyUpdateVideoToFriends(qaduParams) + }) + .catch(err => logger.error('Cannot add view to video %d.', videoInstance.id, err)) } else { // Just send the event to our friends const eventParams = { @@ -390,37 +386,45 @@ function getVideo (req: express.Request, res: express.Response, next: express.Ne } // Do not wait the view system - res.json(videoInstance.toFormatedJSON()) + res.json(videoInstance.toFormattedDetailsJSON()) } function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - db.Video.listForApi(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) { - if (err) return next(err) - - res.json(getFormatedObjects(videosList, videosTotal)) - }) + db.Video.listForApi(req.query.start, req.query.count, req.query.sort) + .then(result => res.json(getFormattedObjects(result.data, result.total))) + .catch(err => next(err)) } -function removeVideo (req: express.Request, res: express.Response, next: express.NextFunction) { - const videoInstance = res.locals.video +function removeVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { + const options = { + arguments: [ req, res ], + errorMessage: 'Cannot remove the video with many retries.' + } - videoInstance.destroy().asCallback(function (err) { - if (err) { - logger.error('Errors when removed the video.', { error: err }) - return next(err) - } + retryTransactionWrapper(removeVideo, options) + .then(() => { + return res.type('json').status(204).end() + }) + .catch(err => next(err)) +} - return res.type('json').status(204).end() +function removeVideo (req: express.Request, res: express.Response) { + const videoInstance: VideoInstance = res.locals.video + + return db.sequelize.transaction(t => { + return videoInstance.destroy({ transaction: t }) + }) + .then(() => { + logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid) + }) + .catch(err => { + logger.error('Errors when removed the video.', err) + throw err }) } function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - db.Video.searchAndPopulateAuthorAndPodAndTags( - req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort, - function (err, videosList, videosTotal) { - if (err) return next(err) - - res.json(getFormatedObjects(videosList, videosTotal)) - } - ) + db.Video.searchAndPopulateAuthorAndPodAndTags(req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort) + .then(result => res.json(getFormattedObjects(result.data, result.total))) + .catch(err => next(err)) }