Video lib/model/reqvalidator refractoring

3 files changed, 23 insertions, 41 deletions

diff --git a/server/lib/videos.js b/server/lib/videos.js
index 3c6ee4a65..a5fe7b0c4 100644
--- a/server/lib/videos.js
+++ b/server/lib/videos.js
@@ -12,10 +12,21 @@ var Videos = require('../models/videos')
 var uploadDir = path.join(__dirname, '..', '..', config.get('storage.uploads'))
 
 var videos = {
+  getVideoState: getVideoState,
   seed: seed,
   seedAllExisting: seedAllExisting
 }
 
+function getVideoState (video, callback) {
+  var exist = (video !== null)
+  var owned = false
+  if (exist === true) {
+    owned = (video.namePath !== null)
+  }
+
+  return callback({ exist: exist, owned: owned })
+}
+
 function seed (path, callback) {
   logger.info('Seeding %s...', path)
 
diff --git a/server/middlewares/reqValidators/videos.js b/server/middlewares/reqValidators/videos.js
index 4e5f4391f..b0a6d0360 100644
--- a/server/middlewares/reqValidators/videos.js
+++ b/server/middlewares/reqValidators/videos.js
@@ -2,6 +2,7 @@
 
 var checkErrors = require('./utils').checkErrors
 var logger = require('../../helpers/logger')
+var videos = require('../../lib/videos')
 var Videos = require('../../models/videos')
 
 var reqValidatorsVideos = {
@@ -28,15 +29,17 @@ function videosGet (req, res, next) {
   logger.debug('Checking videosGet parameters', { parameters: req.params })
 
   checkErrors(req, res, function () {
-    Videos.getVideoState(req.params.id, function (err, state) {
+    Videos.get(req.params.id, function (err, video) {
       if (err) {
         logger.error('Error in videosGet request validator.', { error: err })
         res.sendStatus(500)
       }
 
-      if (state.exist === false) return res.status(404).send('Video not found')
+      videos.getVideoState(video, function (state) {
+        if (state.exist === false) return res.status(404).send('Video not found')
 
-      next()
+        next()
+      })
     })
   })
 }
@@ -47,16 +50,18 @@ function videosRemove (req, res, next) {
   logger.debug('Checking videosRemove parameters', { parameters: req.params })
 
   checkErrors(req, res, function () {
-    Videos.getVideoState(req.params.id, function (err, state) {
+    Videos.get(req.params.id, function (err, video) {
       if (err) {
         logger.error('Error in videosRemove request validator.', { error: err })
         res.sendStatus(500)
       }
 
-      if (state.exist === false) return res.status(404).send('Video not found')
-      else if (state.owned === false) return res.status(403).send('Cannot remove video of another pod')
+      videos.getVideoState(video, function (state) {
+        if (state.exist === false) return res.status(404).send('Video not found')
+        else if (state.owned === false) return res.status(403).send('Cannot remove video of another pod')
 
-      next()
+        next()
+      })
     })
   })
 }
diff --git a/server/models/videos.js b/server/models/videos.js
index 436c08bfd..fd02ec9e1 100644
--- a/server/models/videos.js
+++ b/server/models/videos.js
@@ -31,8 +31,6 @@ var Videos = {
   add: add,
   addRemotes: addRemotes,
   get: get,
-  getVideoState: getVideoState,
-  isOwned: isOwned,
   list: list,
   listOwned: listOwned,
   removeOwned: removeOwned,
@@ -102,38 +100,6 @@ function get (id, callback) {
   })
 }
 
-function getVideoState (id, callback) {
-  get(id, function (err, video) {
-    if (err) return callback(err)
-
-    var exist = (video !== null)
-    var owned = false
-    if (exist === true) {
-      owned = (video.namePath !== null)
-    }
-
-    return callback(null, { exist: exist, owned: owned })
-  })
-}
-
-function isOwned (id, callback) {
-  VideosDB.findById(id, function (err, video) {
-    if (err || !video) {
-      if (!err) err = new Error('Cannot find this video.')
-      logger.error('Cannot find this video.')
-      return callback(err)
-    }
-
-    if (video.namePath === null) {
-      var error_string = 'Cannot remove the video of another pod.'
-      logger.error(error_string)
-      return callback(new Error(error_string), false, video)
-    }
-
-    callback(null, true, video)
-  })
-}
-
 function list (callback) {
   VideosDB.find(function (err, videos_list) {
     if (err) {