From 35930c2a5c0f09cac5408f0696d793123778e341 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 1 Feb 2016 12:18:18 -0500 Subject: [PATCH] feature(cloudcmd) prefix: remedy, spero, ishtar --- lib/client/operation.js | 12 ++++++---- lib/cloudcmd.js | 53 ++++++++++++++++++++++++----------------- 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/lib/client/operation.js b/lib/client/operation.js index 8c48f9a1..547b341f 100644 --- a/lib/client/operation.js +++ b/lib/client/operation.js @@ -44,7 +44,9 @@ if (error) Dialog.alert('Config', error); else if (config.progress) - load(create); + load(function(callback) { + create(CloudCmd.PREFIX, callback); + }); callback(); }); @@ -57,10 +59,10 @@ ]); } - function create(callback) { + function create(prefix, callback) { exec.series([ function(fn) { - spero(function(copier) { + spero(prefix + '/spero', prefix, function(copier) { fn(); copier.on('connect', function() { @@ -77,7 +79,7 @@ }, function(fn) { - remedy(function(remover) { + remedy(prefix + '/remedy', prefix, function(remover) { fn(); remover.on('connect', function() { deleteFn = function(from, files, callback) { @@ -95,7 +97,7 @@ }, function(fn) { - ishtar(function(packer) { + ishtar(prefix + '/ishtar', prefix, function(packer) { fn(); packer.on('connect', function() { packFn = function(data, callback) { diff --git a/lib/cloudcmd.js b/lib/cloudcmd.js index 06b3385f..76274fc5 100644 --- a/lib/cloudcmd.js +++ b/lib/cloudcmd.js @@ -102,8 +102,9 @@ } function listen(prefix, socket) { - var size = cloudfunc.MAX_SIZE, - pref = getPrefix(prefix); + var size = cloudfunc.MAX_SIZE; + + prefix = getPrefix(prefix); config.listen(socket, authCheck); @@ -116,28 +117,28 @@ edward.listen(socket, { size: size, root: root, - prefix: pref + '/edward' + prefix: prefix + '/edward' }); dword.listen(socket, { size: size, root: root, - prefix: pref + '/dword' + prefix: prefix + '/dword' }); spero.listen(socket, { root: root, - prefix: pref + '/spero' + prefix: prefix + '/spero' }); remedy.listen(socket, { root: root, - prefix: pref + '/remedy' + prefix: prefix + '/remedy' }); ishtar.listen(socket, { root: root, - prefix: pref + '/ishtar' + prefix: prefix + '/ishtar' }); } @@ -181,14 +182,37 @@ zip : isZip }), + spero({ + prefix : prefix + '/spero', + minify : isMinify, + online : isOnline + }), + + remedy({ + prefix : prefix + '/remedy', + minify : isMinify, + online : isOnline + }), + + ishtar({ + prefix : prefix + '/ishtar', + minify : isMinify, + online : isOnline + }), + setUrl(prefix), + auth(), + config.middle, + restafary({ prefix : cloudfunc.apiURL + '/fs', root : root }), + rest, + route({ prefix: prefix }), @@ -198,21 +222,6 @@ minify : isMinify }), - spero({ - minify: isMinify, - online: isOnline - }), - - remedy({ - minify: isMinify, - online: isOnline - }), - - ishtar({ - minify: isMinify, - online: isOnline - }), - mollify({ dir : DIR_ROOT, is : isMinify