X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fv1%2Fvideos.js;h=70d22f139ba35dba729928509ec36f134f6a9e38;hb=e861452fb26553177ad4e32bfb18b4fd8a5b1816;hp=e903cbcf4135950da1dd89769a88f75ebbcd1fb3;hpb=9e379c835c2badfe8e9088e25870af0a6a8c4d40;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js index e903cbcf4..70d22f139 100644 --- a/server/controllers/api/v1/videos.js +++ b/server/controllers/api/v1/videos.js @@ -1,35 +1,31 @@ 'use strict' -const async = require('async') -const config = require('config') const express = require('express') -const fs = require('fs') -const path = require('path') +const mongoose = require('mongoose') const multer = require('multer') +const waterfall = require('async/waterfall') const constants = require('../../../initializers/constants') const logger = require('../../../helpers/logger') const friends = require('../../../lib/friends') const middlewares = require('../../../middlewares') -const oAuth2 = middlewares.oauth2 +const oAuth = middlewares.oauth const pagination = middlewares.pagination -const reqValidator = middlewares.reqValidators -const reqValidatorPagination = reqValidator.pagination -const reqValidatorSort = reqValidator.sort -const reqValidatorVideos = reqValidator.videos +const validators = middlewares.validators +const validatorsPagination = validators.pagination +const validatorsSort = validators.sort +const validatorsVideos = validators.videos +const search = middlewares.search const sort = middlewares.sort 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') +const Video = mongoose.model('Video') // multer configuration const storage = multer.diskStorage({ destination: function (req, file, cb) { - cb(null, uploads) + cb(null, constants.CONFIG.STORAGE.UPLOAD_DIR) }, filename: function (req, file, cb) { @@ -45,36 +41,36 @@ const storage = multer.diskStorage({ }) const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }]) -const thumbnailsDir = path.join(__dirname, '..', '..', '..', '..', config.get('storage.thumbnails')) router.get('/', - reqValidatorPagination.pagination, - reqValidatorSort.videosSort, + validatorsPagination.pagination, + validatorsSort.videosSort, sort.setVideosSort, pagination.setPagination, listVideos ) router.post('/', - oAuth2.authenticate, + oAuth.authenticate, reqFiles, - reqValidatorVideos.videosAdd, + validatorsVideos.videosAdd, addVideo ) router.get('/:id', - reqValidatorVideos.videosGet, - getVideos + validatorsVideos.videosGet, + getVideo ) router.delete('/:id', - oAuth2.authenticate, - reqValidatorVideos.videosRemove, + oAuth.authenticate, + validatorsVideos.videosRemove, removeVideo ) -router.get('/search/:name', - reqValidatorVideos.videosSearch, - reqValidatorPagination.pagination, - reqValidatorSort.videosSort, +router.get('/search/:value', + validatorsVideos.videosSearch, + validatorsPagination.pagination, + validatorsSort.videosSort, sort.setVideosSort, pagination.setPagination, + search.setVideosSearch, searchVideos ) @@ -88,74 +84,41 @@ function addVideo (req, res, next) { const videoFile = req.files.videofile[0] const videoInfos = req.body - async.waterfall([ - function seedTheVideo (callback) { - videos.seed(videoFile.path, callback) - }, - - 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) - } + waterfall([ - callback(null, torrent, thumbnailName) - }) - }, - - function insertIntoDB (torrent, thumbnailName, callback) { + function insertIntoDB (callback) { const videoData = { name: videoInfos.name, - namePath: videoFile.filename, + filename: videoFile.filename, description: videoInfos.description, - magnetUri: torrent.magnetURI, author: res.locals.oauth.token.user.username, duration: videoFile.duration, - thumbnail: thumbnailName + tags: videoInfos.tags } - 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) + 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 getThumbnailBase64 (torrent, thumbnailName, videoData, insertedVideo, callback) { - videoData.createdDate = insertedVideo.createdDate + function sendToFriends (video, callback) { + video.toRemoteJSON(function (err, remoteVideo) { + if (err) return callback(err) - 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) - } + // Now we'll add the video's meta data to our friends + friends.addVideoToFriends(remoteVideo) - return callback(null, videoData, thumbnailData) + return callback(null) }) - }, - - 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(videoData) - - return callback(null) } - ], function (err) { + ], 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) } @@ -165,57 +128,42 @@ function addVideo (req, res, next) { }) } -function getVideos (req, res, next) { - Videos.get(req.params.id, function (err, videoObj) { +function getVideo (req, res, next) { + Video.load(req.params.id, function (err, video) { if (err) return next(err) - const state = videos.getVideoState(videoObj) - if (state.exist === false) { + if (!video) { return res.type('json').status(204).end() } - res.json(getFormatedVideo(videoObj)) + res.json(video.toFormatedJSON()) }) } function listVideos (req, res, next) { - Videos.list(req.query.start, req.query.count, req.query.sort, function (err, videosList) { + Video.listForApi(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) { if (err) return next(err) - res.json(getFormatedVideos(videosList)) + res.json(getFormatedVideos(videosList, videosTotal)) }) } function removeVideo (req, res, next) { const videoId = req.params.id - async.waterfall([ + waterfall([ function getVideo (callback) { - Videos.get(videoId, callback) - }, - - function removeVideoTorrent (video, callback) { - removeTorrent(video.magnetUri, function () { - return callback(null, video) - }) + Video.load(videoId, callback) }, function removeFromDB (video, callback) { - Videos.removeOwned(req.params.id, function (err) { + video.remove(function (err) { if (err) return callback(err) 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 }) - - return callback(null, video) - }) - }, - function sendInformationToFriends (video, callback) { const params = { name: video.name, @@ -226,7 +174,7 @@ function removeVideo (req, res, next) { return callback(null) } - ], function (err) { + ], function andFinally (err) { if (err) { logger.error('Errors when removed the video.', { error: err }) return next(err) @@ -237,48 +185,25 @@ function removeVideo (req, res, next) { } function searchVideos (req, res, next) { - Videos.search(req.params.name, req.query.start, req.query.count, req.query.sort, function (err, videosList) { + 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(videosList)) + res.json(getFormatedVideos(videosList, videosTotal)) }) } // --------------------------------------------------------------------------- -function getFormatedVideo (videoObj) { - const formatedVideo = { - id: videoObj._id, - name: videoObj.name, - description: videoObj.description, - podUrl: videoObj.podUrl.replace(/^https?:\/\//, ''), - 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) { +function getFormatedVideos (videos, videosTotal) { const formatedVideos = [] - videosObj.forEach(function (videoObj) { - formatedVideos.push(getFormatedVideo(videoObj)) + videos.forEach(function (video) { + formatedVideos.push(video.toFormatedJSON()) }) - 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 { - webtorrent.remove(magnetUri, callback) - } catch (err) { - logger.warn('Cannot remove the torrent from WebTorrent', { err: err }) - return callback(null) + return { + total: videosTotal, + data: formatedVideos } }