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

refactor(rest) onFS GET -> onFSGet

Browse source
This commit is contained in:
coderaiser 2013-11-21 12:52:28 +00:00
parent c0ab845069
commit 8b56891fc2
1 changed files with 64 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

107
lib/server/rest.js
View file

@ -100,7 +100,7 @@
}
function onFS(pParams) {
var p, lError, lMsg, lSize, lQuery, hash,
var p, lQuery, isGet,
lRet = main.checkParams(pParams);
if (lRet){
@ -110,56 +110,31 @@
switch (p.request.method) {
case 'GET':
if (Util.strCmp(lQuery, 'size'))
dir.getSize(p.name, function(pError, pSize) {
checkSendError(pError, p, function() {
lSize = CloudFunc.getShortSize(pSize);
sendResponse(p, lSize);
});
isGet = onFSGet(lQuery, p.name, function(error, result) {
checkSendError(error, pParams, function() {
sendResponse(p, result);
});
else if (Util.strCmp(lQuery, 'time'))
time.get(p.name, function(error, time) {
checkSendError(error, p, function() {
var timeStr = time.toString();
sendResponse(p, timeStr);
});
});
else if (Util.strCmp(lQuery, 'hash')) {
hash = Hash.create();
if (!hash) {
lMsg = 'not suported, try update node';
lMsg = CloudFunc.formatMsg('hash', lMsg, 'error');
sendError(p, lMsg);
} else
pipe.create({
from : p.name,
write : hash,
callback : function (error) {
checkSendError(error, p, function() {
var hex = hash.get();
sendResponse(p, hex);
});
}
});
} else
fs.stat(p.name, function(pError, pStat) {
checkSendError(pError, p, function() {
if (!pStat.isDirectory())
});
console.log('isGet=', isGet);
if (!isGet)
fs.stat(p.name, function(error, stat) {
var getDirContent = main.commander.getDirContent;
if (error)
Util.exec(error);
else
if (!stat.isDirectory())
main.sendFile(p);
else
main.commander.getDirContent(p.name, function(pError, pData) {
if (pError)
sendError(p, pError);
else {
getDirContent(p.name, function(pError, pData) {
checkSendError(pError, p, function() {
p.name += '.json';
p.data = Util.stringifyJSON(pData);
sendResponse(p);
}
});
});
});
});
break;
case 'PUT':
@ -287,6 +262,52 @@
return lRet;
}
function onFSGet(query, name, callback) {
var msg, hash, ret = true;
switch (query) {
case 'size':
dir.getSize(name, function(error, size) {
if (!error)
size = CloudFunc.getShortSize(size);
Util.exec(callback, error, size);
});
break;
case 'time':
time.get(name, function(error, time) {
var timeStr = time.toString();
Util.exec(callback, error, timeStr);
});
break;
case 'hash':
hash = Hash.create();
if (!hash) {
msg = 'not suported, try update node';
msg = CloudFunc.formatMsg('hash', msg, 'error');
Util.exec(callback, msg);
} else
pipe.create({
from : name,
write : hash,
callback : function (error) {
var hex = hash.get();
Util.exec(callback, error, hex);
}
});
break;
default:
ret = false;
break;
}
return ret;
}
/**
* process data on GET request
*