X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=3a19fe989b303a448145d846e11291cc2e26dafd;hb=e95561cdf195d2926e1856ed285c2b86960bc86f;hp=d71a132ed05d40742d244ebdd3a1b249fd119914;hpb=93e1258c7cbc0d1235ca6d2a1f7c1875985328b8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index d71a132ed..3a19fe989 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -36,7 +36,7 @@ import { logger, retryTransactionWrapper, generateRandomString, - getFormatedObjects, + getFormattedObjects, renamePromise } from '../../../helpers' import { TagInstance } from '../../../models' @@ -61,8 +61,7 @@ const storage = multer.diskStorage({ else if (file.mimetype === 'video/ogg') extension = 'ogv' generateRandomString(16) .then(randomString => { - const filename = randomString - cb(null, filename + '.' + extension) + cb(null, randomString + '.' + extension) }) .catch(err => { logger.error('Cannot generate random string for file name.', err) @@ -93,7 +92,7 @@ videosRouter.put('/:id', videosUpdateValidator, updateVideoRetryWrapper ) -videosRouter.post('/', +videosRouter.post('/upload', authenticate, reqFiles, videosAddValidator, @@ -128,15 +127,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) } @@ -144,7 +143,7 @@ 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.' } @@ -157,7 +156,7 @@ function addVideoRetryWrapper (req: express.Request, res: express.Response, next } function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) { - const videoInfos: VideoCreate = req.body + const videoInfo: VideoCreate = req.body return db.sequelize.transaction(t => { const user = res.locals.oauth.token.User @@ -169,21 +168,21 @@ function addVideo (req: express.Request, res: express.Response, videoPhysicalFil return db.Author.findOrCreateAuthor(name, podId, userId, t) .then(author => { - const tags = videoInfos.tags + const tags = videoInfo.tags if (!tags) return { author, tagInstances: undefined } return db.Tag.findOrCreateTags(tags, t).then(tagInstances => ({ author, tagInstances })) }) .then(({ author, tagInstances }) => { const videoData = { - name: videoInfos.name, + name: videoInfo.name, remote: false, extname: extname(videoPhysicalFile.filename), - category: videoInfos.category, - licence: videoInfos.licence, - language: videoInfos.language, - nsfw: videoInfos.nsfw, - description: videoInfos.description, + 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 authorId: author.id } @@ -240,7 +239,7 @@ function addVideo (req: express.Request, res: express.Response, videoPhysicalFil return video.save(options) .then(videoCreated => { - // Do not forget to add Author informations to the created video + // Do not forget to add Author information to the created video videoCreated.Author = author return { tagInstances, video: videoCreated, videoFile } @@ -265,7 +264,7 @@ function addVideo (req: express.Request, res: express.Response, videoPhysicalFil }) }) .then(video => { - // Let transcoding job send the video to friends because the videofile extension might change + // 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() @@ -275,7 +274,7 @@ function addVideo (req: express.Request, res: express.Response, videoPhysicalFil }) }) }) - .then(() => logger.info('Video with name %s created.', videoInfos.name)) + .then(() => logger.info('Video with name %s created.', videoInfo.name)) .catch((err: Error) => { logger.debug('Cannot insert the video.', err) throw err @@ -299,14 +298,14 @@ function updateVideoRetryWrapper (req: express.Request, res: express.Response, n function updateVideo (req: express.Request, res: express.Response) { const videoInstance = res.locals.video const videoFieldsSave = videoInstance.toJSON() - const videoInfosToUpdate: VideoUpdate = req.body + const videoInfoToUpdate: VideoUpdate = req.body return db.sequelize.transaction(t => { let tagsPromise: Promise - if (!videoInfosToUpdate.tags) { + if (!videoInfoToUpdate.tags) { tagsPromise = Promise.resolve(null) } else { - tagsPromise = db.Tag.findOrCreateTags(videoInfosToUpdate.tags, t) + tagsPromise = db.Tag.findOrCreateTags(videoInfoToUpdate.tags, t) } return tagsPromise @@ -315,12 +314,12 @@ function updateVideo (req: express.Request, res: express.Response) { 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) + 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) return videoInstance.save(options).then(() => tagInstances) }) @@ -360,7 +359,7 @@ function updateVideo (req: express.Request, res: express.Response) { }) } -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()) { @@ -386,12 +385,12 @@ function getVideo (req: express.Request, res: express.Response, next: express.Ne } // Do not wait the view system - res.json(videoInstance.toFormatedJSON()) + res.json(videoInstance.toFormattedJSON()) } function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) { db.Video.listForApi(req.query.start, req.query.count, req.query.sort) - .then(result => res.json(getFormatedObjects(result.data, result.total))) + .then(result => res.json(getFormattedObjects(result.data, result.total))) .catch(err => next(err)) } @@ -408,6 +407,6 @@ function removeVideo (req: express.Request, res: express.Response, next: express 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) - .then(result => res.json(getFormatedObjects(result.data, result.total))) + .then(result => res.json(getFormattedObjects(result.data, result.total))) .catch(err => next(err)) }