4 files changed, 99 insertions, 67 deletions

diff --git a/controllers/api/v1/index.js b/controllers/api/v1/index.js
index f5504ad85..b16eeb0f6 100644
--- a/controllers/api/v1/index.js
+++ b/controllers/api/v1/index.js
@@ -2,11 +2,14 @@
   'use strict'
 
   var express = require('express')
+
   var router = express.Router()
 
-  router.use('/videos', require('./videos'))
-  router.use('/remotevideos', require('./remoteVideos'))
   router.use('/pods', require('./pods'))
+  router.use('/remotevideos', require('./remoteVideos'))
+  router.use('/videos', require('./videos'))
+
+  // ---------------------------------------------------------------------------
 
   module.exports = router
 })()
diff --git a/controllers/api/v1/pods.js b/controllers/api/v1/pods.js
index 30385bd5a..b073e85af 100644
--- a/controllers/api/v1/pods.js
+++ b/controllers/api/v1/pods.js
@@ -2,20 +2,27 @@
   'use strict'
 
   var express = require('express')
-  var router = express.Router()
+
   var middleware = require('../../../middlewares')
   var miscMiddleware = middleware.misc
+  var pods = require('../../../models/pods')
   var reqValidator = middleware.reqValidators.pods
   var secureRequest = middleware.reqValidators.remote.secureRequest
-  var pods = require('../../../models/pods')
 
-  function listPods (req, res, next) {
-    pods.list(function (err, pods_list) {
-      if (err) return next(err)
+  var router = express.Router()
 
-      res.json(pods_list)
-    })
-  }
+  router.get('/', miscMiddleware.cache(false), listPods)
+  router.post('/', reqValidator.podsAdd, miscMiddleware.cache(false), addPods)
+  router.get('/makefriends', miscMiddleware.cache(false), makeFriends)
+  router.get('/quitfriends', miscMiddleware.cache(false), quitFriends)
+  // Post because this is a secured request
+  router.post('/remove', secureRequest, miscMiddleware.decryptBody, removePods)
+
+  // ---------------------------------------------------------------------------
+
+  module.exports = router
+
+  // ---------------------------------------------------------------------------
 
   function addPods (req, res, next) {
     pods.add(req.body.data, function (err, json) {
@@ -25,11 +32,11 @@
     })
   }
 
-  function removePods (req, res, next) {
-    pods.remove(req.body.signature.url, function (err) {
+  function listPods (req, res, next) {
+    pods.list(function (err, pods_list) {
       if (err) return next(err)
 
-      res.sendStatus(204)
+      res.json(pods_list)
     })
   }
 
@@ -50,20 +57,19 @@
     })
   }
 
-  function quitFriends (req, res, next) {
-    pods.quitFriends(function (err) {
+  function removePods (req, res, next) {
+    pods.remove(req.body.signature.url, function (err) {
       if (err) return next(err)
 
       res.sendStatus(204)
     })
   }
 
-  router.get('/', miscMiddleware.cache(false), listPods)
-  router.get('/makefriends', miscMiddleware.cache(false), makeFriends)
-  router.get('/quitfriends', miscMiddleware.cache(false), quitFriends)
-  router.post('/', reqValidator.podsAdd, miscMiddleware.cache(false), addPods)
-  // Post because this is a secured request
-  router.post('/remove', secureRequest, miscMiddleware.decryptBody, removePods)
+  function quitFriends (req, res, next) {
+    pods.quitFriends(function (err) {
+      if (err) return next(err)
 
-  module.exports = router
+      res.sendStatus(204)
+    })
+  }
 })()
diff --git a/controllers/api/v1/remoteVideos.js b/controllers/api/v1/remoteVideos.js
index d534d6792..2be2fc87e 100644
--- a/controllers/api/v1/remoteVideos.js
+++ b/controllers/api/v1/remoteVideos.js
@@ -2,7 +2,6 @@
   'use strict'
 
   var express = require('express')
-  var router = express.Router()
   var pluck = require('lodash-node/compat/collection/pluck')
 
   var middleware = require('../../../middlewares')
@@ -10,6 +9,30 @@
   var reqValidator = middleware.reqValidators.remote
   var videos = require('../../../models/videos')
 
+  var router = express.Router()
+
+  router.post('/add',
+    reqValidator.secureRequest,
+    miscMiddleware.decryptBody,
+    reqValidator.remoteVideosAdd,
+    miscMiddleware.cache(false),
+    addRemoteVideos
+  )
+
+  router.post('/remove',
+    reqValidator.secureRequest,
+    miscMiddleware.decryptBody,
+    reqValidator.remoteVideosRemove,
+    miscMiddleware.cache(false),
+    removeRemoteVideo
+  )
+
+  // ---------------------------------------------------------------------------
+
+  module.exports = router
+
+  // ---------------------------------------------------------------------------
+
   function addRemoteVideos (req, res, next) {
     videos.addRemotes(req.body.data, function (err, videos) {
       if (err) return next(err)
@@ -25,9 +48,4 @@
       res.sendStatus(204)
     })
   }
-
-  router.post('/add', reqValidator.secureRequest, miscMiddleware.decryptBody, reqValidator.remoteVideosAdd, miscMiddleware.cache(false), addRemoteVideos)
-  router.post('/remove', reqValidator.secureRequest, miscMiddleware.decryptBody, reqValidator.remoteVideosRemove, miscMiddleware.cache(false), removeRemoteVideo)
-
-  module.exports = router
 })()
diff --git a/controllers/api/v1/videos.js b/controllers/api/v1/videos.js
index aa8cb466b..64b05e32b 100644
--- a/controllers/api/v1/videos.js
+++ b/controllers/api/v1/videos.js
@@ -1,34 +1,50 @@
 ;(function () {
   'use strict'
 
-  var express = require('express')
   var config = require('config')
   var crypto = require('crypto')
+  var express = require('express')
   var multer = require('multer')
-  var router = express.Router()
 
   var middleware = require('../../../middlewares')
   var miscMiddleware = middleware.misc
   var reqValidator = middleware.reqValidators.videos
   var videos = require('../../../models/videos')
 
+  var router = express.Router()
   var uploads = config.get('storage.uploads')
 
-  function listVideos (req, res, next) {
-    videos.list(function (err, videos_list) {
-      if (err) return next(err)
+  // multer configuration
+  var storage = multer.diskStorage({
+    destination: function (req, file, cb) {
+      cb(null, uploads)
+    },
 
-      res.json(videos_list)
-    })
-  }
+    filename: function (req, file, cb) {
+      var extension = ''
+      if (file.mimetype === 'video/webm') extension = 'webm'
+      else if (file.mimetype === 'video/mp4') extension = 'mp4'
+      else if (file.mimetype === 'video/ogg') extension = 'ogv'
+      crypto.pseudoRandomBytes(16, function (err, raw) {
+        var fieldname = err ? undefined : raw.toString('hex')
+        cb(null, fieldname + '.' + extension)
+      })
+    }
+  })
 
-  function searchVideos (req, res, next) {
-    videos.search(req.params.name, function (err, videos_list) {
-      if (err) return next(err)
+  var reqFiles = multer({ storage: storage }).fields([{ name: 'input_video', maxCount: 1 }])
 
-      res.json(videos_list)
-    })
-  }
+  router.get('/', miscMiddleware.cache(false), listVideos)
+  router.post('/', reqFiles, reqValidator.videosAdd, miscMiddleware.cache(false), addVideos)
+  router.get('/:id', reqValidator.videosGet, miscMiddleware.cache(false), getVideos)
+  router.delete('/:id', reqValidator.videosRemove, miscMiddleware.cache(false), removeVideo)
+  router.get('/search/:name', reqValidator.videosSearch, miscMiddleware.cache(false), searchVideos)
+
+  // ---------------------------------------------------------------------------
+
+  module.exports = router
+
+  // ---------------------------------------------------------------------------
 
   function addVideos (req, res, next) {
     videos.add({ video: req.files.input_video[0], data: req.body }, function (err) {
@@ -51,6 +67,14 @@
     })
   }
 
+  function listVideos (req, res, next) {
+    videos.list(function (err, videos_list) {
+      if (err) return next(err)
+
+      res.json(videos_list)
+    })
+  }
+
   function removeVideo (req, res, next) {
     videos.remove(req.params.id, function (err) {
       if (err) return next(err)
@@ -59,30 +83,11 @@
     })
   }
 
-  // multer configuration
-  var storage = multer.diskStorage({
-    destination: function (req, file, cb) {
-      cb(null, uploads)
-    },
-
-    filename: function (req, file, cb) {
-      var extension = ''
-      if (file.mimetype === 'video/webm') extension = 'webm'
-      else if (file.mimetype === 'video/mp4') extension = 'mp4'
-      else if (file.mimetype === 'video/ogg') extension = 'ogv'
-      crypto.pseudoRandomBytes(16, function (err, raw) {
-        var fieldname = err ? undefined : raw.toString('hex')
-        cb(null, fieldname + '.' + extension)
-      })
-    }
-  })
-  var reqFiles = multer({ storage: storage }).fields([{ name: 'input_video', maxCount: 1 }])
-
-  router.get('/', miscMiddleware.cache(false), listVideos)
-  router.post('/', reqFiles, reqValidator.videosAdd, miscMiddleware.cache(false), addVideos)
-  router.get('/search/:name', reqValidator.videosSearch, miscMiddleware.cache(false), searchVideos)
-  router.get('/:id', reqValidator.videosGet, miscMiddleware.cache(false), getVideos)
-  router.delete('/:id', reqValidator.videosRemove, miscMiddleware.cache(false), removeVideo)
+  function searchVideos (req, res, next) {
+    videos.search(req.params.name, function (err, videos_list) {
+      if (err) return next(err)
 
-  module.exports = router
+      res.json(videos_list)
+    })
+  }
 })()