fix date calc

[gitlive] / GitMonitor.js

diff --git a/GitMonitor.js b/GitMonitor.js
index 29bee4e..df3565a 100644 (file)
--- a/GitMonitor.js
+++ b/GitMonitor.js
@@ -39,23 +39,45 @@ var GitMonitor = new Monitor({
         
     },
     
-    
+    /**
+     * Start the monitoring
+     * and run the queue every 500 milliseconds..
+     *
+     */
     start: function() {
+        imports.StatusIcon.StatusIcon.el.set_from_stock( Gtk.STOCK_REFRESH );
         var _this = this;
         this.lastAdd = new Date();
         
-        this.top.forEach(this.monitor, this);
-         
         GLib.timeout_add(GLib.PRIORITY_LOW, 500, function() {
+            _this.top.forEach(_this.monitor, _this);
+            imports.StatusIcon.StatusIcon.el.set_from_stock( Gtk.STOCK_MEDIA_PLAY );
+            
+            try { 
+                var notification = new Notify.Notification({
+                    summary: "Git Live",
+                    body : this.gitlive + "\nMonitoring " + _this.monitors.length + " Directories",
+                    timeout : 5
+                });
+        
+                notification.set_timeout(5);
+                notification.show();
+            } catch(e) {
+                print(e.toString());
+            }
+
+        });
+        
+        GLib.timeout_add(GLib.PRIORITY_LOW, 1000, function() {
             //TIMEOUT", _this.queue.length , _this.queueRunning].join(', '));
             if (!_this.queue.length || _this.queueRunning) {
                 return 1;
             }
             var last = Math.floor(((new Date()) - _this.lastAdd) / 100);
             
-            print("LAST RUN?" + last);
+            //print("LAST RUN?" + last);
             
-            if (last < 30) { // wait 1/2 a seconnd before running.
+            if (last < 5) { // wait 1/2 a seconnd before running.
                 return 1;
             }
             //_this.lastAdd = new Date();
@@ -65,19 +87,39 @@ var GitMonitor = new Monitor({
             return 1;
         },null,null);
         
-        try { 
-            var notification = new Notify.Notification({
-                summary: "Git Live",
-                body : this.gitlive + "\nMonitoring " + this.monitors.length + " Directories",
-                timeout : 5
-            });
+      
+    },
     
-            notification.set_timeout(5);
-            notification.show();
-        } catch(e) {
-            print(e.toString());
+    
+    stop: function() {
+        imports.StatusIcon.StatusIcon.el.set_from_stock( Gtk.STOCK_MEDIA_PAUSE );
+        Monitor.prototype.stop.call(this);
+    },
+    
+    
+    monitor : function(path, fn, depth)
+    {
+        depth = typeof(depth) == 'number'  ? depth *1 : 0;
+        
+         
+        // if we are not at top level.. and there is a .git directory  (it's a submodule .. ignore) 
+        if (depth > 1 && GLib.file_test(path + '/.git' , GLib.FileTest.IS_DIR)) {
+            return;
         }
-
+        
+        if (depth == 1) {
+            var repo = imports.Scm.Repo.Repo.get(path);
+            if (!repo || !repo.autocommit()) {
+                return;
+            } 
+        }
+        
+        
+        // check if the repo is to be monitored.
+        //print("PATH : " + path);
+        
+        
+        Monitor.prototype.monitor.call(this, path,fn, depth);
     },
     
     /**
@@ -118,8 +160,6 @@ var GitMonitor = new Monitor({
             if (typeof(repo_list[gitpath]) == 'undefined') {
                 repo_list[gitpath] = new imports.Scm.Git.Repo.Repo( { repopath : gitpath });
                 repo_list[gitpath].cmds = [];
-                
-                
                 repo_list[gitpath].pull();
             }
             repo_list[gitpath].cmds.push(cmd);
@@ -128,13 +168,16 @@ var GitMonitor = new Monitor({
         // build add, remove and commit message list..
         
          
+         
         for (var gitpath in repo_list) {
             var repo = repo_list[gitpath];
             var add_files = [];
             var remove_files = [];
             var messages = [];
+            //print(JSON.stringify(repo.cmds,null,4));
+            
             repo.cmds.forEach(function(cmd) {
-                //print(JSON.stringify(cmd));
+                
                 var name = cmd.shift();
                 var arg = cmd.shift();
                 
@@ -146,15 +189,22 @@ var GitMonitor = new Monitor({
                         }
                         
                         // if file does not exist.. s,ip
-                        if (!GLib.file_test(arg, GLib.FileTest.EXISTS)) {
-                            break;
-                        }
+                        
+                        //if (!GLib.file_test(arg, GLib.FileTest.EXISTS)) {
+                             
+                        //    break;
+                         // }
         
                         
                         add_files.push(arg);
                         break;
                     
                     case 'rm':
+                        
+                        if (add_files.indexOf(arg) > -1) {
+                            break;
+                        }
+                        
                         // if file exists, do not try and delete it.
                         if (GLib.file_test(arg, GLib.FileTest.EXISTS)) {
                             break;
@@ -165,11 +215,13 @@ var GitMonitor = new Monitor({
                     
                     case 'commit' :
                         
-                        
-                        messages.push(arg.message);
+                        if (messages.indexOf(arg.message) < 0) { 
+                            messages.push(arg.message);
+                        }
                         break;    
                 } 
             });
+            
             //repo.debug = 1;
             // these can fail... at present... as we wildcard stuff.
             print("ADD : "  + JSON.stringify(add_files));
@@ -180,11 +232,14 @@ var GitMonitor = new Monitor({
             });
             print("REMOVE : "  + JSON.stringify(remove_files));
             
-            repo.add(add_files);
             
             // make sure monitoring is paused so it does not recursively pick up
             // deletions
-          
+            
+            // -- DO STUFF..
+            
+            repo.add(add_files);
+            
             repo.remove(remove_files);
             this.paused = false;
             
@@ -245,6 +300,8 @@ var GitMonitor = new Monitor({
         if (this.paused) {
             return true;
         }
+        
+        
         // vim.. what a seriously brain dead program..
         if (f.name == '4913') {
             return true;
@@ -261,6 +318,9 @@ var GitMonitor = new Monitor({
         if (f.name.match(/~$/)) {
             return true;
         }
+        if (f.name.match(/^nbproject/)) {
+            return true;
+        }
         // ignore anything in top level!!!!
         if (!f.vpath.length) {
             return true;