forks/peertube
1
0
Fork 0
Code Releases Activity

Server: fix thumbnail in remote videos

Browse source
This commit is contained in:
Chocobozzz 2016-11-16 21:16:41 +01:00
parent 9c24c07051
commit c77fa067a1
2 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/controllers/api/remote.js
View file

@ -55,11 +55,15 @@ function remoteVideos (req, res, next) {
function addRemoteVideo (videoToCreateData, callback) {
logger.debug('Adding remote video %s.', videoToCreateData.magnetUri)
// Mongoose pre hook will automatically create the thumbnail on disk
videoToCreateData.thumbnail = videoToCreateData.thumbnailBase64
const video = new Video(videoToCreateData)
video.save(callback)
Video.generateThumbnailFromBase64(video, videoToCreateData.thumbnailBase64, function (err) {
if (err) {
logger.error('Cannot generate thumbnail from base 64 data.', { error: err })
return callback(err)
}
video.save(callback)
})
}
function removeRemoteVideo (videoToRemoveData, fromHost, callback) {

31
server/models/video.js
View file

@ -57,6 +57,7 @@ VideoSchema.methods = {
}
VideoSchema.statics = {
generateThumbnailFromBase64,
getDurationFromFile,
listForApi,
listByHostAndRemoteId,
@ -136,10 +137,10 @@ VideoSchema.pre('save', function (next) {
}
)
parallel(tasks, next)
} else {
generateThumbnailFromBase64(video, video.thumbnail, next)
return parallel(tasks, next)
}
return next()
})
mongoose.model('Video', VideoSchema)
@ -251,6 +252,18 @@ function toRemoteJSON (callback) {
// ------------------------------ STATICS ------------------------------
function generateThumbnailFromBase64 (video, thumbnailData, callback) {
// Creating the thumbnail for a remote video
const thumbnailName = video.getThumbnailName()
const thumbnailPath = constants.CONFIG.STORAGE.THUMBNAILS_DIR + thumbnailName
fs.writeFile(thumbnailPath, thumbnailData, { encoding: 'base64' }, function (err) {
if (err) return callback(err)
return callback(null, thumbnailName)
})
}
function getDurationFromFile (videoPath, callback) {
ffmpeg.ffprobe(videoPath, function (err, metadata) {
if (err) return callback(err)
@ -333,18 +346,6 @@ function createThumbnail (video, videoPath, callback) {
generateImage(video, videoPath, constants.CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName(), constants.THUMBNAILS_SIZE, callback)
}
function generateThumbnailFromBase64 (video, thumbnailData, callback) {
// Creating the thumbnail for this remote video)
const thumbnailName = video.getThumbnailName()
const thumbnailPath = constants.CONFIG.STORAGE.THUMBNAILS_DIR + thumbnailName
fs.writeFile(thumbnailPath, thumbnailData, { encoding: 'base64' }, function (err) {
if (err) return callback(err)
return callback(null, thumbnailName)
})
}
function generateImage (video, videoPath, folder, imageName, size, callback) {
const options = {
filename: imageName,