From f0f5567b6918fc60c8cab15e13aec03a89a91dfb Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 16 Mar 2016 22:29:27 +0100 Subject: Use const/let now we use node 4.2 --- server/models/pods.js | 14 +++++++------- server/models/poolRequests.js | 10 +++++----- server/models/videos.js | 36 ++++++++++++++++++------------------ 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'server/models') diff --git a/server/models/pods.js b/server/models/pods.js index 57ed20292..4e21001f5 100644 --- a/server/models/pods.js +++ b/server/models/pods.js @@ -1,22 +1,22 @@ 'use strict' -var mongoose = require('mongoose') +const mongoose = require('mongoose') -var constants = require('../initializers/constants') -var logger = require('../helpers/logger') +const constants = require('../initializers/constants') +const logger = require('../helpers/logger') // --------------------------------------------------------------------------- -var podsSchema = mongoose.Schema({ +const podsSchema = mongoose.Schema({ url: String, publicKey: String, score: { type: Number, max: constants.FRIEND_BASE_SCORE } }) -var PodsDB = mongoose.model('pods', podsSchema) +const PodsDB = mongoose.model('pods', podsSchema) // --------------------------------------------------------------------------- -var Pods = { +const Pods = { add: add, count: count, findByUrl: findByUrl, @@ -31,7 +31,7 @@ var Pods = { // TODO: check if the pod is not already a friend function add (data, callback) { if (!callback) callback = function () {} - var params = { + const params = { url: data.url, publicKey: data.publicKey, score: constants.FRIEND_BASE_SCORE diff --git a/server/models/poolRequests.js b/server/models/poolRequests.js index 970315597..28093a94c 100644 --- a/server/models/poolRequests.js +++ b/server/models/poolRequests.js @@ -1,21 +1,21 @@ 'use strict' -var mongoose = require('mongoose') +const mongoose = require('mongoose') -var logger = require('../helpers/logger') +const logger = require('../helpers/logger') // --------------------------------------------------------------------------- -var poolRequestsSchema = mongoose.Schema({ +const poolRequestsSchema = mongoose.Schema({ type: String, id: String, // Special id to find duplicates (video created we want to remove...) request: mongoose.Schema.Types.Mixed }) -var PoolRequestsDB = mongoose.model('poolRequests', poolRequestsSchema) +const PoolRequestsDB = mongoose.model('poolRequests', poolRequestsSchema) // --------------------------------------------------------------------------- -var PoolRequests = { +const PoolRequests = { create: create, findById: findById, list: list, diff --git a/server/models/videos.js b/server/models/videos.js index fd02ec9e1..0141cbb7f 100644 --- a/server/models/videos.js +++ b/server/models/videos.js @@ -1,33 +1,33 @@ 'use strict' -var async = require('async') -var config = require('config') -var dz = require('dezalgo') -var fs = require('fs') -var mongoose = require('mongoose') -var path = require('path') +const async = require('async') +const config = require('config') +const dz = require('dezalgo') +const fs = require('fs') +const mongoose = require('mongoose') +const path = require('path') -var logger = require('../helpers/logger') +const logger = require('../helpers/logger') -var http = config.get('webserver.https') === true ? 'https' : 'http' -var host = config.get('webserver.host') -var port = config.get('webserver.port') -var uploadDir = path.join(__dirname, '..', '..', config.get('storage.uploads')) +const http = config.get('webserver.https') === true ? 'https' : 'http' +const host = config.get('webserver.host') +const port = config.get('webserver.port') +const uploadDir = path.join(__dirname, '..', '..', config.get('storage.uploads')) // --------------------------------------------------------------------------- -var videosSchema = mongoose.Schema({ +const videosSchema = mongoose.Schema({ name: String, namePath: String, description: String, magnetUri: String, podUrl: String }) -var VideosDB = mongoose.model('videos', videosSchema) +const VideosDB = mongoose.model('videos', videosSchema) // --------------------------------------------------------------------------- -var Videos = { +const Videos = { add: add, addRemotes: addRemotes, get: get, @@ -43,7 +43,7 @@ var Videos = { function add (video, callback) { logger.info('Adding %s video to database.', video.name) - var params = video + const params = video params.podUrl = http + '://' + host + ':' + port VideosDB.create(params, function (err, video) { @@ -60,13 +60,13 @@ function add (video, callback) { function addRemotes (videos, callback) { if (!callback) callback = function () {} - var to_add = [] + const to_add = [] async.each(videos, function (video, callback_each) { callback_each = dz(callback_each) logger.debug('Add remote video from pod: %s', video.podUrl) - var params = { + const params = { name: video.name, namePath: null, description: video.description, @@ -159,7 +159,7 @@ function removeRemotesOfByMagnetUris (fromUrl, magnetUris, callback) { return callback(err) } - var to_remove = [] + const to_remove = [] async.each(videos, function (video, callback_async) { callback_async = dz(callback_async) -- cgit v1.2.3