From a13363f51abc260cf6587497ec2a0ac8a68be085 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 19 Feb 2014 03:06:04 -0500 Subject: [PATCH] fix(cloudcmd) route: add name --- cloudcmd.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/cloudcmd.js b/cloudcmd.js index f54f239b..adfe7154 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -217,12 +217,13 @@ main.sendFile(params); } else if (isFS) { query = main.getQuery(params.request), - sendContent(name, query, function(error, data, name, isFile) { + sendContent(name, query, function(name, error, data, isFile) { if (error) - main.sendError(pParams, error); - else if (isFile) - main.sendFile(pParams); - else { + main.sendError(params, error); + else if (isFile) { + params.name = name; + main.sendFile(params); + } else { params.name = name; main.sendResponse(params, data, true); } @@ -240,18 +241,15 @@ name = Util.removeStrOneTime(name, CloudFunc.FS) || main.SLASH; fs.stat(name, function(error, stat) { + var func = Util.retExec(callback, name); + if (error) - Util.exec(callback, error); + func(error); else if (!stat.isDirectory()) - Util.exec(callback, null, null, true); + func(error, null, true); else { - processContent(name, query, function(name, error, data) { - if (error) - Util.exec(callback, error); - else - Util.exec(callback, null, data, name); - }); + processContent(name, query, callback); } }); }