'use strict'
-var config = require('config')
-var crypto = require('crypto')
-var express = require('express')
-var multer = require('multer')
-
-var logger = require('../../../helpers/logger')
-var friends = require('../../../lib/friends')
-var middleware = require('../../../middlewares')
-var cacheMiddleware = middleware.cache
-var reqValidator = middleware.reqValidators.videos
-var Videos = require('../../../models/videos') // model
-var videos = require('../../../lib/videos')
-var webtorrent = require('../../../lib/webtorrent')
-
-var router = express.Router()
-var uploads = config.get('storage.uploads')
+const async = require('async')
+const config = require('config')
+const express = require('express')
+const fs = require('fs')
+const path = require('path')
+const multer = require('multer')
+
+const constants = require('../../../initializers/constants')
+const logger = require('../../../helpers/logger')
+const friends = require('../../../lib/friends')
+const middlewares = require('../../../middlewares')
+const oAuth2 = middlewares.oauth2
+const pagination = middlewares.pagination
+const reqValidator = middlewares.reqValidators
+const reqValidatorPagination = reqValidator.pagination
+const reqValidatorVideos = reqValidator.videos
+const utils = require('../../../helpers/utils')
+const Videos = require('../../../models/videos') // model
+const videos = require('../../../lib/videos')
+const webtorrent = require('../../../lib/webtorrent')
+
+const router = express.Router()
+const uploads = config.get('storage.uploads')
// multer configuration
-var storage = multer.diskStorage({
+const storage = multer.diskStorage({
destination: function (req, file, cb) {
cb(null, uploads)
},
filename: function (req, file, cb) {
- var extension = ''
+ 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'
- crypto.pseudoRandomBytes(16, function (err, raw) {
- var fieldname = err ? undefined : raw.toString('hex')
+ utils.generateRandomString(16, function (err, randomString) {
+ const fieldname = err ? undefined : randomString
cb(null, fieldname + '.' + extension)
})
}
})
-var reqFiles = multer({ storage: storage }).fields([{ name: 'input_video', maxCount: 1 }])
+const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
+const thumbnailsDir = path.join(__dirname, '..', '..', '..', '..', config.get('storage.thumbnails'))
-router.get('/', cacheMiddleware.cache(false), listVideos)
-router.post('/', reqFiles, reqValidator.videosAdd, cacheMiddleware.cache(false), addVideo)
-router.get('/:id', reqValidator.videosGet, cacheMiddleware.cache(false), getVideos)
-router.delete('/:id', reqValidator.videosRemove, cacheMiddleware.cache(false), removeVideo)
-router.get('/search/:name', reqValidator.videosSearch, cacheMiddleware.cache(false), searchVideos)
+router.get('/',
+ reqValidatorPagination.pagination,
+ pagination.setPagination,
+ listVideos
+)
+router.post('/',
+ oAuth2.authenticate,
+ reqFiles,
+ reqValidatorVideos.videosAdd,
+ addVideo
+)
+router.get('/:id',
+ reqValidatorVideos.videosGet,
+ getVideos
+)
+router.delete('/:id',
+ oAuth2.authenticate,
+ reqValidatorVideos.videosRemove,
+ removeVideo
+)
+router.get('/search/:name',
+ reqValidatorVideos.videosSearch,
+ reqValidatorPagination.pagination,
+ pagination.setPagination,
+ searchVideos
+)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
function addVideo (req, res, next) {
- var video_file = req.files.input_video[0]
- var video_infos = req.body
+ const videoFile = req.files.videofile[0]
+ const videoInfos = req.body
- videos.seed(video_file.path, function (err, torrent) {
- if (err) {
- logger.error('Cannot seed this video.')
- return next(err)
- }
+ async.waterfall([
+ function seedTheVideo (callback) {
+ videos.seed(videoFile.path, callback)
+ },
- var video_data = {
- name: video_infos.name,
- namePath: video_file.filename,
- description: video_infos.description,
- magnetUri: torrent.magnetURI
- }
+ function createThumbnail (torrent, callback) {
+ videos.createVideoThumbnail(videoFile.path, function (err, thumbnailName) {
+ if (err) {
+ // TODO: unseed the video
+ logger.error('Cannot make a thumbnail of the video file.')
+ return callback(err)
+ }
- Videos.add(video_data, function (err) {
- if (err) {
- // TODO unseed the video
- logger.error('Cannot insert this video in the database.')
- return next(err)
+ callback(null, torrent, thumbnailName)
+ })
+ },
+
+ function insertIntoDB (torrent, thumbnailName, callback) {
+ const videoData = {
+ name: videoInfos.name,
+ namePath: videoFile.filename,
+ description: videoInfos.description,
+ magnetUri: torrent.magnetURI,
+ author: res.locals.oauth.token.user.username,
+ duration: videoFile.duration,
+ thumbnail: thumbnailName
}
+ Videos.add(videoData, function (err, insertedVideo) {
+ if (err) {
+ // TODO unseed the video
+ // TODO remove thumbnail
+ logger.error('Cannot insert this video in the database.')
+ return callback(err)
+ }
+
+ return callback(null, torrent, thumbnailName, videoData, insertedVideo)
+ })
+ },
+
+ function getThumbnailBase64 (torrent, thumbnailName, videoData, insertedVideo, callback) {
+ videoData.createdDate = insertedVideo.createdDate
+
+ fs.readFile(thumbnailsDir + thumbnailName, function (err, thumbnailData) {
+ if (err) {
+ // TODO unseed the video
+ // TODO remove thumbnail
+ // TODO: remove video
+ logger.error('Cannot read the thumbnail of the video')
+ return callback(err)
+ }
+
+ return callback(null, videoData, thumbnailData)
+ })
+ },
+
+ function sendToFriends (videoData, thumbnailData, callback) {
+ // Set the image in base64
+ videoData.thumbnailBase64 = new Buffer(thumbnailData).toString('base64')
+
// Now we'll add the video's meta data to our friends
- friends.addVideoToFriends(video_data)
+ friends.addVideoToFriends(videoData)
- // TODO : include Location of the new video -> 201
- res.type('json').status(204).end()
- })
+ return callback(null)
+ }
+
+ ], function (err) {
+ if (err) {
+ logger.error('Cannot insert the video.')
+ return next(err)
+ }
+
+ // TODO : include Location of the new video -> 201
+ return res.type('json').status(204).end()
})
}
function getVideos (req, res, next) {
- Videos.get(req.params.id, function (err, video) {
+ Videos.get(req.params.id, function (err, videoObj) {
if (err) return next(err)
- if (video === null) {
- res.type('json').status(204).end()
+ const state = videos.getVideoState(videoObj)
+ if (state.exist === false) {
+ return res.type('json').status(204).end()
}
- res.json(video)
+ res.json(getFormatedVideo(videoObj))
})
}
function listVideos (req, res, next) {
- Videos.list(function (err, videos_list) {
+ Videos.list(req.query.start, req.query.count, function (err, videosList) {
if (err) return next(err)
- res.json(videos_list)
+ res.json(getFormatedVideos(videosList))
})
}
function removeVideo (req, res, next) {
- var video_id = req.params.id
- Videos.get(video_id, function (err, video) {
- if (err) return next(err)
+ const videoId = req.params.id
+
+ async.waterfall([
+ function getVideo (callback) {
+ Videos.get(videoId, callback)
+ },
+
+ function removeVideoTorrent (video, callback) {
+ removeTorrent(video.magnetUri, function () {
+ return callback(null, video)
+ })
+ },
- removeTorrent(video.magnetUri, function () {
+ function removeFromDB (video, callback) {
Videos.removeOwned(req.params.id, function (err) {
- if (err) return next(err)
+ if (err) return callback(err)
- var params = {
- name: video.name,
- magnetUri: video.magnetUri
- }
+ return callback(null, video)
+ })
+ },
+
+ function removeVideoData (video, callback) {
+ videos.removeVideosDataFromDisk([ video ], function (err) {
+ if (err) logger.error('Cannot remove video data from disk.', { video: video })
- friends.removeVideoToFriends(params)
- res.type('json').status(204).end()
+ return callback(null, video)
})
- })
+ },
+
+ function sendInformationToFriends (video, callback) {
+ const params = {
+ name: video.name,
+ magnetUri: video.magnetUri
+ }
+
+ friends.removeVideoToFriends(params)
+
+ return callback(null)
+ }
+ ], function (err) {
+ if (err) {
+ logger.error('Errors when removed the video.', { error: err })
+ return next(err)
+ }
+
+ return res.type('json').status(204).end()
})
}
function searchVideos (req, res, next) {
- Videos.search(req.params.name, function (err, videos_list) {
+ Videos.search(req.params.name, req.query.start, req.query.count, function (err, videosList) {
if (err) return next(err)
- res.json(videos_list)
+ res.json(getFormatedVideos(videosList))
})
}
// ---------------------------------------------------------------------------
+function getFormatedVideo (videoObj) {
+ const formatedVideo = {
+ id: videoObj._id,
+ name: videoObj.name,
+ description: videoObj.description,
+ podUrl: videoObj.podUrl,
+ isLocal: videos.getVideoState(videoObj).owned,
+ magnetUri: videoObj.magnetUri,
+ author: videoObj.author,
+ duration: videoObj.duration,
+ thumbnailPath: constants.THUMBNAILS_STATIC_PATH + '/' + videoObj.thumbnail,
+ createdDate: videoObj.createdDate
+ }
+
+ return formatedVideo
+}
+
+function getFormatedVideos (videosObj) {
+ const formatedVideos = []
+
+ videosObj.forEach(function (videoObj) {
+ formatedVideos.push(getFormatedVideo(videoObj))
+ })
+
+ return formatedVideos
+}
+
// Maybe the torrent is not seeded, but we catch the error to don't stop the removing process
function removeTorrent (magnetUri, callback) {
try {
projects / github / Chocobozzz / PeerTube.git / blobdiff