X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=b4cd67158100a18f0cb946014ff6988397807d87;hb=66dc59076413b9a4aa0899d3192b0bdf03ee654d;hp=f639df098ae4768168372a6268af8e86cc090f4f;hpb=0aef76c479bc7fc758e70e1cd478ade46761b51b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index f639df098..b4cd67158 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -1,123 +1,126 @@ import * as express from 'express' -import * as Promise from 'bluebird' -import * as multer from 'multer' import { extname, join } from 'path' - -import { database as db } from '../../../initializers/database' +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, - REQUEST_VIDEO_QADU_TYPES, - REQUEST_VIDEO_EVENT_TYPES, + IMAGE_MIMETYPE_EXT, + PREVIEWS_SIZE, + sequelizeTypescript, + THUMBNAILS_SIZE, VIDEO_CATEGORIES, + VIDEO_LANGUAGES, VIDEO_LICENCES, - VIDEO_LANGUAGES + VIDEO_MIMETYPE_EXT, + VIDEO_PRIVACIES } from '../../../initializers' +import { 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 { - addEventToRemoteVideo, - quickAndDirtyUpdateVideoToFriends, - addVideoToFriends, - updateVideoToFriends, - JobScheduler -} from '../../../lib' -import { + asyncMiddleware, authenticate, paginationValidator, - videosSortValidator, - setVideosSort, - setPagination, - setVideosSearch, - videosUpdateValidator, - videosSearchValidator, + setDefaultPagination, + setDefaultSort, videosAddValidator, videosGetValidator, - videosRemoveValidator + videosRemoveValidator, + videosSearchValidator, + videosSortValidator, + videosUpdateValidator } from '../../../middlewares' -import { - logger, - retryTransactionWrapper, - generateRandomString, - getFormattedObjects, - renamePromise -} from '../../../helpers' -import { TagInstance } from '../../../models' -import { VideoCreate, VideoUpdate } from '../../../../shared' - +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' const videosRouter = express.Router() -// multer configuration -const storage = multer.diskStorage({ - destination: (req, file, cb) => { - cb(null, CONFIG.STORAGE.VIDEOS_DIR) - }, - - 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) - .then(randomString => { - const filename = randomString - cb(null, filename + '.' + extension) - }) - .catch(err => { - logger.error('Cannot generate random string for file name.', err) - throw err - }) +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('/languages', listVideoLanguages) +videosRouter.get('/privacies', listVideoPrivacies) videosRouter.get('/', paginationValidator, videosSortValidator, - setVideosSort, - setPagination, - listVideos + setDefaultSort, + setDefaultPagination, + asyncMiddleware(listVideos) +) +videosRouter.get('/search', + videosSearchValidator, + paginationValidator, + videosSortValidator, + setDefaultSort, + setDefaultPagination, + asyncMiddleware(searchVideos) ) videosRouter.put('/:id', authenticate, - videosUpdateValidator, - updateVideoRetryWrapper + reqVideoFileUpdate, + asyncMiddleware(videosUpdateValidator), + asyncMiddleware(updateVideoRetryWrapper) ) -videosRouter.post('/', +videosRouter.post('/upload', authenticate, - reqFiles, - videosAddValidator, - addVideoRetryWrapper + reqVideoFileAdd, + asyncMiddleware(videosAddValidator), + asyncMiddleware(addVideoRetryWrapper) +) + +videosRouter.get('/:id/description', + asyncMiddleware(videosGetValidator), + asyncMiddleware(getVideoDescription) ) videosRouter.get('/:id', - videosGetValidator, + asyncMiddleware(videosGetValidator), getVideo ) +videosRouter.post('/:id/views', + asyncMiddleware(videosGetValidator), + asyncMiddleware(viewVideo) +) videosRouter.delete('/:id', authenticate, - videosRemoveValidator, - removeVideo -) - -videosRouter.get('/search/:value', - videosSearchValidator, - paginationValidator, - videosSortValidator, - setVideosSort, - setPagination, - setVideosSearch, - searchVideos + asyncMiddleware(videosRemoveValidator), + asyncMiddleware(removeVideoRetryWrapper) ) // --------------------------------------------------------------------------- @@ -128,286 +131,299 @@ 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) } +function listVideoPrivacies (req: express.Request, res: express.Response) { + res.json(VIDEO_PRIVACIES) +} + // Wrapper to video add that retry the function if there is a database error // 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) { +async 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) - .then(() => { - // TODO : include Location of the new video -> 201 - res.type('json').status(204).end() - }) - .catch(err => next(err)) + const video = await retryTransactionWrapper(addVideo, options) + + res.json({ + video: { + id: video.id, + uuid: video.uuid + } + }).end() } -function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) { - const videoInfos: VideoCreate = req.body - - return db.sequelize.transaction(t => { - const user = res.locals.oauth.token.User - - const name = user.username - // null because it is OUR pod - const podId = null - const userId = user.id - - return db.Author.findOrCreateAuthor(name, podId, userId, t) - .then(author => { - const tags = videoInfos.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, - remote: false, - extname: extname(videoPhysicalFile.filename), - category: videoInfos.category, - licence: videoInfos.licence, - language: videoInfos.language, - nsfw: videoInfos.nsfw, - description: videoInfos.description, - duration: videoPhysicalFile['duration'], // duration was added by a previous middleware - authorId: author.id - } +async function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) { + const videoInfo: VideoCreate = req.body + + // 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 video = db.Video.build(videoData) - return { author, tagInstances, video } - }) - .then(({ author, tagInstances, video }) => { - const videoFileData = { - extname: extname(videoPhysicalFile.filename), - resolution: 0, // TODO: improve readability, - size: videoPhysicalFile.size - } + const { videoFileResolution } = await getVideoFileResolution(videoPhysicalFile.path) - const videoFile = db.VideoFile.build(videoFileData) - return { author, tagInstances, video, videoFile } - }) - .then(({ author, 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 { author, tagInstances, video, videoFile } - }) - }) - .then(({ author, 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, 'videoTranscoder', dataInput) - ) - } + 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) + } - return Promise.all(tasks).then(() => ({ author, tagInstances, video, videoFile })) - }) - .then(({ author, tagInstances, video, videoFile }) => { - const options = { transaction: t } - - return video.save(options) - .then(videoCreated => { - // Do not forget to add Author informations to the created video - videoCreated.Author = author - - return { tagInstances, video: videoCreated, videoFile } - }) - }) - .then(({ tagInstances, video, videoFile }) => { - const options = { transaction: t } - videoFile.videoId = video.id - - return videoFile.save(options) - .then(() => video.VideoFiles = [ videoFile ]) - .then(() => ({ tagInstances, video })) - }) - .then(({ tagInstances, video }) => { - if (!tagInstances) return video - - 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 videofile 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 created.', videoInfos.name)) - .catch((err: Error) => { - logger.debug('Cannot insert the video.', err) - throw err + // 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) + } + + 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 + + videoFile.videoId = video.id + await videoFile.save(sequelizeOptions) + + video.VideoFiles = [ videoFile ] + + if (videoInfo.tags) { + const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t) + + 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 videoCreated + // Don't send video to remote servers, it is private + if (video.privacy === VideoPrivacy.PRIVATE) return videoCreated + + await sendCreateVideo(video, t) + await shareVideoByServerAndChannel(video, t) + + logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid) + + 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 } -function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { +async function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { const options = { arguments: [ req, res ], errorMessage: 'Cannot update the video with many retries.' } - retryTransactionWrapper(updateVideo, options) - .then(() => { - // TODO : include Location of the new video -> 201 - return res.type('json').status(204).end() - }) - .catch(err => next(err)) + await retryTransactionWrapper(updateVideo, options) + + return res.type('json').status(204).end() } -function updateVideo (req: express.Request, res: express.Response) { - const videoInstance = res.locals.video +async function updateVideo (req: express.Request, res: express.Response) { + const videoInstance: VideoModel = res.locals.video const videoFieldsSave = videoInstance.toJSON() - const videoInfosToUpdate: VideoUpdate = req.body - - return db.sequelize.transaction(t => { - let tagsPromise: Promise - if (!videoInfosToUpdate.tags) { - tagsPromise = Promise.resolve(null) - } else { - tagsPromise = db.Tag.findOrCreateTags(videoInfosToUpdate.tags, t) - } + const videoInfoToUpdate: VideoUpdate = req.body + const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE - return tagsPromise - .then(tagInstances => { - const options = { - transaction: t + // 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 = { + transaction: t + } + + 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.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()) } + } - 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) - - return videoInstance.save(options).then(() => tagInstances) - }) - .then(tagInstances => { - if (!tagInstances) return - - const options = { transaction: t } - return videoInstance.setTags(tagInstances, options) - .then(() => { - videoInstance.Tags = tagInstances - - return - }) - }) - .then(() => { - const json = videoInstance.toUpdateRemoteJSON() - - // Now we'll update the video's meta data to our friends - return updateVideoToFriends(json, t) - }) - }) - .then(() => { - logger.info('Video with name %s updated.', videoInstance.name) - }) - .catch(err => { - logger.debug('Cannot update the video.', err) + const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) + + if (videoInfoToUpdate.tags) { + const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t) + 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 sendUpdateVideo(videoInstanceUpdated, t) + } + + // Video is not private anymore, send a create action to remote servers + if (wasPrivateVideo === true && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE) { + await sendCreateVideo(videoInstanceUpdated, t) + await shareVideoByServerAndChannel(videoInstanceUpdated, t) + } + }) + + logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) + } catch (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) - }) + resetSequelizeInstance(videoInstance, videoFieldsSave) 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 + 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() + } + + 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) { + const videoInstance = res.locals.video + let description = '' + if (videoInstance.isOwned()) { - // The increment is done directly in the database, not using the instance value - 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)) + description = videoInstance.description } else { - // Just send the event to our friends - const eventParams = { - videoId: videoInstance.id, - type: REQUEST_VIDEO_EVENT_TYPES.VIEWS - } - addEventToRemoteVideo(eventParams) + description = await fetchRemoteVideoDescription(videoInstance) } - // Do not wait the view system - res.json(videoInstance.toFormattedJSON()) + return res.json({ description }) } -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(getFormattedObjects(result.data, result.total))) - .catch(err => next(err)) +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, req.query.filter) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) } -function removeVideo (req: express.Request, res: express.Response, next: express.NextFunction) { - const videoInstance = res.locals.video +async 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() - .then(() => res.type('json').status(204).end()) - .catch(err => { - logger.error('Errors when removed the video.', err) - return next(err) - }) + await retryTransactionWrapper(removeVideo, options) + + return res.type('json').status(204).end() } -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(getFormattedObjects(result.data, result.total))) - .catch(err => next(err)) +async function removeVideo (req: express.Request, res: express.Response) { + const videoInstance: VideoModel = res.locals.video + + await sequelizeTypescript.transaction(async t => { + await videoInstance.destroy({ transaction: t }) + }) + + logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid) +} + +async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { + const resultList = await VideoModel.searchAndPopulateAccountAndServer( + req.query.search, + req.query.start, + req.query.count, + req.query.sort + ) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) }