const logger = require('../../../helpers/logger')
const friends = require('../../../lib/friends')
const middleware = require('../../../middlewares')
+const oAuth2 = require('../../../middlewares/oauth2')
const cacheMiddleware = middleware.cache
const reqValidator = middleware.reqValidators.videos
const Videos = require('../../../models/videos') // model
}
})
-const reqFiles = multer({ storage: storage }).fields([{ name: 'input_video', maxCount: 1 }])
+const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
router.get('/', cacheMiddleware.cache(false), listVideos)
-router.post('/', reqFiles, reqValidator.videosAdd, cacheMiddleware.cache(false), addVideo)
+router.post('/', oAuth2.authenticate, 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.delete('/:id', oAuth2.authenticate, reqValidator.videosRemove, cacheMiddleware.cache(false), removeVideo)
router.get('/search/:name', reqValidator.videosSearch, cacheMiddleware.cache(false), searchVideos)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
function addVideo (req, res, next) {
- const video_file = req.files.input_video[0]
+ const video_file = req.files.videofile[0]
const video_infos = req.body
videos.seed(video_file.path, function (err, torrent) {
name: video_infos.name,
namePath: video_file.filename,
description: video_infos.description,
- magnetUri: torrent.magnetURI
+ magnetUri: torrent.magnetURI,
+ author: res.locals.oauth.token.user.username
}
Videos.add(video_data, function (err) {
}
function getVideos (req, res, next) {
- Videos.get(req.params.id, function (err, video) {
+ Videos.get(req.params.id, function (err, video_obj) {
if (err) return next(err)
- if (video === null) {
- res.type('json').status(204).end()
+ const state = videos.getVideoState(video_obj)
+ if (state.exist === false) {
+ return res.type('json').status(204).end()
}
- res.json(video)
+ res.json(getFormatedVideo(video_obj))
})
}
Videos.list(function (err, videos_list) {
if (err) return next(err)
- res.json(videos_list)
+ res.json(getFormatedVideos(videos_list))
})
}
Videos.search(req.params.name, function (err, videos_list) {
if (err) return next(err)
- res.json(videos_list)
+ res.json(getFormatedVideos(videos_list))
})
}
// ---------------------------------------------------------------------------
+function getFormatedVideo (video_obj) {
+ const formated_video = {
+ id: video_obj._id,
+ name: video_obj.name,
+ description: video_obj.description,
+ podUrl: video_obj.podUrl,
+ isLocal: videos.getVideoState(video_obj).owned,
+ magnetUri: video_obj.magnetUri,
+ author: video_obj.author
+ }
+
+ return formated_video
+}
+
+function getFormatedVideos (videos_obj) {
+ const formated_videos = []
+
+ videos_obj.forEach(function (video_obj) {
+ formated_videos.push(getFormatedVideo(video_obj))
+ })
+
+ return formated_videos
+}
+
// Maybe the torrent is not seeded, but we catch the error to don't stop the removing process
function removeTorrent (magnetUri, callback) {
try {