Use const/let now we use node 4.2

server/controllers/api/v1/index.js

@@ -1,12 +1,12 @@
 'use strict'
 
-var express = require('express')
+const express = require('express')
 
-var router = express.Router()
+const router = express.Router()
 
-var podsController = require('./pods')
-var remoteVideosController = require('./remoteVideos')
-var videosController = require('./videos')
+const podsController = require('./pods')
+const remoteVideosController = require('./remoteVideos')
+const videosController = require('./videos')
 
 router.use('/pods', podsController)
 router.use('/remotevideos', remoteVideosController)

server/controllers/api/v1/pods.js

@@ -1,20 +1,20 @@
 'use strict'
 
-var express = require('express')
-var fs = require('fs')
+const express = require('express')
+const fs = require('fs')
 
-var logger = require('../../../helpers/logger')
-var friends = require('../../../lib/friends')
-var middleware = require('../../../middlewares')
-var cacheMiddleware = middleware.cache
-var peertubeCrypto = require('../../../helpers/peertubeCrypto')
-var Pods = require('../../../models/pods')
-var reqValidator = middleware.reqValidators.pods
-var secureMiddleware = middleware.secure
-var secureRequest = middleware.reqValidators.remote.secureRequest
-var Videos = require('../../../models/videos')
+const logger = require('../../../helpers/logger')
+const friends = require('../../../lib/friends')
+const middleware = require('../../../middlewares')
+const cacheMiddleware = middleware.cache
+const peertubeCrypto = require('../../../helpers/peertubeCrypto')
+const Pods = require('../../../models/pods')
+const reqValidator = middleware.reqValidators.pods
+const secureMiddleware = middleware.secure
+const secureRequest = middleware.reqValidators.remote.secureRequest
+const Videos = require('../../../models/videos')
 
-var router = express.Router()
+const router = express.Router()
 
 router.get('/', cacheMiddleware.cache(false), listPods)
 router.post('/', reqValidator.podsAdd, cacheMiddleware.cache(false), addPods)
@@ -30,7 +30,7 @@ module.exports = router
 // ---------------------------------------------------------------------------
 
 function addPods (req, res, next) {
-  var informations = req.body.data
+  const informations = req.body.data
   Pods.add(informations, function (err) {
     if (err) return next(err)
 
@@ -71,7 +71,7 @@ function makeFriends (req, res, next) {
 }
 
 function removePods (req, res, next) {
-  var url = req.body.signature.url
+  const url = req.body.signature.url
   Pods.remove(url, function (err) {
     if (err) return next(err)
 

server/controllers/api/v1/remoteVideos.js

@@ -1,15 +1,15 @@
 'use strict'
 
-var express = require('express')
-var pluck = require('lodash-node/compat/collection/pluck')
+const express = require('express')
+const pluck = require('lodash-node/compat/collection/pluck')
 
-var middleware = require('../../../middlewares')
-var secureMiddleware = middleware.secure
-var cacheMiddleware = middleware.cache
-var reqValidator = middleware.reqValidators.remote
-var videos = require('../../../models/videos')
+const middleware = require('../../../middlewares')
+const secureMiddleware = middleware.secure
+const cacheMiddleware = middleware.cache
+const reqValidator = middleware.reqValidators.remote
+const videos = require('../../../models/videos')
 
-var router = express.Router()
+const router = express.Router()
 
 router.post('/add',
   reqValidator.secureRequest,
@@ -42,8 +42,8 @@ function addRemoteVideos (req, res, next) {
 }
 
 function removeRemoteVideo (req, res, next) {
-  var url = req.body.signature.url
-  var magnetUris = pluck(req.body.data, 'magnetUri')
+  const url = req.body.signature.url
+  const magnetUris = pluck(req.body.data, 'magnetUri')
 
   videos.removeRemotesOfByMagnetUris(url, magnetUris, function (err) {
     if (err) return next(err)

server/controllers/api/v1/videos.js

@@ -1,41 +1,41 @@
 'use strict'
 
-var config = require('config')
-var crypto = require('crypto')
-var express = require('express')
-var multer = require('multer')
+const config = require('config')
+const crypto = require('crypto')
+const express = require('express')
+const multer = require('multer')
 
-var logger = require('../../../helpers/logger')
-var friends = require('../../../lib/friends')
-var middleware = require('../../../middlewares')
-var cacheMiddleware = middleware.cache
-var reqValidator = middleware.reqValidators.videos
-var Videos = require('../../../models/videos') // model
-var videos = require('../../../lib/videos')
-var webtorrent = require('../../../lib/webtorrent')
+const logger = require('../../../helpers/logger')
+const friends = require('../../../lib/friends')
+const middleware = require('../../../middlewares')
+const cacheMiddleware = middleware.cache
+const reqValidator = middleware.reqValidators.videos
+const Videos = require('../../../models/videos') // model
+const videos = require('../../../lib/videos')
+const webtorrent = require('../../../lib/webtorrent')
 
-var router = express.Router()
-var uploads = config.get('storage.uploads')
+const router = express.Router()
+const uploads = config.get('storage.uploads')
 
 // multer configuration
-var storage = multer.diskStorage({
+const storage = multer.diskStorage({
   destination: function (req, file, cb) {
     cb(null, uploads)
   },
 
   filename: function (req, file, cb) {
-    var extension = ''
+    let 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')
+      const fieldname = err ? undefined : raw.toString('hex')
       cb(null, fieldname + '.' + extension)
     })
   }
 })
 
-var reqFiles = multer({ storage: storage }).fields([{ name: 'input_video', maxCount: 1 }])
+const reqFiles = multer({ storage: storage }).fields([{ name: 'input_video', maxCount: 1 }])
 
 router.get('/', cacheMiddleware.cache(false), listVideos)
 router.post('/', reqFiles, reqValidator.videosAdd, cacheMiddleware.cache(false), addVideo)
@@ -50,8 +50,8 @@ module.exports = router
 // ---------------------------------------------------------------------------
 
 function addVideo (req, res, next) {
-  var video_file = req.files.input_video[0]
-  var video_infos = req.body
+  const video_file = req.files.input_video[0]
+  const video_infos = req.body
 
   videos.seed(video_file.path, function (err, torrent) {
     if (err) {
@@ -59,7 +59,7 @@ function addVideo (req, res, next) {
       return next(err)
     }
 
-    var video_data = {
+    const video_data = {
       name: video_infos.name,
       namePath: video_file.filename,
       description: video_infos.description,
@@ -103,7 +103,7 @@ function listVideos (req, res, next) {
 }
 
 function removeVideo (req, res, next) {
-  var video_id = req.params.id
+  const video_id = req.params.id
   Videos.get(video_id, function (err, video) {
     if (err) return next(err)
 
@@ -111,7 +111,7 @@ function removeVideo (req, res, next) {
       Videos.removeOwned(req.params.id, function (err) {
         if (err) return next(err)
 
-        var params = {
+        const params = {
           name: video.name,
           magnetUri: video.magnetUri
         }