GitMonitor.vala

[gitlive] / GitMonitor.vala

diff --git a/GitMonitor.vala b/GitMonitor.vala
index 7efedfe..f0927f2 100644 (file)
--- a/GitMonitor.vala
+++ b/GitMonitor.vala
@@ -18,7 +18,7 @@ public class GitMonitorQueue : MonitorNamePathDir {
  
             this.message = "";
             this.commit_all = false;
-  
+            
             var vpath_ar = this.dir.substring(GitMonitor.gitlive.length +1).split("/", 0);
             
             if (vpath_ar[0].length < 1) {
@@ -90,7 +90,8 @@ public class GitMonitorQueue : MonitorNamePathDir {
         
         /** -- statics --*/
         
-        public static int indexOfAdd( Array<GitMonitorQueue> add_files, string add) {
+        public static int indexOfAdd( Array<GitMonitorQueue> add_files, string add)
+        {
             for(var i =0; i < add_files.length; i++) {
                 if (add_files.index(i).vname == add) {
                     return i;
@@ -337,6 +338,7 @@ public class GitMonitor : Monitor
             var repo = repo_list.index(i);
 
             var add_files = new Array<GitMonitorQueue>();
+            var add_files_f = new Array<GitMonitorQueue>();
             var remove_files = new Array<GitMonitorQueue>();
             var messages = new Array<GitMonitorQueue>();
             //print(JSON.stringify(repo.cmds,null,4));
@@ -385,8 +387,8 @@ public class GitMonitor : Monitor
             // these can fail... at present... as we wildcard stuff.
             stdout.printf("ADD : %u files\n"  , add_files.length);
             
-            // make sure added files do not get removed..
-
+            // make sure added files do not get removed.. ?? 
+            /*
             var remove_files_f = new Array<GitMonitorQueue>();
             for(var ii = 0;ii < remove_files.length;ii++) {
                 if (GitMonitorQueue.indexOfAdd(add_files,  remove_files.index(ii).vname) > -1 ) {
@@ -395,9 +397,19 @@ public class GitMonitor : Monitor
                 remove_files_f.append_val(remove_files.index(ii));
             };
             stdout.printf("REMOVE : %u files\n"  , remove_files_f.length);
-             
+            */
+            
+            // if file was added, then removed, 
+            
+            
             // make sure monitoring is paused so it does not recursively pick up
             // deletions
+            try {
+                repo.pull();
+            } catch(Error e) {
+                failure +=  e.message;
+            }
+            
             
             // -- DO STUFF..            
             try {
@@ -590,6 +602,10 @@ public class GitMonitor : Monitor
         if (this.paused) {
             return;
         }
+        if (src.dir == GitMonitor.gitlive) {
+           return; // attribute on top level..
+        }
+        
         this.lastAdd = new DateTime.now(new TimeZone.local()); 
         var cmd = new GitMonitorQueue(src);
         if (cmd.shouldIgnore()) {