Monitor.vala

[gitlive] / Monitor.vala

diff --git a/Monitor.vala b/Monitor.vala
index 3f5ee6b..394da0d 100644 (file)
--- a/Monitor.vala
+++ b/Monitor.vala
@@ -8,11 +8,12 @@
 /// # valac --pkg gee-0.8 --pkg gio-2.0  --pkg posix Monitor.val
 
  
-using Gee; // for array list?
+//using Gee; // for array list?
 
 static int main (string[] args) {
     // A reference to our file
-    var file = File.new_for_path ("data.txt");
+    //var file = File.new_for_path ("data.txt");
+    //var m = new Monitor();
     return 0;
 
 }
@@ -33,7 +34,7 @@ public class  MonitorNamePathDir {
     }
 }
 
-static void onEventHander (FileMonitor fm, File f_orig, File of_orig, FileMonitorEvent event_type);
+public delegate void onEventHander (FileMonitor fm, File f_orig, File of_orig, FileMonitorEvent event_type);
 
 
 /**
@@ -66,20 +67,20 @@ public class Monitor : Object
     {
        
      
-        this.monitors = new ArrayList<FileMonitor> ();
-        this.top = new ArrayList<string> ();
+        this.monitors = new Array<FileMonitor> ();
+        this.top = new Array<string> ();
         this.paused = false;
     }
      
-    public ArrayList<FileMonitor> monitors;// Array of MonitorNamePathDirileMonitors
-    public ArrayList<string> top; // list of top level directories..
+    public Array<FileMonitor> monitors;// Array of MonitorNamePathDirileMonitors
+    public Array<string> top; // list of top level directories..
     public bool paused;
     /**
      * add a directory or file to monitor
      */
     public void add (string add)
     {
-        this.top.add(add);
+        this.top.append_val(add);
     }
     /**
      * start monitoring
@@ -87,7 +88,9 @@ public class Monitor : Object
     public void start()
     {
         for(int i = 0; i < this.monitors.size ; i++) {
-            this.monitor(this.top[i]);
+            this.monitor(this.top[i], ( fm,  f_orig,  of_orig,  event_type) => {
+                this.onEvent (fm,  f_orig,  of_orig,  event_type ) ;
+                } );
         }
     }
     /**
@@ -100,7 +103,7 @@ public class Monitor : Object
         for(int i = 0; i < this.monitors.size ; i++) {
             this.monitors[i].cancel();
         } 
-        this.monitors = new ArrayList<FileMonitor>(); // clean /destroy/ kill old?
+        this.monitors = new Array<FileMonitor>(); // clean /destroy/ kill old?
     }
     /**
      * pause monitoring - without changing what's monitored 
@@ -123,7 +126,7 @@ public class Monitor : Object
      * 
      * 
      */
-    public void monitor(string path, onEventHander fn = null, int depth = 0)
+    public void monitor(string path, onEventHander fn , int depth = 0)
     {
          
        // print("ADD: " + path)
@@ -139,16 +142,23 @@ public class Monitor : Object
           
         var f = File.new_for_path(path);
             //var cancel = new Gio.Cancellable ();
-        if (depth > 0) {     
-            var fm = f.monitor(FileMonitorFlags.SEND_MOVED,null); //Gio.FileMonitorFlags.SEND_MOVED
-            
-            fm.changed.connect( ( fm,  f_orig,  of_orig,  event_type) => {
-                    if (fn) {
-                        
-                    }
-                    this.onEvent (fm,  f_orig,  of_orig,  event_type ) ;
-            });
-            this.monitors.add(fm);
+        if (depth > 0) {   
+            try {
+  
+                 var fm = f.monitor(FileMonitorFlags.SEND_MOVED,null); //Gio.FileMonitorFlags.SEND_MOVED
+ 
+                 fm.changed.connect( ( fm,  f_orig,  of_orig,  event_type) => {
+                        //if (fn) {
+                            fn (fm,  f_orig,  of_orig,  event_type ) ;
+                           // return;
+                        //}
+                        //this.onEvent (fm,  f_orig,  of_orig,  event_type ) ;
+                });
+                this.monitors.add(fm);
+
+            } catch (Error e) {
+                // FIXME -- show error? do nothing..            
+            }
             // print("ADD path " + depth + ' ' + path);
         }
         // iterate children?
@@ -157,17 +167,27 @@ public class Monitor : Object
             
         //    this.initRepo(path);
         //}
-        
-       
-         var file_enum = f.enumerate_children(
-            FileAttribute.STANDARD_DISPLAY_NAME + "," +   FileAttribute.STANDARD_TYPE,
-            0, // FileQueryInfoFlags.NONE,
-            null);
-        
+        FileEnumerator file_enum;
+        try {      
+            file_enum = f.enumerate_children(
+               FileAttribute.STANDARD_DISPLAY_NAME + "," +   FileAttribute.STANDARD_TYPE,
+               0, // FileQueryInfoFlags.NONE,
+               null);
+        } catch (Error e) {
+            // FIXME - show error..
+            return;
+        }
         FileInfo next_file;
         
-        while ((next_file = file_enum.next_file(null)) != null) {
-         
+        while (true) {
+            try {        
+                next_file = file_enum.next_file(null);
+            } catch (Error e) {
+                break;
+            }
+            if (next_file == null) {
+                break;
+            }
             //print("got a file " + next_file.sudo () + '?=' + Gio.FileType.DIRECTORY);
             
             if (next_file.get_file_type() != FileType.DIRECTORY) {
@@ -195,8 +215,11 @@ public class Monitor : Object
             this.monitor(sp, fn, depth + 1);
             
         }
-    
-        file_enum.close(null);
+        try {
+            file_enum.close(null);
+        } catch(Error e) {
+            // ignore?
+        }
     }