refactor(rest) putFile callback: pError, pMsg -> pError

This commit is contained in:
coderaiser 2013-08-16 15:56:07 +00:00
parent 09919bad5c
commit cc5ba84f83

View file

@ -150,21 +150,23 @@
lZip = true;
lName = p.name + '.zip';
lReadStream = fs.createReadStream(p.name);
lMsg = lQuery;
} else {
lName = p.name;
lReadStream = p.request;
lMsg = 'save';
}
putFile({
name : lName,
read : lReadStream,
to : lName,
zip : lZip,
callback : function(pError, pMsg) {
callback : function(pError) {
if (pError)
main.sendError(pParams, pError);
else {
lName = path.basename(lName);
sendMsg(pParams, 'ok', p.name);
sendMsg(pParams, lMsg, p.name);
}
}
});
@ -377,25 +379,23 @@
}
function putFile(pParams) {
var p, lZlib, lError, lMsg, lWrite,
lRet = Util.checkObj(pParams, ['name', 'read']);
var lZlib, lError, lMsg, lRead, lWrite,
p = pParams;
if (lRet) {
p = pParams;
if (p) {
lRead = p.read || fs.createReadStream(p.from);
lWrite = p.write || fs.createWriteStream(p.to);
lError = function(pError) {
Util.exec(p.callback, pError);
};
if (!p.zip) {
lMsg = 'save';
} else {
if (p.zip) {
lZlib = zlib.createGzip();
p.read.on('error', lError);
p.read = p.read.pipe(lZlib);
lMsg = 'zip';
}
lWrite = fs.createWriteStream(p.name);
lWrite.on('error', lError);
p.read.on('error', lError);
@ -403,7 +403,7 @@
p.read.pipe(lWrite);
p.read.on('end', function() {
Util.exec(p.callback, null, lMsg);
Util.exec(p.callback);
});
});
}