forks/peertube
1
0
Fork 0
Code Releases Activity

Move video duration logic in lib/

Browse source
This commit is contained in:
Chocobozzz 2016-05-06 14:44:09 +02:00
parent ae852eaf2d
commit 0ae6a09d40
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/controllers/api/v1/videos.js
View file

@ -3,7 +3,6 @@
const config = require('config')
const crypto = require('crypto')
const express = require('express')
const ffmpeg = require('fluent-ffmpeg')
const multer = require('multer')
const logger = require('../../../helpers/logger')
@ -61,15 +60,13 @@ function addVideo (req, res, next) {
return next(err)
}
ffmpeg.ffprobe(video_file.path, function (err, metadata) {
videos.getVideoDuration(video_file.path, function (err, duration) {
if (err) {
// TODO: unseed the video
logger.error('Cannot retrieve metadata of the file')
return next(err)
}
const duration = Math.floor(metadata.format.duration)
const video_data = {
name: video_infos.name,
namePath: video_file.filename,

10
server/lib/videos.js
View file

@ -2,6 +2,7 @@
const async = require('async')
const config = require('config')
const ffmpeg = require('fluent-ffmpeg')
const pathUtils = require('path')
const webtorrent = require('../lib/webtorrent')
@ -11,11 +12,20 @@ const Videos = require('../models/videos')
const uploadDir = pathUtils.join(__dirname, '..', '..', config.get('storage.uploads'))
const videos = {
getVideoDuration: getVideoDuration,
getVideoState: getVideoState,
seed: seed,
seedAllExisting: seedAllExisting
}
function getVideoDuration (video_path, callback) {
ffmpeg.ffprobe(video_path, function (err, metadata) {
if (err) return callback(err)
return callback(null, Math.floor(metadata.format.duration))
})
}
function getVideoState (video) {
const exist = (video !== null)
let owned = false