From 558d7c2385d8a152a94140eed753f511e90986d7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 11 Nov 2016 13:47:50 +0100 Subject: [PATCH] Server: use _id for image and video files. Add remoteId field --- server/controllers/api/remote.js | 2 +- server/controllers/api/videos.js | 29 +++- server/helpers/custom-validators/videos.js | 9 +- server/models/video.js | 146 +++++++++++---------- 4 files changed, 109 insertions(+), 77 deletions(-) diff --git a/server/controllers/api/remote.js b/server/controllers/api/remote.js index 17b1d07c4..94808693d 100644 --- a/server/controllers/api/remote.js +++ b/server/controllers/api/remote.js @@ -64,7 +64,7 @@ function addRemoteVideo (videoToCreateData, callback) { function removeRemoteVideo (videoToRemoveData, fromUrl, callback) { // We need the list because we have to remove some other stuffs (thumbnail etc) - Video.listByUrlAndMagnet(fromUrl, videoToRemoveData.magnetUri, function (err, videosList) { + Video.listByUrlAndRemoteId(fromUrl, videoToRemoveData.remoteId, function (err, videosList) { if (err) { logger.error('Cannot list videos from url and magnets.', { error: err }) return callback(err) diff --git a/server/controllers/api/videos.js b/server/controllers/api/videos.js index e2d393074..2c9e4940e 100644 --- a/server/controllers/api/videos.js +++ b/server/controllers/api/videos.js @@ -1,8 +1,10 @@ 'use strict' const express = require('express') +const fs = require('fs') const mongoose = require('mongoose') const multer = require('multer') +const path = require('path') const waterfall = require('async/waterfall') const constants = require('../../initializers/constants') @@ -85,11 +87,14 @@ function addVideo (req, res, next) { const videoInfos = req.body waterfall([ + function createVideoObject (callback) { + const id = mongoose.Types.ObjectId() - function insertIntoDB (callback) { const videoData = { + _id: id, name: videoInfos.name, - filename: videoFile.filename, + remoteId: null, + extname: path.extname(videoFile.filename), description: videoInfos.description, author: res.locals.oauth.token.user.username, duration: videoFile.duration, @@ -97,7 +102,23 @@ function addVideo (req, res, next) { } const video = new Video(videoData) - video.save(function (err, video) { + + return callback(null, video) + }, + + // Set the videoname the same as the MongoDB id + function renameVideoFile (video, callback) { + const videoDir = constants.CONFIG.STORAGE.VIDEOS_DIR + const source = path.join(videoDir, videoFile.filename) + const destination = path.join(videoDir, video.getFilename()) + + fs.rename(source, destination, function (err) { + return callback(err, video) + }) + }, + + function insertIntoDB (video, callback) { + video.save(function (err, video, videoFile) { // Assert there are only one argument sent to the next function (video) return callback(err, video) }) @@ -164,7 +185,7 @@ function removeVideo (req, res, next) { function sendInformationToFriends (video, callback) { const params = { name: video.name, - magnetUri: video.magnetUri + remoteId: video._id } friends.removeVideoToFriends(params) diff --git a/server/helpers/custom-validators/videos.js b/server/helpers/custom-validators/videos.js index a507ff686..c4c59808f 100644 --- a/server/helpers/custom-validators/videos.js +++ b/server/helpers/custom-validators/videos.js @@ -35,12 +35,13 @@ function isEachRemoteVideosValid (requests) { isVideoNameValid(video.name) && isVideoPodUrlValid(video.podUrl) && isVideoTagsValid(video.tags) && - isVideoThumbnail64Valid(video.thumbnailBase64) + isVideoThumbnail64Valid(video.thumbnailBase64) && + isVideoRemoteIdValid(video.remoteId) ) || ( isRequestTypeRemoveValid(request.type) && isVideoNameValid(video.name) && - isVideoMagnetUriValid(video.magnetUri) + isVideoRemoteIdValid(video.remoteId) ) }) } @@ -92,6 +93,10 @@ function isVideoThumbnail64Valid (value) { validator.isByteLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL64) } +function isVideoRemoteIdValid (value) { + return validator.isMongoId(value) +} + // --------------------------------------------------------------------------- module.exports = videosValidators diff --git a/server/models/video.js b/server/models/video.js index bfa1fca15..6cffa87af 100644 --- a/server/models/video.js +++ b/server/models/video.js @@ -13,14 +13,17 @@ const constants = require('../initializers/constants') const customVideosValidators = require('../helpers/custom-validators').videos const logger = require('../helpers/logger') const modelUtils = require('./utils') -const utils = require('../helpers/utils') // --------------------------------------------------------------------------- // TODO: add indexes on searchable columns const VideoSchema = mongoose.Schema({ name: String, - filename: String, + extname: { + type: String, + enum: [ '.mp4', '.webm', '.ogv' ] + }, + remoteId: mongoose.Schema.Types.ObjectId, description: String, magnetUri: String, podUrl: String, @@ -48,6 +51,9 @@ VideoSchema.path('thumbnail').validate(function (value) { VideoSchema.path('tags').validate(customVideosValidators.isVideoTagsValid) VideoSchema.methods = { + getFilename, + getJPEGName, + getTorrentName, isOwned, toFormatedJSON, toRemoteJSON @@ -56,7 +62,7 @@ VideoSchema.methods = { VideoSchema.statics = { getDurationFromFile, listForApi, - listByUrlAndMagnet, + listByUrlAndRemoteId, listByUrl, listOwned, listOwnedByAuthor, @@ -97,7 +103,7 @@ VideoSchema.pre('save', function (next) { const tasks = [] if (video.isOwned()) { - const videoPath = pathUtils.join(constants.CONFIG.STORAGE.VIDEOS_DIR, video.filename) + const videoPath = pathUtils.join(constants.CONFIG.STORAGE.VIDEOS_DIR, video.getFilename()) this.podUrl = constants.CONFIG.WEBSERVER.URL tasks.push( @@ -108,18 +114,18 @@ VideoSchema.pre('save', function (next) { [ constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOSTNAME + ':' + constants.CONFIG.WEBSERVER.PORT + '/tracker/socket' ] ], urlList: [ - constants.CONFIG.WEBSERVER.URL + constants.STATIC_PATHS.WEBSEED + video.filename + constants.CONFIG.WEBSERVER.URL + constants.STATIC_PATHS.WEBSEED + video.getFilename() ] } createTorrent(videoPath, options, function (err, torrent) { if (err) return callback(err) - fs.writeFile(constants.CONFIG.STORAGE.TORRENTS_DIR + video.filename + '.torrent', torrent, function (err) { + fs.writeFile(constants.CONFIG.STORAGE.TORRENTS_DIR + video.getTorrentName(), torrent, function (err) { if (err) return callback(err) const parsedTorrent = parseTorrent(torrent) - parsedTorrent.xs = video.podUrl + constants.STATIC_PATHS.TORRENTS + video.filename + '.torrent' + parsedTorrent.xs = video.podUrl + constants.STATIC_PATHS.TORRENTS + video.getTorrentName() video.magnetUri = magnet.encode(parsedTorrent) callback(null) @@ -127,28 +133,16 @@ VideoSchema.pre('save', function (next) { }) }, function (callback) { - createThumbnail(videoPath, callback) + createThumbnail(video, videoPath, callback) }, function (callback) { - createPreview(videoPath, callback) + createPreview(video, videoPath, callback) } ) - parallel(tasks, function (err, results) { - if (err) return next(err) - - video.thumbnail = results[1] - - return next() - }) + parallel(tasks, next) } else { - generateThumbnailFromBase64(video.thumbnail, function (err, thumbnailName) { - if (err) return next(err) - - video.thumbnail = thumbnailName - - return next() - }) + generateThumbnailFromBase64(video, video.thumbnail, next) } }) @@ -156,8 +150,20 @@ mongoose.model('Video', VideoSchema) // ------------------------------ METHODS ------------------------------ +function getFilename () { + return this._id + this.extname +} + +function getJPEGName () { + return this._id + '.jpg' +} + +function getTorrentName () { + return this._id + '.torrent' +} + function isOwned () { - return this.filename !== null + return this.remoteId === null } function toFormatedJSON () { @@ -171,7 +177,7 @@ function toFormatedJSON () { author: this.author, duration: this.duration, tags: this.tags, - thumbnailPath: constants.STATIC_PATHS.THUMBNAILS + '/' + this.thumbnail, + thumbnailPath: constants.STATIC_PATHS.THUMBNAILS + '/' + this.getJPEGName(), createdDate: this.createdDate } @@ -182,7 +188,8 @@ function toRemoteJSON (callback) { const self = this // Convert thumbnail to base64 - fs.readFile(pathUtils.join(constants.CONFIG.STORAGE.THUMBNAILS_DIR, this.thumbnail), function (err, thumbnailData) { + const thumbnailPath = pathUtils.join(constants.CONFIG.STORAGE.THUMBNAILS_DIR, this.getJPEGName()) + fs.readFile(thumbnailPath, function (err, thumbnailData) { if (err) { logger.error('Cannot read the thumbnail of the video') return callback(err) @@ -192,7 +199,7 @@ function toRemoteJSON (callback) { name: self.name, description: self.description, magnetUri: self.magnetUri, - filename: null, + remoteId: self._id, author: self.author, duration: self.duration, thumbnailBase64: new Buffer(thumbnailData).toString('base64'), @@ -220,8 +227,8 @@ function listForApi (start, count, sort, callback) { return modelUtils.listForApiWithCount.call(this, query, start, count, sort, callback) } -function listByUrlAndMagnet (fromUrl, magnetUri, callback) { - this.find({ podUrl: fromUrl, magnetUri: magnetUri }, callback) +function listByUrlAndRemoteId (fromUrl, remoteId, callback) { + this.find({ podUrl: fromUrl, remoteId: remoteId }, callback) } function listByUrl (fromUrl, callback) { @@ -229,16 +236,16 @@ function listByUrl (fromUrl, callback) { } function listOwned (callback) { - // If filename is not null this is *our* video - this.find({ filename: { $ne: null } }, callback) + // If remoteId is null this is *our* video + this.find({ remoteId: null }, callback) } function listOwnedByAuthor (author, callback) { - this.find({ filename: { $ne: null }, author: author }, callback) + this.find({ remoteId: null, author: author }, callback) } function listRemotes (callback) { - this.find({ filename: null }, callback) + this.find({ remoteId: { $ne: null } }, callback) } function load (id, callback) { @@ -260,62 +267,61 @@ function search (value, field, start, count, sort, callback) { // --------------------------------------------------------------------------- function removeThumbnail (video, callback) { - fs.unlink(constants.CONFIG.STORAGE.THUMBNAILS_DIR + video.thumbnail, callback) + fs.unlink(constants.CONFIG.STORAGE.THUMBNAILS_DIR + video.getJPEGName(), callback) } function removeFile (video, callback) { - fs.unlink(constants.CONFIG.STORAGE.VIDEOS_DIR + video.filename, callback) + fs.unlink(constants.CONFIG.STORAGE.VIDEOS_DIR + video.getFilename(), callback) } function removeTorrent (video, callback) { - fs.unlink(constants.CONFIG.STORAGE.TORRENTS_DIR + video.filename + '.torrent', callback) + fs.unlink(constants.CONFIG.STORAGE.TORRENTS_DIR + video.getTorrentName(), callback) } function removePreview (video, callback) { // Same name than video thumnail // TODO: refractoring - fs.unlink(constants.CONFIG.STORAGE.PREVIEWS_DIR + video.thumbnail, callback) + fs.unlink(constants.CONFIG.STORAGE.PREVIEWS_DIR + video.getJPEGName(), callback) } -function createPreview (videoPath, callback) { - const filename = pathUtils.basename(videoPath) + '.jpg' - ffmpeg(videoPath) - .on('error', callback) - .on('end', function () { - callback(null, filename) - }) - .thumbnail({ - count: 1, - folder: constants.CONFIG.STORAGE.PREVIEWS_DIR, - filename: filename - }) +function createPreview (video, videoPath, callback) { + generateImage(video, videoPath, constants.CONFIG.STORAGE.PREVIEWS_DIR, callback) } -function createThumbnail (videoPath, callback) { - const filename = pathUtils.basename(videoPath) + '.jpg' - ffmpeg(videoPath) - .on('error', callback) - .on('end', function () { - callback(null, filename) - }) - .thumbnail({ - count: 1, - folder: constants.CONFIG.STORAGE.THUMBNAILS_DIR, - size: constants.THUMBNAILS_SIZE, - filename: filename - }) +function createThumbnail (video, videoPath, callback) { + generateImage(video, videoPath, constants.CONFIG.STORAGE.THUMBNAILS_DIR, constants.THUMBNAILS_SIZE, callback) } -function generateThumbnailFromBase64 (data, callback) { - // Creating the thumbnail for this remote video - utils.generateRandomString(16, function (err, randomString) { +function generateThumbnailFromBase64 (video, thumbnailData, callback) { + // Creating the thumbnail for this remote video) + + const thumbnailName = video.getJPEGName() + const thumbnailPath = constants.CONFIG.STORAGE.THUMBNAILS_DIR + thumbnailName + fs.writeFile(thumbnailPath, thumbnailData, { encoding: 'base64' }, function (err) { if (err) return callback(err) - const thumbnailName = randomString + '.jpg' - fs.writeFile(constants.CONFIG.STORAGE.THUMBNAILS_DIR + thumbnailName, data, { encoding: 'base64' }, function (err) { - if (err) return callback(err) + return callback(null, thumbnailName) + }) +} + +function generateImage (video, videoPath, folder, size, callback) { + const filename = video.getJPEGName() + const options = { + filename, + count: 1, + folder + } - return callback(null, thumbnailName) + if (!callback) { + callback = size + } else { + options.size = size + } + + ffmpeg(videoPath) + .on('error', callback) + .on('end', function () { + callback(null, filename) }) - }) + .thumbnail(options) } -- 2.25.1