From a3fc78ae38ef80ffb2d9fe09db41b8b41dbf0a38 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Fri, 1 Mar 2013 03:26:43 -0500
Subject: [PATCH] minor changes

---
 lib/server/ischanged.js | 128 ++++++++++++++++++++--------------------
 lib/server/main.js      |  11 ++++
 2 files changed, 75 insertions(+), 64 deletions(-)

diff --git a/lib/server/ischanged.js b/lib/server/ischanged.js
index 9d0cedb8..03895071 100644
--- a/lib/server/ischanged.js
+++ b/lib/server/ischanged.js
@@ -1,65 +1,65 @@
-(function(){
-    'use strict';
-    
-    var main            = global.cloudcmd.main,
-        JSONDIR         = main.JSONDIR,
-        
-        fs              = main.fs,
-        path            = main.path,
-        Util            = main.util,
-        
-        CHANGESNAME     = JSONDIR       + 'changes',
-        CHANGES_JSON    = CHANGESNAME   + '.json',
-        
-        Times           = main.require(CHANGESNAME) || [];
-    
-    exports.isFileChanged = function(pFileName, pCallBack){
-        var lReadedTime;
-        
-        var i, n = Times.length;
-        for(i = 0; i < n; i++){
-            var lData = Times[i];
-            
-            /* if founded row with file name - save hash */
-            if(lData.name === pFileName){
-                lReadedTime = lData.time;
-                break;
-            }
-        }
-        
-        fs.stat(pFileName, function(pError, pStat){
-            var lTimeChanged;
-            
-            if(!pError){
-                var lFileTime = pStat.mtime.getTime();
-                  
-                if(lReadedTime !== lFileTime)
-                    lTimeChanged = Times[i]        = {
-                        name: pFileName,
-                        time: lFileTime
-                    };
-            }
-            else
-                lTimeChanged = Util.log(pError);
-            
-            if(lTimeChanged)
-                writeFile(CHANGES_JSON, Util.stringifyJSON(Times));
-            
-            Util.exec(pCallBack, lTimeChanged);
-        });
-    };
-    
-    /*
-     * Функция записывает файла
-     * и выводит ошибку или сообщает,
-     * что файл успешно записан
-     */
-    function writeFile(pFileName, pData){
-        fs.writeFile(pFileName, pData, function(pError){
-            if(pError)
-                Util.log(pError);
-            else
-                Util.log('file ' + path.basename(pFileName) + ' writed...');
-        });
-    }
+(function(){
+    'use strict';
+    
+    var main            = global.cloudcmd.main,
+        JSONDIR         = main.JSONDIR,
+        
+        fs              = main.fs,
+        path            = main.path,
+        Util            = main.util,
+        
+        CHANGESNAME     = JSONDIR       + 'changes',
+        CHANGES_JSON    = CHANGESNAME   + '.json',
+        
+        Times           = main.require(CHANGESNAME) || [];
+    
+    exports.isFileChanged = function(pFileName, pCallBack){
+        var lReadedTime;
+        
+        var i, n = Times.length;
+        for(i = 0; i < n; i++){
+            var lData = Times[i];
+            
+            /* if founded row with file name - save hash */
+            if(lData.name === pFileName){
+                lReadedTime = lData.time;
+                break;
+            }
+        }
+        
+        fs.stat(pFileName, function(pError, pStat){
+            var lTimeChanged;
+            
+            if(!pError){
+                var lFileTime = pStat.mtime.getTime();
+                  
+                if(lReadedTime !== lFileTime)
+                    lTimeChanged = Times[i]        = {
+                        name: pFileName,
+                        time: lFileTime
+                    };
+            }
+            else
+                lTimeChanged = Util.log(pError);
+            
+            if(lTimeChanged)
+                writeFile(CHANGES_JSON, Util.stringifyJSON(Times));
+            
+            Util.exec(pCallBack, lTimeChanged);
+        });
+    };
+    
+    /*
+     * Функция записывает файла
+     * и выводит ошибку или сообщает,
+     * что файл успешно записан
+     */
+    function writeFile(pFileName, pData){
+        fs.writeFile(pFileName, pData, function(pError){
+            if(pError)
+                Util.log(pError);
+            else
+                Util.log('file ' + path.basename(pFileName) + ' writed...');
+        });
+    }
 })();
\ No newline at end of file
diff --git a/lib/server/main.js b/lib/server/main.js
index 001900c8..67160d34 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -53,6 +53,7 @@
     exports.librequire                      = librequire,
     exports.srvrequire                      = srvrequire,
     exports.rootrequire                     = rootrequire,
+    exports.quietrequire                     = quietrequire,
     
     exports.generateHeaders                 = generateHeaders,
     exports.getQuery                        = getQuery,
@@ -125,6 +126,16 @@
         return lModule;
     }
     
+    function quietrequire(pSrc){
+        var lModule;
+        
+        Util.tryCatch(function(){
+            lModule = require(pSrc);
+        });
+        
+        return lModule;
+    }
+    
     function rootrequire(pSrc){ return mrequire(DIR + pSrc); }
     
     function librequire(pSrc){ return mrequire(LIBDIR + pSrc); }