Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

feature(rest) rm checkParams

Browse source
This commit is contained in:
coderaiser 2014-08-14 03:01:23 -04:00
parent df0ab548de
commit 40ed968ba4
2 changed files with 118 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/server/ponse.js
View file

@ -32,8 +32,6 @@
exports.getQuery = getQuery;
exports.setHeader = setHeader;
exports.checkParams = checkParams;
/* Функция высылает ответ серверу
* @param data

252
lib/server/rest.js
View file

@ -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;
}
}
/**