From 97cf4b730d4b8835afce41e0a460b39b2b645a4d Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Tue, 29 Jan 2013 10:13:25 -0500
Subject: [PATCH] minor changes

---
 README.md               |  2 +-
 cloudcmd.js             |  7 ++++---
 json/config.json        |  4 ++--
 lib/server.js           |  6 ++++--
 lib/server/ischanged.js | 25 +++++++++++--------------
 lib/server/minify.js    | 24 +++++++++++++++++++++---
 6 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 98346c8b..dcce602b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 Cloud Commander [![Build Status](https://secure.travis-ci.org/coderaiser/cloudcmd.png?branch=master)](http://travis-ci.org/coderaiser/cloudcmd)
-=============== 
+===============
 **Cloud Commander** - user friendly cloud file manager.
 DEMO:
 [cloudfoundry] (//cloudcmd.cloudfoundry.com "cloudfoundry"),
diff --git a/cloudcmd.js b/cloudcmd.js
index 2d1d555d..b35507a6 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -108,7 +108,8 @@
             lOptimizeParams.push(LIBDIR + 'client.js');
         
         if (pAllowed.html)
-            lOptimizeParams.push(lIndex);
+            //lOptimizeParams.push(lIndex);
+            lOptimizeParams = lIndex;
         
         if (pAllowed.css) {
             var lStyles = [{}, {}];
@@ -119,8 +120,8 @@
             lOptimizeParams.push(lStyles[1]);
         }
         
-        if (lOptimizeParams.length)
-            lMinify.optimize(lOptimizeParams,{cache:true});
+        //if (lOptimizeParams.length)
+            //lMinify.optimize(lOptimizeParams);
     }
     
     /**
diff --git a/json/config.json b/json/config.json
index 30a5f000..9a289e50 100644
--- a/json/config.json
+++ b/json/config.json
@@ -5,8 +5,8 @@
     "minification" : {
         "js"    : false,
         "css"   : false,
-        "html"  : true,
-        "img"   : true
+        "html"  : false,
+        "img"   : false
     },
     "logs"                  : false,
     "show_keys_panel"       : true,
diff --git a/lib/server.js b/lib/server.js
index 939f37fa..1907b7b6 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -324,8 +324,10 @@
                 
                 if(lResult)
                     lResult = CloudServer.Minify.optimize(lName, {
-                        cache: true,
-                        callback: function(pFileData){
+                        name        : lName,
+                        request     : pReq,
+                        response    : pRes,
+                        callback    : function(pFileData){
                             lReadFileFunc_f(undefined, pFileData, false);
                         }
                     });
diff --git a/lib/server/ischanged.js b/lib/server/ischanged.js
index a33806e2..12966718 100644
--- a/lib/server/ischanged.js
+++ b/lib/server/ischanged.js
@@ -1,18 +1,18 @@
 (function(){
     'use strict';
     
-    var main        = require('./main'), //global.cloudcmd.main,
-        DIR         = main.DIR,
+    var main            = require('./main'), //global.cloudcmd.main,
+        DIR             = main.DIR,
         
-        fs          = main.fs,
-        path        = main.path,
-        Util        = main.util,
+        fs              = main.fs,
+        path            = main.path,
+        Util            = main.util,
         
         /* object contains hashes of files*/
-        CHANGESNAME  = DIR       + 'json/changes',
-        CHANGES_JSON = CHANGESNAME   + '.json',
-                
-        Times = main.require(CHANGESNAME) || [],
+        CHANGESNAME     = DIR       + 'json/changes',
+        CHANGES_JSON    = CHANGESNAME   + '.json',
+        
+        Times           = main.require(CHANGESNAME) || [],
         GTimesChanged;
     
     exports.isFileChanged = function(pFileName, pLastFile_b, pCallBack){
@@ -29,6 +29,7 @@
             }
         }
         
+        console.log(pFileName);
         fs.stat(pFileName, function(pError, pStat){
             var lTimeChanged;
             
@@ -42,7 +43,7 @@
                     };
                     
                     lTimeChanged    =
-                    GTimesChanged    = true;
+                    GTimesChanged   = true;
                 }
                 
                 if(pLastFile_b && GTimesChanged)
@@ -70,8 +71,4 @@
                 Util.log('minify: file ' + path.basename(pFileName) + ' writed...');
         });
     }
-    
-    exports.isFileChanged(DIR + 'manifest.yml', true, function(pData){
-        console.log(pData);
-    });
 })();
\ No newline at end of file
diff --git a/lib/server/minify.js b/lib/server/minify.js
index 2485c1f2..cb56bade 100644
--- a/lib/server/minify.js
+++ b/lib/server/minify.js
@@ -7,7 +7,7 @@
         DIR         = main.DIR,
         LIBDIR      = main.LIBDIR,
         HTMLDIR     = main.HTMLDIR,
-        
+        Util        = main.util,
         Minify      = main.require('minify');
     
     exports.Minify = {
@@ -53,7 +53,25 @@
                     this.MinFolder = Minify.MinFolder;
                 
                 if(this._allowed.css || this._allowed.js || this._allowed.html){
-                    Minify.optimize(pName, pParams);
+                    main.srvrequire("ischanged").isFileChanged(pName, false, function(pChanged){
+                        if(!pChanged){
+                            Minify.optimize(pName, pParams);
+                        }else{
+                            var lDot = pName.lastIndexOf('.'),
+                                lExt = pName.substr(lDot);
+                            
+                            pName = Minify.MinFolder + main.crypto.createHash('sha1')
+                                .update(pName)
+                                .digest('hex') + lExt;
+                            
+                            console.log(pName);
+                            
+                            pParams.callback = null;
+                            if(pParams.request && pParams.response)
+                                main.sendFile(pParams);
+                        }
+                    });
+                    
                     lResult = true;
                 }
             }
@@ -64,7 +82,7 @@
                     html    : false
                 };
                     
-                console.log('Could not minify ' +
+                Util.log('Could not minify ' +
                     'without minify module\n'   +
                     'npm i minify');
             }