From cc5ba84f83f197f9ebffd20f3e01d90efa26fa3c Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Fri, 16 Aug 2013 15:56:07 +0000
Subject: [PATCH] refactor(rest) putFile callback: pError, pMsg -> pError

---
 lib/server/rest.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/server/rest.js b/lib/server/rest.js
index c964a7f4..28be5c53 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -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);
                 });
             });
         }