From 40ed968ba44e68ebdfb4b1e2f4e0762ca0d697cf Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 14 Aug 2014 03:01:23 -0400 Subject: [PATCH] feature(rest) rm checkParams --- lib/server/ponse.js | 2 - lib/server/rest.js | 252 +++++++++++++++++++++----------------------- 2 files changed, 118 insertions(+), 136 deletions(-) diff --git a/lib/server/ponse.js b/lib/server/ponse.js index 3b89c7ab..bdb6b340 100644 --- a/lib/server/ponse.js +++ b/lib/server/ponse.js @@ -32,8 +32,6 @@ exports.getQuery = getQuery; exports.setHeader = setHeader; - - exports.checkParams = checkParams; /* Функция высылает ответ серверу * @param data diff --git a/lib/server/rest.js b/lib/server/rest.js index 24bf2562..3c5bd651 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -91,125 +91,113 @@ /** * getting data on method and command * - * @param params {method, body, requrest, response} + * @param params {name, method, body, requrest, response} */ function sendData(params, callback) { - var p, isFS, isMD, - ret = ponse.checkParams(params); - - if (ret) { - p = params; + var p = params, isFS = Util.isContainStrAtBegin(p.name, CloudFunc.FS), isMD = Util.isContainStrAtBegin(p.name, '/markdown'); - - if (isFS) - onFS(params, callback); - else if (isMD) - markdown.operate(p.name, p.request, function(error, data) { - callback(error, {notLog: true}, data); + + if (isFS) + onFS(params, callback); + else if (isMD) + markdown.operate(p.name, p.request, function(error, data) { + callback(error, {notLog: true}, data); + }); + else { + switch(p.request.method) { + case 'GET': + onGET(params, callback); + break; + + case 'PUT': + pipe.getBody(p.request, function(error, body) { + if (error) + callback(error); + else + onPUT(p.name, body, callback); }); - else { - switch(p.request.method) { - case 'GET': - ret = onGET(params, callback); - break; - - case 'PUT': - pipe.getBody(p.request, function(error, body) { - if (error) - callback(error); - else - onPUT(p.name, body, callback); - }); - break; - } + break; } } - return ret; } function onFS(params, callback) { - var p, query, path, - ret = ponse.checkParams(params); - - if (ret) { - p = params; + var path, + p = params, query = ponse.getQuery(p.request); - p.name = Util.rmStrOnce(p.name, CloudFunc.FS) || '/'; - path = mellow.convertPath(p.name); - switch (p.request.method) { - case 'GET': - onFSGet(query, path, function(error, data) { - var str, - options = {}, - isFile = error && error.code === 'ENOTDIR', - isStr = Util.isString(data), - params = { - gzip: true, - name: path, - request: p.request, - response: p.response, + p.name = Util.rmStrOnce(p.name, CloudFunc.FS) || '/'; + path = mellow.convertPath(p.name); + + switch (p.request.method) { + case 'PUT': + onFSPut(query, path, p.request, callback); + break; + + case 'GET': + onFSGet(query, path, function(error, data) { + var str, + options = {}, + isFile = error && error.code === 'ENOTDIR', + isStr = Util.isString(data), + params = { + gzip: true, + name: path, + request: p.request, + response: p.response, + }; + + if (isFile) { + ponse.sendFile(params); + } else { + if (!error) { + data.path = format.addSlashToEnd(p.name); + + options = { + name : p.name + '.json', + query : query, + notLog : true }; + + if (isStr) + str = data; + else + str = Util.stringifyJSON(data); + } - if (isFile) { - ponse.sendFile(params); - } else { + callback(error, options, str); + } + }); + break; + + case 'DELETE': + pipe.getBody(p.request, function(error, body) { + var files; + + if (error) + callback(error); + else { + files = Util.parseJSON(body); + + onDelete(query, path, files, function(error) { + var names, msg; + if (!error) { - data.path = format.addSlashToEnd(p.name); - - options = { - name : p.name + '.json', - query : query, - notLog : true - }; - - if (isStr) - str = data; + if (files && files.length) + names = files; else - str = Util.stringifyJSON(data); + names = p.name; + + msg = formatMsg('delete', names); } - callback(error, options, str); - } - }); - + callback(error, msg); + }); + } + }); break; - - case 'PUT': - onFSPut(query, path, p.request, callback); - break; - - case 'DELETE': - pipe.getBody(p.request, function(error, body) { - var files; - - if (error) - callback(error); - else { - files = Util.parseJSON(body); - - onDelete(query, path, files, function(error) { - var names, msg; - - if (!error) { - if (files && files.length) - names = files; - else - names = p.name; - - msg = formatMsg('delete', names); - } - - callback(error, msg); - }); - } - }); - break; - } } - - return ret; } /** @@ -218,42 +206,38 @@ * @param pParams {method, body, requrest, response} */ function onGET(params, callback) { - var p, cmd, json, ret = ponse.checkParams(params); - if (ret) { - p = params; - - if (p.name[0] === '/') - cmd = p.name.replace('/', ''); - - switch(cmd) { - case '': - p.data = Util.stringifyJSON({ - info: 'Cloud Commander API v1' - }); - - callback(null, {name: 'api.json'}, p.data); - break; - - case 'config': - ponse.sendFile({ - name : JSONDIR + 'config.json', - request : p.request, - response: p.response, - cache : false - }); - break; - - default: - json = { - message: 'Error: command not found!' - }; - - callback(json); - break; - } - } + var cmd, json, + p = params; - return ret; + if (p.name[0] === '/') + cmd = p.name.replace('/', ''); + + switch(cmd) { + case '': + p.data = Util.stringifyJSON({ + info: 'Cloud Commander API v1' + }); + + callback(null, {name: 'api.json'}, p.data); + break; + + case 'config': + ponse.sendFile({ + name : JSONDIR + 'config.json', + request : p.request, + response: p.response, + cache : false + }); + break; + + default: + json = { + message: 'Error: command not found!' + }; + + callback(json); + break; + } } /**