New directory organization

diff --git a/Gruntfile.js b/Gruntfile.js
index a8fcbb609a85b0e2279aedb978b2a1c9112013c6..6df0c023aa942e9a608eb4de2049e2c475ecc251 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,8 +8,7 @@ module.exports = function (grunt) {
     scss: 'public/stylesheets/application.scss',
     vendor: 'public/stylesheets/vendor',
     js: 'public/javascripts/*.js',
-    src: 'src/*.js',
-    routes: 'routes/**/*.js',
+    routes: 'controllers/**/*.js',
     main: './server.js',
     browserified: 'public/javascripts/bundle.js',
     img: 'public/images/*.{png,jpg,jpeg,gif,webp,svg}',

diff --git a/routes/api/v1/index.js b/controllers/api/v1/index.js
similarity index 100%
rename from routes/api/v1/index.js
rename to controllers/api/v1/index.js

diff --git a/routes/api/v1/pods.js b/controllers/api/v1/pods.js
similarity index 97%
rename from routes/api/v1/pods.js
rename to controllers/api/v1/pods.js
index 2430b0d7eebb73b6f7b495d5616536ae6a96f2ba..30385bd5a7bd438c3577b2075383cd5f927e097c 100644 (file)
--- a/routes/api/v1/pods.js
+++ b/controllers/api/v1/pods.js
@@ -7,7 +7,7 @@
   var miscMiddleware = middleware.misc
   var reqValidator = middleware.reqValidators.pods
   var secureRequest = middleware.reqValidators.remote.secureRequest
-  var pods = require('../../../src/pods')
+  var pods = require('../../../models/pods')
 
   function listPods (req, res, next) {
     pods.list(function (err, pods_list) {

diff --git a/routes/api/v1/remoteVideos.js b/controllers/api/v1/remoteVideos.js
similarity index 95%
rename from routes/api/v1/remoteVideos.js
rename to controllers/api/v1/remoteVideos.js
index 6ba6ce17b8a6593713f5a36de0dc9e56d8853683..d534d679237bb9cfdef84d0c1ef39558c64108d7 100644 (file)
--- a/routes/api/v1/remoteVideos.js
+++ b/controllers/api/v1/remoteVideos.js
@@ -8,7 +8,7 @@
   var middleware = require('../../../middlewares')
   var miscMiddleware = middleware.misc
   var reqValidator = middleware.reqValidators.remote
-  var videos = require('../../../src/videos')
+  var videos = require('../../../models/videos')
 
   function addRemoteVideos (req, res, next) {
     videos.addRemotes(req.body.data, function (err, videos) {

diff --git a/routes/api/v1/videos.js b/controllers/api/v1/videos.js
similarity index 98%
rename from routes/api/v1/videos.js
rename to controllers/api/v1/videos.js
index 95c1dffc7dea1f3e258e9daf681f104ef00f73a5..aa8cb466be026e7be9e7613c34e9d8de6b9fa1f4 100644 (file)
--- a/routes/api/v1/videos.js
+++ b/controllers/api/v1/videos.js
@@ -10,7 +10,7 @@
   var middleware = require('../../../middlewares')
   var miscMiddleware = middleware.misc
   var reqValidator = middleware.reqValidators.videos
-  var videos = require('../../../src/videos')
+  var videos = require('../../../models/videos')
 
   var uploads = config.get('storage.uploads')
 

diff --git a/routes/index.js b/controllers/index.js
similarity index 75%
rename from routes/index.js
rename to controllers/index.js
index f45aa7ba57f2bd7b453009818ea7ea30084e2f60..7dca002ff6b7d64506e88dbb2533717e1689e702 100644 (file)
--- a/routes/index.js
+++ b/controllers/index.js
@@ -1,7 +1,7 @@
 ;(function () {
   'use strict'
 
-  var constants = require('../src/constants')
+  var constants = require('../initializers/constants')
 
   var routes = {
     api: require('./api/' + constants.API_VERSION),

diff --git a/routes/views.js b/controllers/views.js
similarity index 100%
rename from routes/views.js
rename to controllers/views.js

diff --git a/src/customValidators.js b/helpers/customValidators.js
similarity index 100%
rename from src/customValidators.js
rename to helpers/customValidators.js

diff --git a/src/logger.js b/helpers/logger.js
similarity index 100%
rename from src/logger.js
rename to helpers/logger.js

diff --git a/src/utils.js b/helpers/utils.js
similarity index 99%
rename from src/utils.js
rename to helpers/utils.js
index 176648a312b0a7229f711b9585c41d067300055f..7cdb2600d40ba19bc5beca4d8bc7315f3c682cd9 100644 (file)
--- a/src/utils.js
+++ b/helpers/utils.js
@@ -10,7 +10,7 @@
   var replay = require('request-replay')
   var ursa = require('ursa')
 
-  var constants = require('./constants')
+  var constants = require('../initializers/constants')
   var logger = require('./logger')
 
   var utils = {}

diff --git a/src/checker.js b/initializers/checker.js
similarity index 100%
rename from src/checker.js
rename to initializers/checker.js

diff --git a/src/constants.js b/initializers/constants.js
similarity index 100%
rename from src/constants.js
rename to initializers/constants.js

diff --git a/src/database.js b/initializers/database.js
similarity index 97%
rename from src/database.js
rename to initializers/database.js
index e03176b31e9a0f6fc16be6457b060c94a5985ac1..4570d37395d6b8586aa01ba81afd087c7808c272 100644 (file)
--- a/src/database.js
+++ b/initializers/database.js
@@ -5,7 +5,7 @@
   var mongoose = require('mongoose')
 
   var constants = require('./constants')
-  var logger = require('./logger')
+  var logger = require('../helpers/logger')
 
   var dbname = 'peertube' + config.get('database.suffix')
   var host = config.get('database.host')

diff --git a/src/poolRequests.js b/lib/poolRequests.js
similarity index 96%
rename from src/poolRequests.js
rename to lib/poolRequests.js
index 7f422f372657cabfcaac98b7cf3aff67a8e6d750..9c7f3238bb03af059615433d2110dc3fae1d6814 100644 (file)
--- a/src/poolRequests.js
+++ b/lib/poolRequests.js
@@ -3,13 +3,13 @@
 
   var async = require('async')
 
-  var constants = require('./constants')
-  var logger = require('./logger')
-  var database = require('./database')
+  var constants = require('../initializers/constants')
+  var logger = require('../helpers/logger')
+  var database = require('../initializers/database')
   var pluck = require('lodash-node/compat/collection/pluck')
   var PoolRequestsDB = database.PoolRequestsDB
   var PodsDB = database.PodsDB
-  var utils = require('./utils')
+  var utils = require('../helpers/utils')
   var VideosDB = database.VideosDB
 
   var poolRequests = {}

diff --git a/src/webTorrentNode.js b/lib/webTorrentNode.js
similarity index 99%
rename from src/webTorrentNode.js
rename to lib/webTorrentNode.js
index d6801d0fb32a958e49bbbc0dfedea145874cf8e6..8827c68c56b6231b1b381d23c0cc129513ec7728 100644 (file)
--- a/src/webTorrentNode.js
+++ b/lib/webTorrentNode.js
@@ -6,7 +6,7 @@
   var pathUtils = require('path')
   var spawn = require('electron-spawn')
 
-  var logger = require('./logger')
+  var logger = require('../helpers/logger')
 
   var host = config.get('webserver.host')
   var port = config.get('webserver.port')

diff --git a/src/webtorrent.js b/lib/webtorrent.js
similarity index 100%
rename from src/webtorrent.js
rename to lib/webtorrent.js

diff --git a/middlewares/misc.js b/middlewares/misc.js
index c10b0792a97045dd6f7485406d5f5195ae6d5697..f814acd9f0bae62e82e1be15466b8514fa4507ac 100644 (file)
--- a/middlewares/misc.js
+++ b/middlewares/misc.js
@@ -4,9 +4,9 @@
   var ursa = require('ursa')
   var fs = require('fs')
 
-  var logger = require('../src/logger')
-  var utils = require('../src/utils')
-  var PodsDB = require('../src/database').PodsDB
+  var logger = require('../helpers/logger')
+  var utils = require('../helpers/utils')
+  var PodsDB = require('../initializers/database').PodsDB
 
   var misc = {}
 

diff --git a/middlewares/reqValidators/pods.js b/middlewares/reqValidators/pods.js
index 31eaf84493e705c1b4674998441df0a994fed8a6..0d023842d27793621556946f1f941cbb635fb523 100644 (file)
--- a/middlewares/reqValidators/pods.js
+++ b/middlewares/reqValidators/pods.js
@@ -2,7 +2,7 @@
   'use strict'
 
   var checkErrors = require('./utils').checkErrors
-  var logger = require('../../src/logger')
+  var logger = require('../../helpers/logger')
 
   var pods = {}
 

diff --git a/middlewares/reqValidators/remote.js b/middlewares/reqValidators/remote.js
index a9d2cdf20e478f3f9e93408964def279ba4c0c8e..4b161e292c0a7466c20724eae4504a9d5e3b0dd0 100644 (file)
--- a/middlewares/reqValidators/remote.js
+++ b/middlewares/reqValidators/remote.js
@@ -2,7 +2,7 @@
   'use strict'
 
   var checkErrors = require('./utils').checkErrors
-  var logger = require('../../src/logger')
+  var logger = require('../../helpers/logger')
 
   var remote = {}
 

diff --git a/middlewares/reqValidators/utils.js b/middlewares/reqValidators/utils.js
index 91ead27a5bfda78f10fd3ab2c17732b3a7c475a7..5bc9f4f0b72c7492ab58678fb6cd3cbda549b805 100644 (file)
--- a/middlewares/reqValidators/utils.js
+++ b/middlewares/reqValidators/utils.js
@@ -2,7 +2,7 @@
   'use strict'
 
   var util = require('util')
-  var logger = require('../../src/logger')
+  var logger = require('../../helpers/logger')
 
   var utils = {}
 

diff --git a/middlewares/reqValidators/videos.js b/middlewares/reqValidators/videos.js
index 8c4e23b6b427e4f198dc7076215d0f9e8cd5db0c..a34445f7ab082e5a9cf1f949f5b941387f2ba842 100644 (file)
--- a/middlewares/reqValidators/videos.js
+++ b/middlewares/reqValidators/videos.js
@@ -2,8 +2,8 @@
   'use strict'
 
   var checkErrors = require('./utils').checkErrors
-  var VideosDB = require('../../src/database').VideosDB
-  var logger = require('../../src/logger')
+  var VideosDB = require('../../initializers/database').VideosDB
+  var logger = require('../../helpers/logger')
 
   var videos = {}
 

diff --git a/src/pods.js b/models/pods.js
similarity index 96%
rename from src/pods.js
rename to models/pods.js
index defa9b1c1e8691bd7187a83cebc3f8ac3c9982de..c8d08b26f6b7a4b6ca3bec75ba84ebc1c736576b 100644 (file)
--- a/src/pods.js
+++ b/models/pods.js
@@ -6,11 +6,11 @@
   var fs = require('fs')
   var request = require('request')
 
-  var constants = require('./constants')
-  var logger = require('./logger')
-  var PodsDB = require('./database').PodsDB
-  var poolRequests = require('./poolRequests')
-  var utils = require('./utils')
+  var constants = require('../initializers/constants')
+  var logger = require('../helpers/logger')
+  var PodsDB = require('../initializers/database').PodsDB
+  var poolRequests = require('../lib/poolRequests')
+  var utils = require('../helpers/utils')
 
   var pods = {}
 

diff --git a/src/videos.js b/models/videos.js
similarity index 97%
rename from src/videos.js
rename to models/videos.js
index 90821fdf679f75a52aad995efbdb45e7aab8a7f7..626c5581900730c8deb9e38898ceffedbee217de 100644 (file)
--- a/src/videos.js
+++ b/models/videos.js
@@ -5,11 +5,11 @@
   var config = require('config')
   var dz = require('dezalgo')
   var fs = require('fs')
-  var webtorrent = require('./webTorrentNode')
+  var webtorrent = require('../lib/webTorrentNode')
 
-  var logger = require('./logger')
+  var logger = require('../helpers/logger')
   var pods = require('./pods')
-  var VideosDB = require('./database').VideosDB
+  var VideosDB = require('../initializers/database').VideosDB
 
   var videos = {}
 

diff --git a/package.json b/package.json
index f04d974239384db36b5916f7a79bb92d6e674214..cd6e3636982c90d7cf5ca19210a7734b3fe6ef8f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "start": "grunt dev",
-    "test": "grunt build && standard && mocha test"
+    "test": "grunt build && standard && mocha tests"
   },
   "dependencies": {
     "async": "^1.2.1",

diff --git a/server.js b/server.js
index ad57649b24eaafb75889634a6bae258e0e6dc67a..1e0222f4f1dfd3615405b35df09a40b7185b3579 100644 (file)
--- a/server.js
+++ b/server.js
@@ -15,7 +15,7 @@
   var app = express()
 
   // ----------- Checker -----------
-  var checker = require('./src/checker')
+  var checker = require('./initializers/checker')
 
   var miss = checker.checkConfig()
   if (miss.length !== 0) {
@@ -28,14 +28,14 @@
 
   // ----------- PeerTube modules -----------
   var config = require('config')
-  var constants = require('./src/constants')
-  var customValidators = require('./src/customValidators')
-  var logger = require('./src/logger')
-  var poolRequests = require('./src/poolRequests')
-  var routes = require('./routes')
-  var utils = require('./src/utils')
-  var videos = require('./src/videos')
-  var webtorrent = require('./src/webTorrentNode')
+  var constants = require('./initializers/constants')
+  var customValidators = require('./helpers/customValidators')
+  var logger = require('./helpers/logger')
+  var poolRequests = require('./lib/poolRequests')
+  var routes = require('./controllers')
+  var utils = require('./helpers/utils')
+  var videos = require('./models/videos')
+  var webtorrent = require('./lib/webTorrentNode')
 
   // Get configurations
   var port = config.get('listen.port')

diff --git a/test/api/checkParams.js b/tests/api/checkParams.js
similarity index 100%
rename from test/api/checkParams.js
rename to tests/api/checkParams.js

diff --git a/test/api/fixtures/video_short.mp4 b/tests/api/fixtures/video_short.mp4
similarity index 100%
rename from test/api/fixtures/video_short.mp4
rename to tests/api/fixtures/video_short.mp4

diff --git a/test/api/fixtures/video_short.ogv b/tests/api/fixtures/video_short.ogv
similarity index 100%
rename from test/api/fixtures/video_short.ogv
rename to tests/api/fixtures/video_short.ogv

diff --git a/test/api/fixtures/video_short.webm b/tests/api/fixtures/video_short.webm
similarity index 100%
rename from test/api/fixtures/video_short.webm
rename to tests/api/fixtures/video_short.webm

diff --git a/test/api/fixtures/video_short1.webm b/tests/api/fixtures/video_short1.webm
similarity index 100%
rename from test/api/fixtures/video_short1.webm
rename to tests/api/fixtures/video_short1.webm

diff --git a/test/api/fixtures/video_short2.webm b/tests/api/fixtures/video_short2.webm
similarity index 100%
rename from test/api/fixtures/video_short2.webm
rename to tests/api/fixtures/video_short2.webm

diff --git a/test/api/fixtures/video_short3.webm b/tests/api/fixtures/video_short3.webm
similarity index 100%
rename from test/api/fixtures/video_short3.webm
rename to tests/api/fixtures/video_short3.webm

diff --git a/test/api/fixtures/video_short_fake.webm b/tests/api/fixtures/video_short_fake.webm
similarity index 100%
rename from test/api/fixtures/video_short_fake.webm
rename to tests/api/fixtures/video_short_fake.webm

diff --git a/test/api/friendsAdvanced.js b/tests/api/friendsAdvanced.js
similarity index 100%
rename from test/api/friendsAdvanced.js
rename to tests/api/friendsAdvanced.js

diff --git a/test/api/friendsBasic.js b/tests/api/friendsBasic.js
similarity index 100%
rename from test/api/friendsBasic.js
rename to tests/api/friendsBasic.js

diff --git a/test/api/index.js b/tests/api/index.js
similarity index 100%
rename from test/api/index.js
rename to tests/api/index.js

diff --git a/test/api/multiplePods.js b/tests/api/multiplePods.js
similarity index 99%
rename from test/api/multiplePods.js
rename to tests/api/multiplePods.js
index b579e5e32862b1ceab7eeb3a94f0295ff6c13853..c27f7121edde5b9dbda69d3491f8684ebfd09fe0 100644 (file)
--- a/test/api/multiplePods.js
+++ b/tests/api/multiplePods.js
@@ -6,7 +6,7 @@
   var expect = chai.expect
 
   var utils = require('./utils')
-  var webtorrent = require(__dirname + '/../../src/webTorrentNode')
+  var webtorrent = require(__dirname + '/../../lib/webTorrentNode')
   webtorrent.silent = true
 
   describe('Test multiple pods', function () {

diff --git a/test/api/singlePod.js b/tests/api/singlePod.js
similarity index 98%
rename from test/api/singlePod.js
rename to tests/api/singlePod.js
index a8ae43aee207ac32e19698b49b35079badd05247..ce3ca80f2a6bea4a853840cedd7a2c547c401b22 100644 (file)
--- a/test/api/singlePod.js
+++ b/tests/api/singlePod.js
@@ -6,7 +6,7 @@
   var fs = require('fs')
   var expect = chai.expect
 
-  var webtorrent = require(__dirname + '/../../src/webTorrentNode')
+  var webtorrent = require(__dirname + '/../../lib/webTorrentNode')
   webtorrent.silent = true
 
   var utils = require('./utils')

diff --git a/test/api/utils.js b/tests/api/utils.js
similarity index 100%
rename from test/api/utils.js
rename to tests/api/utils.js

diff --git a/test/index.js b/tests/index.js
similarity index 100%
rename from test/index.js
rename to tests/index.js