import * as express from 'express'
-import * as Promise from 'bluebird'
import * as multer from 'multer'
-import * as path from 'path'
+import { extname, join } from 'path'
import { database as db } from '../../../initializers/database'
import {
REQUEST_VIDEO_EVENT_TYPES,
VIDEO_CATEGORIES,
VIDEO_LICENCES,
- VIDEO_LANGUAGES
+ VIDEO_LANGUAGES,
+ VIDEO_PRIVACIES
} from '../../../initializers'
import {
addEventToRemoteVideo,
quickAndDirtyUpdateVideoToFriends,
addVideoToFriends,
- updateVideoToFriends
+ updateVideoToFriends,
+ JobScheduler,
+ fetchRemoteDescription
} from '../../../lib'
import {
authenticate,
videosSearchValidator,
videosAddValidator,
videosGetValidator,
- videosRemoveValidator
+ videosRemoveValidator,
+ asyncMiddleware
} from '../../../middlewares'
import {
logger,
retryTransactionWrapper,
generateRandomString,
- getFormatedObjects,
- renamePromise
+ getFormattedObjects,
+ renamePromise,
+ getVideoFileHeight,
+ resetSequelizeInstance
} from '../../../helpers'
-import { TagInstance } from '../../../models'
+import { VideoInstance } from '../../../models'
+import { VideoCreate, VideoUpdate, VideoPrivacy } 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)
.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)
videosRouter.use('/', abuseVideoRouter)
videosRouter.use('/', blacklistRouter)
videosRouter.use('/', rateVideoRouter)
+videosRouter.use('/', videoChannelRouter)
videosRouter.get('/categories', listVideoCategories)
videosRouter.get('/licences', listVideoLicences)
videosRouter.get('/languages', listVideoLanguages)
+videosRouter.get('/privacies', listVideoPrivacies)
videosRouter.get('/',
paginationValidator,
videosSortValidator,
setVideosSort,
setPagination,
- listVideos
+ asyncMiddleware(listVideos)
)
videosRouter.put('/:id',
authenticate,
videosUpdateValidator,
- updateVideoRetryWrapper
+ asyncMiddleware(updateVideoRetryWrapper)
)
-videosRouter.post('/',
+videosRouter.post('/upload',
authenticate,
reqFiles,
videosAddValidator,
- addVideoRetryWrapper
+ asyncMiddleware(addVideoRetryWrapper)
+)
+
+videosRouter.get('/:id/description',
+ videosGetValidator,
+ asyncMiddleware(getVideoDescription)
)
videosRouter.get('/:id',
videosGetValidator,
videosRouter.delete('/:id',
authenticate,
videosRemoveValidator,
- removeVideo
+ asyncMiddleware(removeVideoRetryWrapper)
)
videosRouter.get('/search/:value',
setVideosSort,
setPagination,
setVideosSearch,
- searchVideos
+ asyncMiddleware(searchVideos)
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-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))
+ await retryTransactionWrapper(addVideo, options)
+
+ // TODO : include Location of the new video -> 201
+ res.type('json').status(204).end()
}
-function addVideo (req: express.Request, res: express.Response, videoFile: Express.Multer.File) {
- const videoInfos = req.body
+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 }
+
+ 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)
- return db.sequelize.transaction(t => {
- const user = res.locals.oauth.token.User
+ const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename)
+ const videoFileHeight = await getVideoFileHeight(videoFilePath)
- const name = user.username
- // null because it is OUR pod
- const podId = null
- const userId = user.id
+ 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
+ }
+
+ tasks.push(
+ JobScheduler.Instance.createJob(t, 'videoFileOptimizer', dataInput)
+ )
+ }
+ await Promise.all(tasks)
- return db.Author.findOrCreateAuthor(name, podId, userId, t)
- .then(author => {
- const tags = videoInfos.tags
- if (!tags) return { author, tagInstances: undefined }
+ 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
- return db.Tag.findOrCreateTags(tags, t).then(tagInstances => ({ author, tagInstances }))
- })
- .then(({ author, tagInstances }) => {
- 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
- }
+ videoFile.videoId = video.id
- const video = db.Video.build(videoData)
- return { author, tagInstances, video }
- })
- .then(({ author, tagInstances, video }) => {
- const videoDir = CONFIG.STORAGE.VIDEOS_DIR
- const source = path.join(videoDir, videoFile.filename)
- const destination = path.join(videoDir, video.getVideoFilename())
-
- return renamePromise(source, destination)
- .then(() => {
- // This is important in case if there is another attempt in the retry process
- videoFile.filename = video.getVideoFilename()
- return { author, tagInstances, video }
- })
- })
- .then(({ author, tagInstances, video }) => {
- const options = { transaction: t }
+ await videoFile.save(sequelizeOptions)
+ video.VideoFiles = [videoFile]
- return video.save(options)
- .then(videoCreated => {
- // Do not forget to add Author informations to the created video
- videoCreated.Author = author
+ if (videoInfo.tags) {
+ const tagInstances = await db.Tag.findOrCreateTags(videoInfo.tags, t)
- return { tagInstances, video: videoCreated }
- })
- })
- .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.', { error: err.stack })
- throw err
+ await video.setTags(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
+ // Don't send video to remote pods, it is private
+ if (video.privacy === VideoPrivacy.PRIVATE) return undefined
+
+ const remoteVideo = await video.toAddRemoteJSON()
+ // Now we'll add the video's meta data to our friends
+ return addVideoToFriends(remoteVideo, t)
})
+
+ logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoUUID)
}
-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) {
+async function updateVideo (req: express.Request, res: express.Response) {
const videoInstance = res.locals.video
const videoFieldsSave = videoInstance.toJSON()
- const videoInfosToUpdate = req.body
-
- return db.sequelize.transaction(t => {
- let tagsPromise: Promise<TagInstance[]>
- if (!videoInfosToUpdate.tags) {
- tagsPromise = Promise.resolve(null)
- } else {
- tagsPromise = db.Tag.findOrCreateTags(videoInfosToUpdate.tags, t)
- }
-
- return tagsPromise
- .then(tagInstances => {
- 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)
-
- 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 videoInfoToUpdate: VideoUpdate = req.body
+ const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE
+
+ try {
+ await db.sequelize.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.privacy !== undefined) videoInstance.set('privacy', videoInfoToUpdate.privacy)
+ if (videoInfoToUpdate.description !== undefined) videoInstance.set('description', videoInfoToUpdate.description)
+
+ await videoInstance.save(sequelizeOptions)
+
+ if (videoInfoToUpdate.tags) {
+ const tagInstances = await db.Tag.findOrCreateTags(videoInfoToUpdate.tags, t)
+
+ await videoInstance.setTags(tagInstances, sequelizeOptions)
+ videoInstance.Tags = tagInstances
+ }
+
+ // Now we'll update the video's meta data to our friends
+ if (wasPrivateVideo === false) {
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)
+ }
+
+ // Video is not private anymore, send a create action to remote pods
+ if (wasPrivateVideo === true && videoInstance.privacy !== VideoPrivacy.PRIVATE) {
+ const remoteVideo = await videoInstance.toAddRemoteJSON()
+ return addVideoToFriends(remoteVideo, 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(function (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
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(() => {
- // 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))
+ .catch(err => logger.error('Cannot add view to video %s.', videoInstance.uuid, err))
} else {
// Just send the event to our friends
const eventParams = {
type: REQUEST_VIDEO_EVENT_TYPES.VIEWS
}
addEventToRemoteVideo(eventParams)
+ .catch(err => logger.error('Cannot add event to remote video %s.', videoInstance.uuid, err))
}
// Do not wait the view system
- res.json(videoInstance.toFormatedJSON())
+ return 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)
- .then(result => res.json(getFormatedObjects(result.data, result.total)))
- .catch(err => next(err))
+async function getVideoDescription (req: express.Request, res: express.Response) {
+ const videoInstance = res.locals.video
+ let description = ''
+
+ if (videoInstance.isOwned()) {
+ description = videoInstance.description
+ } else {
+ description = await fetchRemoteDescription(videoInstance)
+ }
+
+ return res.json({ description })
}
-function removeVideo (req: express.Request, res: express.Response, next: express.NextFunction) {
- const videoInstance = res.locals.video
+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)
- videoInstance.destroy()
- .then(() => res.type('json').status(204).end())
- .catch(err => {
- logger.error('Errors when removed the video.', err)
- return next(err)
- })
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+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.'
+ }
+
+ await retryTransactionWrapper(removeVideo, options)
+
+ return res.type('json').status(204).end()
+}
+
+async function removeVideo (req: express.Request, res: express.Response) {
+ const videoInstance: VideoInstance = res.locals.video
+
+ await db.sequelize.transaction(async t => {
+ await videoInstance.destroy({ transaction: t })
+ })
+
+ logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid)
}
-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)))
- .catch(err => next(err))
+async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const resultList = await db.Video.searchAndPopulateAuthorAndPodAndTags(
+ req.params.value,
+ req.query.field,
+ req.query.start,
+ req.query.count,
+ req.query.sort
+ )
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
}
projects / github / Chocobozzz / PeerTube.git / blobdiff