From b3077e417056f18225957f65419b87de72117fe3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 7 Feb 2016 10:39:37 +0100 Subject: [PATCH] Standard v6 --- helpers/logger.js | 5 +++-- helpers/peertubeCrypto.js | 3 ++- initializers/checker.js | 5 +++-- lib/poolRequests.js | 4 ++-- lib/videos.js | 3 ++- lib/webtorrent.js | 2 +- models/videos.js | 3 ++- package.json | 2 +- tests/api/checkParams.js | 19 ++++++++++--------- tests/api/multiplePods.js | 3 ++- tests/api/singlePod.js | 5 +++-- tests/api/utils.js | 7 ++++--- 12 files changed, 35 insertions(+), 26 deletions(-) diff --git a/helpers/logger.js b/helpers/logger.js index fa5b53708..436091730 100644 --- a/helpers/logger.js +++ b/helpers/logger.js @@ -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, diff --git a/helpers/peertubeCrypto.js b/helpers/peertubeCrypto.js index 36271dba9..9031f6ae5 100644 --- a/helpers/peertubeCrypto.js +++ b/helpers/peertubeCrypto.js @@ -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 = { diff --git a/initializers/checker.js b/initializers/checker.js index 7a09c02d1..f4458c5cf 100644 --- a/initializers/checker.js +++ b/initializers/checker.js @@ -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) diff --git a/lib/poolRequests.js b/lib/poolRequests.js index 5b7d5489d..9ea41f383 100644 --- a/lib/poolRequests.js +++ b/lib/poolRequests.js @@ -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 }) } diff --git a/lib/videos.js b/lib/videos.js index 1bb6f2493..0e8143351 100644 --- a/lib/videos.js +++ b/lib/videos.js @@ -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, diff --git a/lib/webtorrent.js b/lib/webtorrent.js index 7cd38156c..083e5b77a 100644 --- a/lib/webtorrent.js +++ b/lib/webtorrent.js @@ -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()) }) diff --git a/models/videos.js b/models/videos.js index 6ea628373..ea1823e27 100644 --- a/models/videos.js +++ b/models/videos.js @@ -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')) // --------------------------------------------------------------------------- diff --git a/package.json b/package.json index 38ea52b36..07cb00fa5 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/tests/api/checkParams.js b/tests/api/checkParams.js index 11fc68ff9..8ce1bd476 100644 --- a/tests/api/checkParams.js +++ b/tests/api/checkParams.js @@ -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) diff --git a/tests/api/multiplePods.js b/tests/api/multiplePods.js index 5070b450a..7949da80a 100644 --- a/tests/api/multiplePods.js +++ b/tests/api/multiplePods.js @@ -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 () { diff --git a/tests/api/singlePod.js b/tests/api/singlePod.js index e5337256b..f33aa8c7a 100644 --- a/tests/api/singlePod.js +++ b/tests/api/singlePod.js @@ -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) diff --git a/tests/api/utils.js b/tests/api/utils.js index a1996b4d7..b71e943ed 100644 --- a/tests/api/utils.js +++ b/tests/api/utils.js @@ -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) } -- 2.41.0