Video duration support (server)

This commit is contained in:
Chocobozzz 2016-05-03 22:41:46 +02:00
parent 6d8ada5f24
commit 3a8a8b5122
7 changed files with 78 additions and 22 deletions

View File

@ -64,13 +64,15 @@ Thanks to [WebTorrent](https://github.com/feross/webtorrent), we can make P2P (t
* **NodeJS >= 4.2** * **NodeJS >= 4.2**
* OpenSSL (cli) * OpenSSL (cli)
* MongoDB * MongoDB
* xvfb-run libgtk2.0-0 libgconf-2-4 libnss3 libasound2 libxtst6 libxss1 libnotify-bin (for electron) * ffmpeg xvfb-run libgtk2.0-0 libgconf-2-4 libnss3 libasound2 libxtst6 libxss1 libnotify-bin (for electron)
#### Debian #### Debian
Install NodeJS 4.2: [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions) * Install NodeJS 4.2: [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions)
* Add jessie backports to your *source.list*: http://backports.debian.org/Instructions/
# apt-get install mongodb openssl xvfb curl sudo git build-essential libgtk2.0-0 libgconf-2-4 libnss3 libasound2 libxtst6 libxss1 libnotify-bin # apt-get update
# apt-get install ffmpeg mongodb openssl xvfb curl sudo git build-essential libgtk2.0-0 libgconf-2-4 libnss3 libasound2 libxtst6 libxss1 libnotify-bin
# npm install -g electron-prebuilt # npm install -g electron-prebuilt
#### Other distribution... (PR welcome) #### Other distribution... (PR welcome)

View File

@ -52,6 +52,7 @@
"express": "^4.12.4", "express": "^4.12.4",
"express-oauth-server": "https://github.com/Chocobozzz/express-oauth-server", "express-oauth-server": "https://github.com/Chocobozzz/express-oauth-server",
"express-validator": "^2.11.0", "express-validator": "^2.11.0",
"fluent-ffmpeg": "^2.1.0",
"js-yaml": "^3.5.4", "js-yaml": "^3.5.4",
"lodash": "^4.11.1", "lodash": "^4.11.1",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",

View File

@ -3,6 +3,7 @@
const config = require('config') const config = require('config')
const crypto = require('crypto') const crypto = require('crypto')
const express = require('express') const express = require('express')
const ffmpeg = require('fluent-ffmpeg')
const multer = require('multer') const multer = require('multer')
const logger = require('../../../helpers/logger') const logger = require('../../../helpers/logger')
@ -60,12 +61,22 @@ function addVideo (req, res, next) {
return next(err) return next(err)
} }
ffmpeg.ffprobe(video_file.path, function (err, metadata) {
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 = { const video_data = {
name: video_infos.name, name: video_infos.name,
namePath: video_file.filename, namePath: video_file.filename,
description: video_infos.description, description: video_infos.description,
magnetUri: torrent.magnetURI, magnetUri: torrent.magnetURI,
author: res.locals.oauth.token.user.username author: res.locals.oauth.token.user.username,
duration: duration
} }
Videos.add(video_data, function (err) { Videos.add(video_data, function (err) {
@ -82,6 +93,7 @@ function addVideo (req, res, next) {
res.type('json').status(204).end() res.type('json').status(204).end()
}) })
}) })
})
} }
function getVideos (req, res, next) { function getVideos (req, res, next) {
@ -144,7 +156,8 @@ function getFormatedVideo (video_obj) {
podUrl: video_obj.podUrl, podUrl: video_obj.podUrl,
isLocal: videos.getVideoState(video_obj).owned, isLocal: videos.getVideoState(video_obj).owned,
magnetUri: video_obj.magnetUri, magnetUri: video_obj.magnetUri,
author: video_obj.author author: video_obj.author,
duration: video_obj.duration
} }
return formated_video return formated_video

View File

@ -13,7 +13,8 @@ function eachIsRemoteVideosAddValid (values) {
return validator.isLength(val.name, 1, 50) && return validator.isLength(val.name, 1, 50) &&
validator.isLength(val.description, 1, 50) && validator.isLength(val.description, 1, 50) &&
validator.isLength(val.magnetUri, 10) && validator.isLength(val.magnetUri, 10) &&
validator.isURL(val.podUrl) validator.isURL(val.podUrl) &&
!isNaN(val.duration)
}) })
} }

View File

@ -22,7 +22,8 @@ const videosSchema = mongoose.Schema({
description: String, description: String,
magnetUri: String, magnetUri: String,
podUrl: String, podUrl: String,
author: String author: String,
duration: Number
}) })
const VideosDB = mongoose.model('videos', videosSchema) const VideosDB = mongoose.model('videos', videosSchema)
@ -72,7 +73,8 @@ function addRemotes (videos, callback) {
namePath: null, namePath: null,
description: video.description, description: video.description,
magnetUri: video.magnetUri, magnetUri: video.magnetUri,
podUrl: video.podUrl podUrl: video.podUrl,
duration: video.duration
} }
to_add.push(params) to_add.push(params)

View File

@ -95,6 +95,7 @@ describe('Test multiple pods', function () {
expect(video.description).to.equal('my super description for pod 1') expect(video.description).to.equal('my super description for pod 1')
expect(video.podUrl).to.equal('http://localhost:9001') expect(video.podUrl).to.equal('http://localhost:9001')
expect(video.magnetUri).to.exist expect(video.magnetUri).to.exist
expect(video.duration).to.equal(10)
if (server.url !== 'http://localhost:9001') { if (server.url !== 'http://localhost:9001') {
expect(video.isLocal).to.be.false expect(video.isLocal).to.be.false
@ -144,6 +145,7 @@ describe('Test multiple pods', function () {
expect(video.description).to.equal('my super description for pod 2') expect(video.description).to.equal('my super description for pod 2')
expect(video.podUrl).to.equal('http://localhost:9002') expect(video.podUrl).to.equal('http://localhost:9002')
expect(video.magnetUri).to.exist expect(video.magnetUri).to.exist
expect(video.duration).to.equal(5)
if (server.url !== 'http://localhost:9002') { if (server.url !== 'http://localhost:9002') {
expect(video.isLocal).to.be.false expect(video.isLocal).to.be.false
@ -190,17 +192,20 @@ describe('Test multiple pods', function () {
const videos = res.body const videos = res.body
expect(videos).to.be.an('array') expect(videos).to.be.an('array')
expect(videos.length).to.equal(4) expect(videos.length).to.equal(4)
const video1 = videos[2] const video1 = videos[2]
expect(video1.name).to.equal('my super name for pod 3') expect(video1.name).to.equal('my super name for pod 3')
expect(video1.description).to.equal('my super description for pod 3') expect(video1.description).to.equal('my super description for pod 3')
expect(video1.podUrl).to.equal('http://localhost:9003') expect(video1.podUrl).to.equal('http://localhost:9003')
expect(video1.magnetUri).to.exist expect(video1.magnetUri).to.exist
expect(video1.duration).to.equal(5)
const video2 = videos[3] const video2 = videos[3]
expect(video2.name).to.equal('my super name for pod 3-2') expect(video2.name).to.equal('my super name for pod 3-2')
expect(video2.description).to.equal('my super description for pod 3-2') expect(video2.description).to.equal('my super description for pod 3-2')
expect(video2.podUrl).to.equal('http://localhost:9003') expect(video2.podUrl).to.equal('http://localhost:9003')
expect(video2.magnetUri).to.exist expect(video2.magnetUri).to.exist
expect(video2.duration).to.equal(5)
if (server.url !== 'http://localhost:9003') { if (server.url !== 'http://localhost:9003') {
expect(video1.isLocal).to.be.false expect(video1.isLocal).to.be.false

View File

@ -4,6 +4,7 @@ const async = require('async')
const chai = require('chai') const chai = require('chai')
const expect = chai.expect const expect = chai.expect
const fs = require('fs') const fs = require('fs')
const keyBy = require('lodash/keyBy')
const pathUtils = require('path') const pathUtils = require('path')
const webtorrent = require(pathUtils.join(__dirname, '../../lib/webtorrent')) const webtorrent = require(pathUtils.join(__dirname, '../../lib/webtorrent'))
@ -165,6 +166,37 @@ describe('Test a single pod', function () {
}) })
}) })
it('Should upload 6 videos', function (done) {
this.timeout(25000)
const videos = [
'video_short.mp4', 'video_short.ogv', 'video_short.webm',
'video_short1.webm', 'video_short2.webm', 'video_short3.webm'
]
async.each(videos, function (video, callback_each) {
utils.uploadVideo(server.url, server.access_token, video + ' name', video + ' description', video, callback_each)
}, done)
})
it('Should have the correct durations', function (done) {
utils.getVideosList(server.url, function (err, res) {
if (err) throw err
const videos = res.body
expect(videos).to.be.an('array')
expect(videos.length).to.equal(6)
const videos_by_name = keyBy(videos, 'name')
expect(videos_by_name['video_short.mp4 name'].duration).to.equal(5)
expect(videos_by_name['video_short.ogv name'].duration).to.equal(5)
expect(videos_by_name['video_short.webm name'].duration).to.equal(5)
expect(videos_by_name['video_short1.webm name'].duration).to.equal(10)
expect(videos_by_name['video_short2.webm name'].duration).to.equal(5)
expect(videos_by_name['video_short3.webm name'].duration).to.equal(5)
done()
})
})
after(function (done) { after(function (done) {
process.kill(-server.app.pid) process.kill(-server.app.pid)
process.kill(-webtorrent.app.pid) process.kill(-webtorrent.app.pid)