mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2025-10-05 19:42:24 +02:00
Video model refractoring -> use mongoose api
This commit is contained in:
parent
07d9320387
commit
aaf61f3810
15 changed files with 412 additions and 534 deletions
|
@ -3,9 +3,9 @@
|
|||
const async = require('async')
|
||||
const config = require('config')
|
||||
const express = require('express')
|
||||
const mongoose = require('mongoose')
|
||||
const multer = require('multer')
|
||||
|
||||
const constants = require('../../../initializers/constants')
|
||||
const logger = require('../../../helpers/logger')
|
||||
const friends = require('../../../lib/friends')
|
||||
const middlewares = require('../../../middlewares')
|
||||
|
@ -18,12 +18,10 @@ const reqValidatorVideos = reqValidator.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({
|
||||
|
@ -88,55 +86,27 @@ function addVideo (req, res, next) {
|
|||
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)
|
||||
}
|
||||
|
||||
callback(null, torrent, thumbnailName)
|
||||
})
|
||||
},
|
||||
|
||||
function insertIntoDB (torrent, thumbnailName, callback) {
|
||||
function insertIntoDB (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,
|
||||
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, 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 sendToFriends (insertedVideo, callback) {
|
||||
videos.convertVideoToRemote(insertedVideo, function (err, remoteVideo) {
|
||||
if (err) {
|
||||
// TODO unseed the video
|
||||
// TODO remove thumbnail
|
||||
// TODO delete from DB
|
||||
logger.error('Cannot convert video to remote.')
|
||||
return callback(err)
|
||||
}
|
||||
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(remoteVideo)
|
||||
|
@ -147,6 +117,9 @@ function addVideo (req, res, next) {
|
|||
|
||||
], 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)
|
||||
}
|
||||
|
@ -157,23 +130,22 @@ function addVideo (req, res, next) {
|
|||
}
|
||||
|
||||
function getVideo (req, res, next) {
|
||||
Videos.get(req.params.id, function (err, videoObj) {
|
||||
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, totalVideos) {
|
||||
Video.list(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) {
|
||||
if (err) return next(err)
|
||||
|
||||
res.json(getFormatedVideos(videosList, totalVideos))
|
||||
res.json(getFormatedVideos(videosList, videosTotal))
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -182,31 +154,17 @@ function removeVideo (req, res, next) {
|
|||
|
||||
async.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,
|
||||
|
@ -228,53 +186,25 @@ function removeVideo (req, res, next) {
|
|||
}
|
||||
|
||||
function searchVideos (req, res, next) {
|
||||
Videos.search(req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort,
|
||||
function (err, videosList, totalVideos) {
|
||||
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, totalVideos))
|
||||
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,
|
||||
tags: videoObj.tags,
|
||||
thumbnailPath: constants.THUMBNAILS_STATIC_PATH + '/' + videoObj.thumbnail,
|
||||
createdDate: videoObj.createdDate
|
||||
}
|
||||
|
||||
return formatedVideo
|
||||
}
|
||||
|
||||
function getFormatedVideos (videosObj, totalVideos) {
|
||||
function getFormatedVideos (videos, videosTotal) {
|
||||
const formatedVideos = []
|
||||
|
||||
videosObj.forEach(function (videoObj) {
|
||||
formatedVideos.push(getFormatedVideo(videoObj))
|
||||
videos.forEach(function (video) {
|
||||
formatedVideos.push(video.toFormatedJSON())
|
||||
})
|
||||
|
||||
return {
|
||||
total: totalVideos,
|
||||
total: videosTotal,
|
||||
data: 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)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue