From d7e3e554450a4b2da60b7eac18eeb7872e14bac7 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 26 Aug 2014 09:34:11 -0400 Subject: [PATCH] feature(fstream) rm main --- lib/server/fstream.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/server/fstream.js b/lib/server/fstream.js index 804e5c05..5ec3b854 100644 --- a/lib/server/fstream.js +++ b/lib/server/fstream.js @@ -1,23 +1,13 @@ (function () { 'use strict'; - if (!global.cloudcmd) - return console.log( - '# fstream.js' + '\n' + - '# -----------' + '\n' + - '# Module is part of Cloud Commander,' + '\n' + - '# used for work with files.' + '\n' + - '# http://cloudcmd.io' + '\n'); + var DIR = '../', + Util = require(DIR + 'util'), + fstream = tryRequire('fstream'), + tar = tryRequire('tar'); - var main = global.cloudcmd.main, - fstream = main.require('fstream'), - tar = main.require('tar'); - - - exports.pack = packDir; - - function packDir(path) { - var dirStream, tarStream, ret; + exports.pack = function (path) { + var dirStream, tarStream; if (tar && fstream) { dirStream = fstream.Reader({ @@ -27,10 +17,20 @@ tarStream = tar.Pack({}); - ret = dirStream.pipe(tarStream); + dirStream = dirStream.pipe(tarStream); } - return ret; + return dirStream; + }; + + function tryRequire(name) { + var module; + + Util.exec.try(function() { + module = require(name); + }); + + return module; } })();