From 2a88e371c05d86947c634ef636c9903435fd9442 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 4 Feb 2014 05:21:16 -0500 Subject: [PATCH] chore(rest) lRet -> ret --- lib/server/rest.js | 84 ++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/lib/server/rest.js b/lib/server/rest.js index 5340173e..056f5f8c 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -37,19 +37,19 @@ * @pParams {request, responce} */ exports.api = function(pParams) { - var lRet = main.checkParams(pParams); + var ret = main.checkParams(pParams); - if (lRet) { + if (ret) { var lAPIURL = main.config.apiURL, p = pParams; - lRet = Util.isContainStr(p.name, lAPIURL); - if (lRet) { + ret = Util.isContainStr(p.name, lAPIURL); + if (ret) { p.name = Util.removeStrOneTime(p.name, lAPIURL) || '/'; sendData(pParams); } } - return lRet; + return ret; }; /** @@ -72,20 +72,20 @@ * @param pParams {command, method, body, requrest, response} */ function sendData(pParams) { - var p, lRet = main.checkParams(pParams); - if(lRet){ + var p, ret = main.checkParams(pParams); + if (ret){ p = pParams; - lRet = Util.isContainStrAtBegin(p.name, CloudFunc.FS); + ret = Util.isContainStrAtBegin(p.name, CloudFunc.FS); - if (lRet) + if (ret) onFS(pParams); else { - if(p.name[0] === '/') + if (p.name[0] === '/') p.command = Util.removeStrOneTime(p.name, '/'); switch(p.request.method){ case 'GET': - lRet = onGET(pParams); + ret = onGET(pParams); break; case 'PUT': @@ -97,14 +97,14 @@ } } } - return lRet; + return ret; } function onFS(pParams) { var p, lQuery, isGet, - lRet = main.checkParams(pParams); + ret = main.checkParams(pParams); - if (lRet){ + if (ret){ p = pParams; lQuery = main.getQuery(p.request); p.name = Util.removeStrOneTime(p.name, CloudFunc.FS) || '/'; @@ -145,26 +145,26 @@ sendMsg(pParams, 'make dir', p.name); }); }); - else if(lQuery === 'patch') + else if (lQuery === 'patch') getBody(p.request, function(pPatch) { fs.readFile(p.name, Util.call(read, pParams)); function read(pParams) { var lDiff, lStr, p, lData, lName, - lRet = main.checkCallBackParams(pParams) && + ret = main.checkCallBackParams(pParams) && main.checkParams(pParams.params); - if (lRet) { + if (ret) { p = pParams; lName = p.params.name; checkSendError(p.error, p.params, function() { lStr = p.data.toString(); - lRet = Util.tryCatchLog(function() { + ret = Util.tryCatchLog(function() { lDiff = diff.applyPatch(lStr, pPatch); }); - if (lDiff && !lRet) + if (lDiff && !ret) fs.writeFile(lName, lDiff, Util.call(write, p.params)); else { lName = path.basename(lName); @@ -176,10 +176,10 @@ function write(pParams) { var p, lName, - lRet = main.checkCallBackParams(pParams) && + ret = main.checkCallBackParams(pParams) && main.checkParams(pParams.params); - if (lRet) { + if (ret) { p = pParams; checkSendError(p.error, p.params, function() { @@ -218,10 +218,10 @@ lAssync = 0; function stat(pStat) { - var lRet = Util.checkObjTrue(pStat, 'params') && + var ret = Util.checkObjTrue(pStat, 'params') && Util.checkObjTrue(pStat.params, 'name'); - if (lRet) { + if (ret) { var p = pStat, d = p.params; @@ -242,17 +242,19 @@ for(var i = 0; i < n; i ++) { - var lName = lDir + lFiles[i]; - Util.log(lName); - fs.stat(lName, Util.call(stat, { - name: lName + var name = lDir + lFiles[i]; + + Util.log(name); + + fs.stat(name, Util.call(stat, { + name: name })); } }); }else - fs.unlink(p.name, function(pError) { - checkSendError(pError, pParams, function() { - sendMsg(pParams, 'delete', p.name); + fs.unlink(p.name, function(error) { + checkSendError(error, params, function() { + sendMsg(params, 'delete', p.name); }); }); @@ -260,7 +262,7 @@ } } - return lRet; + return ret; } function onFSGet(query, name, callback) { @@ -315,8 +317,8 @@ * @param pParams {command, method, body, requrest, response} */ function onGET(pParams) { - var lRet = main.checkParams(pParams); - if (lRet) { + var ret = main.checkParams(pParams); + if (ret) { var p = pParams, lCmd = p.command; @@ -337,7 +339,7 @@ } } - return lRet; + return ret; } /** @@ -347,9 +349,9 @@ */ function onPUT(pParams) { var name, data, json, config, - lRet = main.checkParams(pParams, ['body']); + ret = main.checkParams(pParams, ['body']); - if (lRet) { + if (ret) { var p = pParams, lCmd = p.command, lFiles = Util.parseJSON(p.body); @@ -365,7 +367,7 @@ break; case 'mv': - if(!Util.checkObjTrue(lFiles, ['from', 'to']) ) + if (!Util.checkObjTrue(lFiles, ['from', 'to']) ) sendError(pParams, p.data); else fs.rename(lFiles.from, lFiles.to, function(pError) { @@ -442,7 +444,7 @@ } } - return lRet; + return ret; } /** @@ -451,14 +453,14 @@ * @param pReq * @param pCallBack */ - function getBody(pReq, pCallBack) { + function getBody(req, pCallBack) { var lBody = ''; - pReq.on('data', function(chunk) { + req.on('data', function(chunk) { lBody += chunk.toString(); }); - pReq.on('end', function() { + req.on('end', function() { Util.exec(pCallBack, lBody); }); }