Infile code reorganization

1 files changed, 30 insertions, 21 deletions

diff --git a/middlewares/reqValidators/videos.js b/middlewares/reqValidators/videos.js
index a34445f7a..3479c47c3 100644
--- a/middlewares/reqValidators/videos.js
+++ b/middlewares/reqValidators/videos.js
@@ -2,28 +2,17 @@
   'use strict'
 
   var checkErrors = require('./utils').checkErrors
-  var VideosDB = require('../../initializers/database').VideosDB
   var logger = require('../../helpers/logger')
+  var VideosDB = require('../../initializers/database').VideosDB
 
-  var videos = {}
-
-  function findVideoById (id, callback) {
-    VideosDB.findById(id, { _id: 1, namePath: 1 }).limit(1).exec(function (err, video) {
-      if (err) throw err
-
-      callback(video)
-    })
-  }
-
-  videos.videosSearch = function (req, res, next) {
-    req.checkParams('name', 'Should have a name').notEmpty()
-
-    logger.debug('Checking videosSearch parameters', { parameters: req.params })
-
-    checkErrors(req, res, next)
+  var reqValidatorsVideos = {
+    videosAdd: videosAdd,
+    videosGet: videosGet,
+    videosRemove: videosRemove,
+    videosSearch: videosSearch
   }
 
-  videos.videosAdd = function (req, res, next) {
+  function videosAdd (req, res, next) {
     req.checkFiles('input_video[0].originalname', 'Should have an input video').notEmpty()
     req.checkFiles('input_video[0].mimetype', 'Should have a correct mime type').matches(/video\/(webm)|(mp4)|(ogg)/i)
     req.checkBody('name', 'Should have a name').isLength(1, 50)
@@ -34,7 +23,7 @@
     checkErrors(req, res, next)
   }
 
-  videos.videosGet = function (req, res, next) {
+  function videosGet (req, res, next) {
     req.checkParams('id', 'Should have a valid id').notEmpty().isMongoId()
 
     logger.debug('Checking videosGet parameters', { parameters: req.params })
@@ -48,7 +37,7 @@
     })
   }
 
-  videos.videosRemove = function (req, res, next) {
+  function videosRemove (req, res, next) {
     req.checkParams('id', 'Should have a valid id').notEmpty().isMongoId()
 
     logger.debug('Checking videosRemove parameters', { parameters: req.params })
@@ -63,5 +52,25 @@
     })
   }
 
-  module.exports = videos
+  function videosSearch (req, res, next) {
+    req.checkParams('name', 'Should have a name').notEmpty()
+
+    logger.debug('Checking videosSearch parameters', { parameters: req.params })
+
+    checkErrors(req, res, next)
+  }
+
+  // ---------------------------------------------------------------------------
+
+  module.exports = reqValidatorsVideos
+
+  // ---------------------------------------------------------------------------
+
+  function findVideoById (id, callback) {
+    VideosDB.findById(id, { _id: 1, namePath: 1 }).limit(1).exec(function (err, video) {
+      if (err) throw err
+
+      callback(video)
+    })
+  }
 })()