diff --git a/lib/server/rest.js b/lib/server/rest.js index cb42eb77..58524b7f 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -329,24 +329,17 @@ break; case 'cp': - if (Util.checkObjTrue(lFiles, ['from', 'to'])) { - var l = lFiles, - lReadStream = fs.createReadStream(l.from), - lWriteStream = fs.createWriteStream(l.to), - - lError = function(pError){ - main.sendError(pParams, pError); - }; - - lWriteStream.on('error', lError); - lReadStream.on('error', lError); - - lReadStream.on('end', function(){ - sendMsg(pParams, 'copy', l.to); - }); - - lReadStream.pipe(lWriteStream); - } + if (Util.checkObjTrue(lFiles, ['from', 'to'])) + putFile({ + from : lFiles.from, + to : lFiles.to, + callback : function(pError) { + if (pError) + main.sendError(pParams, pError); + else + sendMsg(pParams, 'copy', lFiles.to); + } + }); else main.sendError(pParams, p.data); break; @@ -392,17 +385,17 @@ if (p.zip) { lZlib = zlib.createGzip(); - p.read.on('error', lError); - p.read = p.read.pipe(lZlib); + lRead.on('error', lError); + lRead = lRead.pipe(lZlib); } lWrite.on('error', lError); - p.read.on('error', lError); + lRead.on('error', lError); lWrite.on('open', function() { - p.read.pipe(lWrite); + lRead.pipe(lWrite); - p.read.on('end', function() { + lRead.on('end', function() { Util.exec(p.callback); }); });