Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-24 03:05:41 +00:00
Code Issues Projects Releases Wiki Activity

feature(rest) add checkSendError

Browse source
This commit is contained in:
coderaiser 2013-11-13 15:28:24 +00:00
parent 2fef19c76e
commit 6e213b35e2
1 changed files with 38 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

87
lib/server/rest.js
View file

@ -110,19 +110,14 @@
case 'GET':
if (Util.strCmp(lQuery, 'size'))
dir.getSize(p.name, function(pErr, pSize) {
if (pErr)
sendError(p, pErr);
else {
checkSendError(pError, p, function() {
lSize = CloudFunc.getShortSize(pSize);
sendResponse(p, lSize);
}
});
});
else
fs.stat(p.name, function(pError, pStat) {
if (pError)
sendError(p, pError);
else
checkSendError(pError, p, function() {
if (!pStat.isDirectory())
main.sendFile(p);
else
@ -135,16 +130,16 @@
sendResponse(p);
}
});
});
});
break;
case 'PUT':
if (lQuery === 'dir')
fs.mkdir(p.name, function(pError) {
if (pError)
sendError(pParams, pError);
else
heckSendError(pError, pParams, function() {
sendMsg(pParams, 'make dir', p.name);
});
});
else if(lQuery === 'patch')
getBody(p.request, function(pPatch) {
@ -159,9 +154,7 @@
p = pParams;
lName = p.params.name;
if (p.error)
main.sendError(p.params, p.error);
else {
checkSendError(p.error, p.params, function() {
lStr = p.data.toString();
lRet = Util.tryCatchLog(function() {
lDiff = diff.applyPatch(lStr, pPatch);
@ -173,7 +166,7 @@
lName = path.basename(lName);
sendMsg(p.params, 'patch', lName, 'fail');
}
}
});
}
}
@ -185,12 +178,10 @@
if (lRet) {
p = pParams;
if (p.error)
main.sendError(p.params, p.error);
else {
checkSendError(p.error, p.params, function() {
lName = path.basename(p.params.name);
sendMsg(p.params, 'patch', lName);
}
});
}
}
});
@ -199,14 +190,10 @@
read : p.request,
to : p.name,
callback : function(pError) {
var lName;
if (pError)
sendError(pParams, pError);
else {
lName = path.basename(p.name);
checkSendError(pError, pParams, function() {
var lName = path.basename(p.name);
sendMsg(pParams, 'save', lName);
}
});
}
});
break;
@ -214,11 +201,10 @@
case 'DELETE':
if (lQuery === 'dir')
fs.rmdir(p.name, function(pError){
if (pError)
sendError(pParams, pError);
else
checkSendError(pError, pParams, function() {
sendMsg(pParams, 'delete', p.name);
});
});
else if (lQuery === 'files') {
getBody(p.request, function(pBody) {
var lFiles = Util.parseJSON(pBody),
@ -237,16 +223,13 @@
++lAssync;
if (p.error){
sendError(pParams, p.error);
log(p.error);
}
else
checkSendError(p.error, pParams, function() {
if (p.data.isDirectory())
fs.rmdir(d.name, log);
else if (p.data.isFile())
fs.unlink(d.name, log);
});
if (lAssync === n && !p.error)
sendMsg(pParams, 'delete', pBody);
@ -264,10 +247,9 @@
});
}else
fs.unlink(p.name, function(pError) {
if (pError)
sendError(pParams, pError);
else
checkSendError(pError, pParams, function() {
sendMsg(pParams, 'delete', p.name);
});
});
break;
@ -356,17 +338,18 @@
case 'mv':
if( Util.checkObjTrue(lFiles, ['from', 'to']) )
fs.rename(lFiles.from, lFiles.to, function(pError) {
if (pError)
sendError(pParams, pError);
else
checkSendError(pError, pParams, function() {
sendResponse(pParams);
});
});
else
sendError(pParams, p.data);
break;
case 'cp':
if (Util.checkObjTrue(lFiles, ['from', 'to']))
if (!Util.checkObjTrue(lFiles, ['from', 'to']))
sendError(pParams, p.data);
else
pipe.create({
from : lFiles.from,
to : lFiles.to,
@ -377,12 +360,13 @@
sendMsg(pParams, 'copy', lFiles.to);
}
});
else
sendError(pParams, p.data);
break;
case 'zip':
if (Util.checkObjTrue(lFiles, ['from']))
if (!Util.checkObjTrue(lFiles, ['from']))
sendError(pParams, p.data);
else
pipe.create({
from : lFiles.from,
to : lFiles.to || lFiles.from + '.zip',
@ -398,8 +382,7 @@
}
}
});
else
sendError(pParams, p.data);
break;
case 'config':
@ -411,10 +394,9 @@
json = Util.stringifyJSON(config) + '\n';
fs.writeFile(JSONDIR + 'config.json', json, function(error) {
if (error)
sendError(pParams, error);
else
checkSendError(error, pParams, function() {
sendMsg(pParams, 'config', name);
});
});
break;
@ -451,4 +433,11 @@
sendResponse(pParams, msg);
}
function checkSendError(error, params, callback) {
if (error)
sendError(params, error);
else
Util.exec(callback);
}
})();