From 5f698b82c7055df763f3830882ac5bad1397db23 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 1 Jul 2016 16:22:36 +0200 Subject: [PATCH] Use dashes for filenames --- server.js | 2 +- server/helpers/{customValidators.js => custom-validators.js} | 0 server/helpers/{peertubeCrypto.js => peertube-crypto.js} | 0 server/helpers/requests.js | 2 +- server/initializers/installer.js | 2 +- server/lib/friends.js | 2 +- server/lib/{webtorrentProcess.js => webtorrent-process.js} | 0 server/lib/webtorrent.js | 2 +- server/middlewares/secure.js | 2 +- server/middlewares/validators/videos.js | 2 +- server/models/video.js | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename server/helpers/{customValidators.js => custom-validators.js} (100%) rename server/helpers/{peertubeCrypto.js => peertube-crypto.js} (100%) rename server/lib/{webtorrentProcess.js => webtorrent-process.js} (100%) diff --git a/server.js b/server.js index e0284b080..b2eeeff70 100644 --- a/server.js +++ b/server.js @@ -30,7 +30,7 @@ if (miss.length !== 0) { } // ----------- PeerTube modules ----------- -const customValidators = require('./server/helpers/customValidators') +const customValidators = require('./server/helpers/custom-validators') const installer = require('./server/initializers/installer') const mongoose = require('mongoose') const routes = require('./server/controllers') diff --git a/server/helpers/customValidators.js b/server/helpers/custom-validators.js similarity index 100% rename from server/helpers/customValidators.js rename to server/helpers/custom-validators.js diff --git a/server/helpers/peertubeCrypto.js b/server/helpers/peertube-crypto.js similarity index 100% rename from server/helpers/peertubeCrypto.js rename to server/helpers/peertube-crypto.js diff --git a/server/helpers/requests.js b/server/helpers/requests.js index 871342d60..547230adc 100644 --- a/server/helpers/requests.js +++ b/server/helpers/requests.js @@ -5,7 +5,7 @@ const replay = require('request-replay') const request = require('request') const constants = require('../initializers/constants') -const peertubeCrypto = require('./peertubeCrypto') +const peertubeCrypto = require('./peertube-crypto') const http = config.get('webserver.https') ? 'https' : 'http' const host = config.get('webserver.host') diff --git a/server/initializers/installer.js b/server/initializers/installer.js index e0ae822cf..014efbcb7 100644 --- a/server/initializers/installer.js +++ b/server/initializers/installer.js @@ -9,7 +9,7 @@ const path = require('path') const checker = require('./checker') const logger = require('../helpers/logger') -const peertubeCrypto = require('../helpers/peertubeCrypto') +const peertubeCrypto = require('../helpers/peertube-crypto') const Client = mongoose.model('OAuthClient') const User = mongoose.model('User') diff --git a/server/lib/friends.js b/server/lib/friends.js index a93467c13..a85f4e19a 100644 --- a/server/lib/friends.js +++ b/server/lib/friends.js @@ -8,7 +8,7 @@ const request = require('request') const constants = require('../initializers/constants') const logger = require('../helpers/logger') -const peertubeCrypto = require('../helpers/peertubeCrypto') +const peertubeCrypto = require('../helpers/peertube-crypto') const requests = require('../helpers/requests') const http = config.get('webserver.https') ? 'https' : 'http' diff --git a/server/lib/webtorrentProcess.js b/server/lib/webtorrent-process.js similarity index 100% rename from server/lib/webtorrentProcess.js rename to server/lib/webtorrent-process.js diff --git a/server/lib/webtorrent.js b/server/lib/webtorrent.js index fe2ee357f..9960737f2 100644 --- a/server/lib/webtorrent.js +++ b/server/lib/webtorrent.js @@ -57,7 +57,7 @@ function create (options, callback) { throw new Error('Received exception error from webtorrent process : ' + data.exception) }) - const webtorrentProcess = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true }) + const webtorrentProcess = spawn(pathUtils.join(__dirname, 'webtorrent-process.js'), host, port, { detached: true }) if (electronDebug === true) { webtorrentProcess.stderr.on('data', function (data) { diff --git a/server/middlewares/secure.js b/server/middlewares/secure.js index fbaf4d0f2..9779c14ac 100644 --- a/server/middlewares/secure.js +++ b/server/middlewares/secure.js @@ -2,7 +2,7 @@ const logger = require('../helpers/logger') const mongoose = require('mongoose') -const peertubeCrypto = require('../helpers/peertubeCrypto') +const peertubeCrypto = require('../helpers/peertube-crypto') const Pod = mongoose.model('Pod') diff --git a/server/middlewares/validators/videos.js b/server/middlewares/validators/videos.js index 24e2299dc..3e2af06fb 100644 --- a/server/middlewares/validators/videos.js +++ b/server/middlewares/validators/videos.js @@ -4,7 +4,7 @@ const mongoose = require('mongoose') const checkErrors = require('./utils').checkErrors const constants = require('../../initializers/constants') -const customValidators = require('../../helpers/customValidators') +const customValidators = require('../../helpers/custom-validators') const logger = require('../../helpers/logger') const Video = mongoose.model('Video') diff --git a/server/models/video.js b/server/models/video.js index a8a70ba89..1c06e477c 100644 --- a/server/models/video.js +++ b/server/models/video.js @@ -8,7 +8,7 @@ const pathUtils = require('path') const mongoose = require('mongoose') const constants = require('../initializers/constants') -const customValidators = require('../helpers/customValidators') +const customValidators = require('../helpers/custom-validators') const logger = require('../helpers/logger') const utils = require('../helpers/utils') const webtorrent = require('../lib/webtorrent') -- 2.25.1