From 37847df395bd69c7bbebf6b64bf0fef1c3fbf288 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 21 Nov 2012 08:23:29 -0500 Subject: [PATCH] refactored --- lib/server/appcache.js | 3 +-- lib/server/auth.js | 3 +-- lib/server/cache.js | 3 +-- lib/server/main.js | 6 ++++-- lib/server/minify.js | 3 +-- lib/server/rest.js | 3 +-- lib/server/socket.js | 3 +-- lib/server/update.js | 5 ++--- server.js | 6 +++--- 9 files changed, 15 insertions(+), 20 deletions(-) diff --git a/lib/server/appcache.js b/lib/server/appcache.js index 14451f1d..ef86fc11 100644 --- a/lib/server/appcache.js +++ b/lib/server/appcache.js @@ -2,8 +2,7 @@ (function(){ "use strict"; - var DIR = process.cwd() + '/', - main = require(DIR + 'lib/server/main'), + var main = global.cloudcmd.main, fs = main.fs, Util = main.util, diff --git a/lib/server/auth.js b/lib/server/auth.js index 2c533ddd..629cd629 100644 --- a/lib/server/auth.js +++ b/lib/server/auth.js @@ -2,8 +2,7 @@ (function(){ "use strict"; - var DIR = process.cwd() + '/', - main = require(DIR + 'lib/server/main'), + var main = global.cloudcmd.main, https = main.https, qs = main.querystring, diff --git a/lib/server/cache.js b/lib/server/cache.js index 94d100b6..054f3c66 100644 --- a/lib/server/cache.js +++ b/lib/server/cache.js @@ -1,8 +1,7 @@ (function(){ "use strict"; - var DIR = process.cwd() + '/', - main = require(DIR + 'lib/server/main'), + var main = global.cloudcmd.main, SRVDIR = main.SRVDIR; /* diff --git a/lib/server/main.js b/lib/server/main.js index 788a1555..21f53f18 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -16,7 +16,8 @@ '.appcache' : 'text/cache-manifest', '.mp3' : 'audio/mpeg' }; - + + global.cloudcmd = {}, /* Constants */ exports.DIR = DIR = process.cwd() + '/', exports.LIBDIR = LIBDIR = DIR + 'lib/', @@ -49,6 +50,7 @@ /* Additional Modules */ + global.cloudcmd.main = exports; exports.auth = srvrequire('auth').auth, exports.appcache = srvrequire('appcache'), exports.cache = srvrequire('cache').Cache, @@ -58,7 +60,7 @@ exports.update = srvrequire('update'), exports.minify = srvrequire('minify').Minify, exports.zlib = mrequire('zlib'); - + global.cloudcmd.main = exports; /** * function do safe require of needed module diff --git a/lib/server/minify.js b/lib/server/minify.js index deac66a2..e612e7db 100644 --- a/lib/server/minify.js +++ b/lib/server/minify.js @@ -3,8 +3,7 @@ (function(){ "use strict"; - var DIR = process.cwd() + '/', - main = require(DIR + 'lib/server/main'), + var main = global.cloudcmd.main, SRVDIR = main.SRVDIR; exports.Minify = { diff --git a/lib/server/rest.js b/lib/server/rest.js index 1fcab0a8..551abad7 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -3,8 +3,7 @@ (function(){ "use strict"; - var DIR = process.cwd() + '/', - main = require(DIR + 'lib/server/main'), + var main = global.cloudcmd.main, Util = main.util, APIURL = '/api/v1', OK = 200, diff --git a/lib/server/socket.js b/lib/server/socket.js index fc59677c..f20f5c14 100644 --- a/lib/server/socket.js +++ b/lib/server/socket.js @@ -3,8 +3,7 @@ (function(){ "use strict"; - var DIR = process.cwd() + '/', - main = require(DIR + 'lib/server/main'), + var main = global.cloudcmd.main, SRVDIR = main.SRVDIR, io = main.require('socket.io'), diff --git a/lib/server/update.js b/lib/server/update.js index 2279885e..c5f4c6f5 100644 --- a/lib/server/update.js +++ b/lib/server/update.js @@ -2,9 +2,8 @@ (function(){ "use strict"; - - var DIR = process.cwd() + '/', - main = require(DIR + 'lib/server/main'), + + var main = global.cloudcmd.main, mainpackage = main.mainpackage, exec = main.child_process.exec; diff --git a/server.js b/server.js index b8f7e713..1b004d95 100644 --- a/server.js +++ b/server.js @@ -606,11 +606,11 @@ var lProccessed, lIndexProccessing = lSrv.indexProcessing; - - lProccessed = Util.exec(lIndexProccessing, { + + lProccessed = Util.exec(lIndexProccessing, { data : pIndex, additional : pList - }); + }); if(lProccessed) pIndex = lProccessed;