X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fv1%2Fvideos.js;h=83734b35e7581f55481a1a009ae07acbe4c747ea;hb=aaf61f3810e6d57c5130af959bd2860df32775e7;hp=e696289619f9ac4f75a1286a88ff5fb507f466e2;hpb=3a8a8b51228070d8e6a01ea6e460534aa0a20efc;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js index e69628961..83734b35e 100644 --- a/server/controllers/api/v1/videos.js +++ b/server/controllers/api/v1/videos.js @@ -1,23 +1,27 @@ 'use strict' +const async = require('async') const config = require('config') -const crypto = require('crypto') const express = require('express') -const ffmpeg = require('fluent-ffmpeg') +const mongoose = require('mongoose') const multer = require('multer') 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 videos = require('../../../lib/videos') -const webtorrent = require('../../../lib/webtorrent') +const middlewares = require('../../../middlewares') +const oAuth2 = middlewares.oauth2 +const pagination = middlewares.pagination +const reqValidator = middlewares.reqValidators +const reqValidatorPagination = reqValidator.pagination +const reqValidatorSort = reqValidator.sort +const reqValidatorVideos = reqValidator.videos +const search = middlewares.search +const sort = middlewares.sort +const utils = require('../../../helpers/utils') const router = express.Router() const uploads = config.get('storage.uploads') +const Video = mongoose.model('Video') // multer configuration const storage = multer.diskStorage({ @@ -30,8 +34,8 @@ const storage = multer.diskStorage({ 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) { - const fieldname = err ? undefined : raw.toString('hex') + utils.generateRandomString(16, function (err, randomString) { + const fieldname = err ? undefined : randomString cb(null, fieldname + '.' + extension) }) } @@ -39,11 +43,37 @@ const storage = multer.diskStorage({ const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }]) -router.get('/', cacheMiddleware.cache(false), listVideos) -router.post('/', oAuth2.authenticate, reqFiles, reqValidator.videosAdd, cacheMiddleware.cache(false), addVideo) -router.get('/:id', reqValidator.videosGet, cacheMiddleware.cache(false), getVideos) -router.delete('/:id', oAuth2.authenticate, reqValidator.videosRemove, cacheMiddleware.cache(false), removeVideo) -router.get('/search/:name', reqValidator.videosSearch, cacheMiddleware.cache(false), searchVideos) +router.get('/', + reqValidatorPagination.pagination, + reqValidatorSort.videosSort, + sort.setVideosSort, + pagination.setPagination, + listVideos +) +router.post('/', + oAuth2.authenticate, + reqFiles, + reqValidatorVideos.videosAdd, + addVideo +) +router.get('/:id', + reqValidatorVideos.videosGet, + getVideo +) +router.delete('/:id', + oAuth2.authenticate, + reqValidatorVideos.videosRemove, + removeVideo +) +router.get('/search/:value', + reqValidatorVideos.videosSearch, + reqValidatorPagination.pagination, + reqValidatorSort.videosSort, + sort.setVideosSort, + pagination.setPagination, + search.setVideosSearch, + searchVideos +) // --------------------------------------------------------------------------- @@ -52,133 +82,129 @@ module.exports = router // --------------------------------------------------------------------------- function addVideo (req, res, next) { - const video_file = req.files.videofile[0] - const 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) - } - - ffmpeg.ffprobe(video_file.path, function (err, metadata) { - if (err) { - // TODO: unseed the video - logger.error('Cannot retrieve metadata of the file') - return next(err) - } - - const duration = Math.floor(metadata.format.duration) + async.waterfall([ - const video_data = { - name: video_infos.name, - namePath: video_file.filename, - description: video_infos.description, - magnetUri: torrent.magnetURI, + function insertIntoDB (callback) { + const videoData = { + name: videoInfos.name, + namePath: videoFile.filename, + description: videoInfos.description, author: res.locals.oauth.token.user.username, - duration: duration + duration: videoFile.duration, + tags: videoInfos.tags } - Videos.add(video_data, function (err) { - if (err) { - // TODO unseed the video - logger.error('Cannot insert this video in the database.') - return next(err) - } + const video = new Video(videoData) + video.save(function (err, video) { + // Assert there are only one argument sent to the next function (video) + return callback(err, video) + }) + }, + + function sendToFriends (video, callback) { + video.toRemoteJSON(function (err, remoteVideo) { + if (err) return callback(err) // Now we'll add the video's meta data to our friends - friends.addVideoToFriends(video_data) + friends.addVideoToFriends(remoteVideo) - // TODO : include Location of the new video -> 201 - res.type('json').status(204).end() + return callback(null) }) - }) + } + + ], function andFinally (err) { + if (err) { + // TODO unseed the video + // TODO remove thumbnail + // TODO delete from DB + 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_obj) { +function getVideo (req, res, next) { + Video.load(req.params.id, function (err, video) { if (err) return next(err) - const state = videos.getVideoState(video_obj) - if (state.exist === false) { + if (!video) { return res.type('json').status(204).end() } - res.json(getFormatedVideo(video_obj)) + res.json(video.toFormatedJSON()) }) } function listVideos (req, res, next) { - Videos.list(function (err, videos_list) { + Video.list(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) { if (err) return next(err) - res.json(getFormatedVideos(videos_list)) + res.json(getFormatedVideos(videosList, videosTotal)) }) } function removeVideo (req, res, next) { - const video_id = req.params.id - Videos.get(video_id, function (err, video) { - if (err) return next(err) + const videoId = req.params.id - removeTorrent(video.magnetUri, function () { - Videos.removeOwned(req.params.id, function (err) { - if (err) return next(err) + async.waterfall([ + function getVideo (callback) { + Video.load(videoId, callback) + }, - const params = { - name: video.name, - magnetUri: video.magnetUri - } + function removeFromDB (video, callback) { + video.remove(function (err) { + if (err) return callback(err) - 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 andFinally (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) { + Video.search(req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort, + function (err, videosList, videosTotal) { if (err) return next(err) - res.json(getFormatedVideos(videos_list)) + res.json(getFormatedVideos(videosList, videosTotal)) }) } // --------------------------------------------------------------------------- -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, - duration: video_obj.duration - } - - return formated_video -} - -function getFormatedVideos (videos_obj) { - const formated_videos = [] +function getFormatedVideos (videos, videosTotal) { + const formatedVideos = [] - videos_obj.forEach(function (video_obj) { - formated_videos.push(getFormatedVideo(video_obj)) + videos.forEach(function (video) { + formatedVideos.push(video.toFormatedJSON()) }) - 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 { - webtorrent.remove(magnetUri, callback) - } catch (err) { - logger.warn('Cannot remove the torrent from WebTorrent', { err: err }) - return callback(null) + return { + total: videosTotal, + data: formatedVideos } }