From 5101105ef91bfe478f97546b78b321882da2079c Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Wed, 16 Mar 2016 21:37:17 +0100
Subject: Video lib/model/reqvalidator refractoring

---
 server/middlewares/reqValidators/videos.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'server/middlewares/reqValidators')

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()
+      })
     })
   })
 }
-- 
cgit v1.2.3