From bd17fc22f90731c3f096d1848037f8270f4172f2 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 27 May 2014 07:43:35 -0400 Subject: [PATCH] refactor(time) main -> require --- lib/server/ischanged.js | 8 ++++---- lib/server/main.js | 3 +-- lib/server/rest/fs/get.js | 15 ++++++++------- lib/server/users.js | 21 ++++++++++----------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/lib/server/ischanged.js b/lib/server/ischanged.js index 1c2007a8..e2df0cec 100644 --- a/lib/server/ischanged.js +++ b/lib/server/ischanged.js @@ -4,10 +4,10 @@ var main = global.cloudcmd.main, JSONDIR = main.JSONDIR, - fs = main.fs, - path = main.path, - Util = main.util, - time = main.time, + fs = require('fs'), + path = require('path'), + Util = require('../util'), + time = require('./time'), CHANGES_NAME = JSONDIR + 'changes', CHANGES_JSON = CHANGES_NAME + '.json', diff --git a/lib/server/main.js b/lib/server/main.js index 6b3e755f..9856293a 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -11,7 +11,7 @@ SLASH, ISWIN32, ext, dir, - path, fs, zlib, url, pipe, CloudFunc, diffPatch, querystring, time, + path, fs, zlib, url, pipe, CloudFunc, diffPatch, querystring, OK, RANGE, FILE_NOT_FOUND, MOVED_PERMANENTLY, REQUEST, RESPONSE, @@ -115,7 +115,6 @@ exports.hash = srvrequire('hash'), diffPatch = librequire('diff/diff-match-patch').diff_match_patch, exports.diff = new (librequire('diff').DiffProto)(diffPatch), - exports.time = time = srvrequire('time'); exports.users = srvrequire('users'); exports.rest = srvrequire('rest').api, exports.update = srvrequire('update'), diff --git a/lib/server/rest/fs/get.js b/lib/server/rest/fs/get.js index 2a3604ec..51b48af7 100644 --- a/lib/server/rest/fs/get.js +++ b/lib/server/rest/fs/get.js @@ -1,13 +1,14 @@ (function() { 'use strict'; - var main = global.cloudcmd.main, - Hash = main.hash, - dir = main.dir, - time = main.time, - pipe = main.pipe, - CloudFunc = main.cloudfunc, - Util = main.util; + var DIR = __dirname + '/../../../', + DIR_SERVER = DIR + 'server/', + Hash = require(DIR_SERVER + 'hash'), + dir = require(DIR_SERVER + 'dir'), + time = require(DIR_SERVER + 'time'), + pipe = require(DIR_SERVER + 'pipe'), + CloudFunc = require(DIR + 'cloudfunc'), + Util = require(DIR + 'util'); exports.onGet = onGet; diff --git a/lib/server/users.js b/lib/server/users.js index 8d0a33cd..8521f676 100644 --- a/lib/server/users.js +++ b/lib/server/users.js @@ -1,18 +1,17 @@ (function(object) { 'use strict'; - if(!global.cloudcmd) - return console.log( - '# time.js' + '\n' + - '# -----------' + '\n' + - '# Module is part of Cloud Commander,' + '\n' + - '# used for getting file change time.' + '\n' + - '# http://cloudcmd.io' + '\n'); + /* + '# time.js' + '\n' + + '# -----------' + '\n' + + '# Module is part of Cloud Commander,' + '\n' + + '# used for getting file change time.' + '\n' + + '# http://cloudcmd.io' + '\n'); + */ - var main = global.cloudcmd.main, - fs = main.fs, - time = main.time, - Util = main.util, + var fs = require('fs'), + time = require('time'), + Util = require('../util'), FILE = '/etc/passwd', FileTime, Names;