Server: put config in constants

[github/Chocobozzz/PeerTube.git] / server / controllers / api / v1 / videos.js

diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js
index ab115bc30d8eccf5635f6fe302a20d353be9e1d6..70d22f139ba35dba729928509ec36f134f6a9e38 100644 (file)
--- a/server/controllers/api/v1/videos.js
+++ b/server/controllers/api/v1/videos.js
@@ -1,32 +1,31 @@
 'use strict'
 
-const async = require('async')
-const config = require('config')
 const express = require('express')
 const mongoose = require('mongoose')
 const multer = require('multer')
+const waterfall = require('async/waterfall')
 
+const constants = require('../../../initializers/constants')
 const logger = require('../../../helpers/logger')
 const friends = require('../../../lib/friends')
 const middlewares = require('../../../middlewares')
 const oAuth = middlewares.oauth
 const pagination = middlewares.pagination
-const reqValidator = middlewares.reqValidators
-const reqValidatorPagination = reqValidator.pagination
-const reqValidatorSort = reqValidator.sort
-const reqValidatorVideos = reqValidator.videos
+const validators = middlewares.validators
+const validatorsPagination = validators.pagination
+const validatorsSort = validators.sort
+const validatorsVideos = validators.videos
 const search = middlewares.search
 const sort = middlewares.sort
 const utils = require('../../../helpers/utils')
 
 const router = express.Router()
-const uploads = config.get('storage.uploads')
 const Video = mongoose.model('Video')
 
 // multer configuration
 const storage = multer.diskStorage({
   destination: function (req, file, cb) {
-    cb(null, uploads)
+    cb(null, constants.CONFIG.STORAGE.UPLOAD_DIR)
   },
 
   filename: function (req, file, cb) {
@@ -44,8 +43,8 @@ const storage = multer.diskStorage({
 const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
 
 router.get('/',
-  reqValidatorPagination.pagination,
-  reqValidatorSort.videosSort,
+  validatorsPagination.pagination,
+  validatorsSort.videosSort,
   sort.setVideosSort,
   pagination.setPagination,
   listVideos
@@ -53,22 +52,22 @@ router.get('/',
 router.post('/',
   oAuth.authenticate,
   reqFiles,
-  reqValidatorVideos.videosAdd,
+  validatorsVideos.videosAdd,
   addVideo
 )
 router.get('/:id',
-  reqValidatorVideos.videosGet,
+  validatorsVideos.videosGet,
   getVideo
 )
 router.delete('/:id',
   oAuth.authenticate,
-  reqValidatorVideos.videosRemove,
+  validatorsVideos.videosRemove,
   removeVideo
 )
 router.get('/search/:value',
-  reqValidatorVideos.videosSearch,
-  reqValidatorPagination.pagination,
-  reqValidatorSort.videosSort,
+  validatorsVideos.videosSearch,
+  validatorsPagination.pagination,
+  validatorsSort.videosSort,
   sort.setVideosSort,
   pagination.setPagination,
   search.setVideosSearch,
@@ -85,7 +84,7 @@ function addVideo (req, res, next) {
   const videoFile = req.files.videofile[0]
   const videoInfos = req.body
 
-  async.waterfall([
+  waterfall([
 
     function insertIntoDB (callback) {
       const videoData = {
@@ -142,7 +141,7 @@ function getVideo (req, res, next) {
 }
 
 function listVideos (req, res, next) {
-  Video.list(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) {
+  Video.listForApi(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) {
     if (err) return next(err)
 
     res.json(getFormatedVideos(videosList, videosTotal))
@@ -152,7 +151,7 @@ function listVideos (req, res, next) {
 function removeVideo (req, res, next) {
   const videoId = req.params.id
 
-  async.waterfall([
+  waterfall([
     function getVideo (callback) {
       Video.load(videoId, callback)
     },