forks/peertube
1
0
Fork 0
Code Releases Activity

Standard v6

Browse source
This commit is contained in:
Chocobozzz 2016-02-07 10:39:37 +01:00
parent c5a8be2b62
commit b3077e4170
12 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
helpers/logger.js
View file

@ -3,15 +3,16 @@
'use strict'
var config = require('config')
var path = require('path')
var winston = require('winston')
winston.emitErrs = true
var logDir = __dirname + '/../' + config.get('storage.logs')
var logDir = path.join(__dirname, '..', config.get('storage.logs'))
var logger = new winston.Logger({
transports: [
new winston.transports.File({
level: 'debug',
filename: logDir + '/all-logs.log',
filename: path.join(logDir, 'all-logs.log'),
handleExceptions: true,
json: true,
maxsize: 5242880,

3
helpers/peertubeCrypto.js
View file

@ -5,11 +5,12 @@
var crypto = require('crypto')
var fs = require('fs')
var openssl = require('openssl-wrapper')
var path = require('path')
var ursa = require('ursa')
var logger = require('./logger')
var certDir = __dirname + '/../' + config.get('storage.certs')
var certDir = path.join(__dirname, '..', config.get('storage.certs'))
var algorithm = 'aes-256-ctr'
var peertubeCrypto = {

5
initializers/checker.js
View file

@ -3,6 +3,7 @@
var config = require('config')
var mkdirp = require('mkdirp')
var path = require('path')
var checker = {
checkConfig: checkConfig,
@ -32,9 +33,9 @@
var storages = config.get('storage')
for (var key of Object.keys(storages)) {
var path = storages[key]
var dir = storages[key]
try {
mkdirp.sync(__dirname + '/../' + path)
mkdirp.sync(path.join(__dirname, '..', dir))
} catch (error) {
// Do not use logger
console.error('Cannot create ' + path + ':' + error)

4
lib/poolRequests.js
View file

@ -41,7 +41,7 @@
}
// Remove the request of the other type
PoolRequests.removeById(id, function (err) {
PoolRequests.removeRequestById(id, function (err) {
if (err) {
logger.error('Cannot remove a pool request.', { error: err })
return // Abort
@ -49,7 +49,7 @@
})
} else {
PoolRequests.create(id, type, request, function (err) {
logger.error('Cannot create a pool request.', { error: err })
if (err) logger.error('Cannot create a pool request.', { error: err })
return // Abort
})
}

3
lib/videos.js
View file

@ -3,12 +3,13 @@
var async = require('async')
var config = require('config')
var path = require('path')
var webtorrent = require('../lib/webtorrent')
var logger = require('../helpers/logger')
var Videos = require('../models/videos')
var uploadDir = __dirname + '/../' + config.get('storage.uploads')
var uploadDir = path.join(__dirname, '..', config.get('storage.uploads'))
var videos = {
seed: seed,

2
lib/webtorrent.js
View file

@ -59,7 +59,7 @@
process.exit()
})
var webtorrent_process = spawn(__dirname + '/webtorrentProcess.js', host, port, { detached: true })
var webtorrent_process = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true })
webtorrent_process.stderr.on('data', function (data) {
// logger.debug('Webtorrent process stderr: ', data.toString())
})

3
models/videos.js
View file

@ -6,13 +6,14 @@
var dz = require('dezalgo')
var fs = require('fs')
var mongoose = require('mongoose')
var path = require('path')
var logger = require('../helpers/logger')
var http = config.get('webserver.https') === true ? 'https' : 'http'
var host = config.get('webserver.host')
var port = config.get('webserver.port')
var uploadDir = __dirname + '/../' + config.get('storage.uploads')
var uploadDir = path.join(__dirname, '..', config.get('storage.uploads'))
// ---------------------------------------------------------------------------

2
package.json
View file

@ -66,7 +66,7 @@
"devDependencies": {
"chai": "^3.3.0",
"mocha": "^2.3.3",
"standard": "^5.1.0",
"standard": "^6.0.1",
"supertest": "^1.1.0"
},
"standard": {

19
tests/api/checkParams.js
View file

@ -4,6 +4,7 @@
var async = require('async')
var chai = require('chai')
var expect = chai.expect
var pathUtils = require('path')
var request = require('supertest')
var utils = require('./utils')
@ -119,7 +120,7 @@
describe('When searching a video', function () {
it('Should fail with nothing', function (done) {
request(url)
.get(path + '/search/')
.get(pathUtils.join(path, 'search'))
.set('Accept', 'application/json')
.expect(400, done)
})
@ -137,7 +138,7 @@
description: 'my super description'
}
var attach = {
'input_video': __dirname + '/fixtures/video_short.webm'
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
}
makePostRequest(path, data, attach, done)
})
@ -148,7 +149,7 @@
description: 'my super description'
}
var attach = {
'input_video': __dirname + '/fixtures/video_short.webm'
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
}
makePostRequest(path, data, attach, done)
})
@ -158,7 +159,7 @@
name: 'my super name'
}
var attach = {
'input_video': __dirname + '/fixtures/video_short.webm'
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
}
makePostRequest(path, data, attach, done)
})
@ -171,7 +172,7 @@
'very very very very very very very very very very very very very very very long'
}
var attach = {
'input_video': __dirname + '/fixtures/video_short.webm'
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
}
makePostRequest(path, data, attach, done)
})
@ -191,7 +192,7 @@
description: 'my super description'
}
var attach = {
'input_video': __dirname + '/../fixtures/video_short_fake.webm'
'input_video': pathUtils.join(__dirname, '..', 'fixtures', 'video_short_fake.webm')
}
makePostRequest(path, data, attach, done)
})
@ -202,12 +203,12 @@
description: 'my super description'
}
var attach = {
'input_video': __dirname + '/fixtures/video_short.webm'
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
}
makePostRequest(path, data, attach, function () {
attach.input_video = __dirname + '/fixtures/video_short.mp4'
attach.input_video = pathUtils.join(__dirname, 'fixtures', 'video_short.mp4')
makePostRequest(path, data, attach, function () {
attach.input_video = __dirname + '/fixtures/video_short.ogv'
attach.input_video = pathUtils.join(__dirname, 'fixtures', 'video_short.ogv')
makePostRequest(path, data, attach, done, true)
}, true)
}, true)

3
tests/api/multiplePods.js
View file

@ -4,9 +4,10 @@
var async = require('async')
var chai = require('chai')
var expect = chai.expect
var pathUtils = require('path')
var utils = require('./utils')
var webtorrent = require(__dirname + '/../../lib/webtorrent')
var webtorrent = require(pathUtils.join(__dirname, '../../lib/webtorrent'))
webtorrent.silent = true
describe('Test multiple pods', function () {

5
tests/api/singlePod.js
View file

@ -5,8 +5,9 @@
var chai = require('chai')
var expect = chai.expect
var fs = require('fs')
var pathUtils = require('path')
var webtorrent = require(__dirname + '/../../lib/webtorrent')
var webtorrent = require(pathUtils.join(__dirname, '../../lib/webtorrent'))
webtorrent.silent = true
var utils = require('./utils')
@ -112,7 +113,7 @@
utils.removeVideo(url, video_id, function (err) {
if (err) throw err
fs.readdir(__dirname + '/../../test1/uploads/', function (err, files) {
fs.readdir(pathUtils.join(__dirname, '../../test1/uploads/'), function (err, files) {
if (err) throw err
expect(files.length).to.equal(0)

7
tests/api/utils.js
View file

@ -4,6 +4,7 @@
var child_process = require('child_process')
var exec = child_process.exec
var fork = child_process.fork
var pathUtils = require('path')
var request = require('supertest')
var testUtils = {
@ -22,7 +23,7 @@
// ---------------------- Export functions --------------------
function flushTests (callback) {
exec(__dirname + '/../../scripts/clean_test.sh', callback)
exec(pathUtils.join(__dirname, '../../scripts/clean_test.sh'), callback)
}
function getFriendsList (url, end) {
@ -139,7 +140,7 @@
detached: true
}
var app = fork(__dirname + '/../../server.js', [], options)
var app = fork(pathUtils.join(__dirname, '../../server.js'), [], options)
app.stdout.on('data', function onStdout (data) {
var dont_continue = false
// Check if all required sentences are here
@ -175,7 +176,7 @@
.set('Accept', 'application/json')
.field('name', name)
.field('description', description)
.attach('input_video', __dirname + '/fixtures/' + fixture)
.attach('input_video', pathUtils.join(__dirname, 'fixtures', fixture))
.expect(201)
.end(end)
}