Monitor.vala

[gitlive] / Monitor.vala

diff --git a/Monitor.vala b/Monitor.vala
index 4afb6a1..18d1935 100644 (file)
--- a/Monitor.vala
+++ b/Monitor.vala
@@ -13,7 +13,8 @@ using Gee; // for array list?
 static int main (string[] args) {
     // A reference to our file
     var file = File.new_for_path ("data.txt");
-
+    var m = new Monitor();
+    return 0;
 
 }
 
@@ -33,6 +34,9 @@ public class  MonitorNamePathDir {
     }
 }
 
+public delegate void onEventHander (FileMonitor fm, File f_orig, File of_orig, FileMonitorEvent event_type);
+
+
 /**
  * Monitor class - handles monitor managment for a large tree...
  *
@@ -83,8 +87,10 @@ public class Monitor : Object
      */
     public void start()
     {
-        foreach(var in in this.top) {
-            this.monitor(this.top[i]);
+        for(int i = 0; i < this.monitors.size ; i++) {
+            this.monitor(this.top[i], ( fm,  f_orig,  of_orig,  event_type) => {
+                this.onEvent (fm,  f_orig,  of_orig,  event_type ) ;
+                } );
         }
     }
     /**
@@ -94,7 +100,7 @@ public class Monitor : Object
     public void stop()
     {
         
-        foreach(var i in  this.monitors) {
+        for(int i = 0; i < this.monitors.size ; i++) {
             this.monitors[i].cancel();
         } 
         this.monitors = new ArrayList<FileMonitor>(); // clean /destroy/ kill old?
@@ -120,7 +126,7 @@ public class Monitor : Object
      * 
      * 
      */
-    public void monitor(string path, string fn, int depth)
+    public void monitor(string path, onEventHander fn , int depth = 0)
     {
          
        // print("ADD: " + path)
@@ -140,7 +146,11 @@ public class Monitor : Object
             var fm = f.monitor(FileMonitorFlags.SEND_MOVED,null); //Gio.FileMonitorFlags.SEND_MOVED
             
             fm.changed.connect( ( fm,  f_orig,  of_orig,  event_type) => {
-                    this.onEvent (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);
             // print("ADD path " + depth + ' ' + path);
@@ -152,11 +162,9 @@ public class Monitor : Object
         //    this.initRepo(path);
         //}
         
-        var enumerator = directory.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, 0, null);
-
- 
+       
          var file_enum = f.enumerate_children(
-            FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME + ','+    FILE_ATTRIBUTE_STANDARD_TYPE,
+            FileAttribute.STANDARD_DISPLAY_NAME + "," +   FileAttribute.STANDARD_TYPE,
             0, // FileQueryInfoFlags.NONE,
             null);
         
@@ -166,12 +174,12 @@ public class Monitor : Object
          
             //print("got a file " + next_file.sudo () + '?=' + Gio.FileType.DIRECTORY);
             
-            if (next_file.get_file_type() != FILETYPE_DIRECTORY) {
+            if (next_file.get_file_type() != FileType.DIRECTORY) {
                 next_file = null;
                 continue;
             }
             
-            if (next_file.get_file_type() == FILETYPE_SYMBOLIC_LINK) {
+            if (next_file.get_file_type() ==FileType.SYMBOLIC_LINK) {
                 next_file = null;
                 continue;
             }
@@ -180,7 +188,7 @@ public class Monitor : Object
                 next_file = null;
                 continue;
             }
-            var sp = path+'/'+next_file.get_display_name();
+            var sp = path+"/"+next_file.get_display_name();
             // skip modules.
             //print("got a file : " + sp);
          
@@ -243,7 +251,7 @@ public class Monitor : Object
             dest = new MonitorNamePathDir( of.get_basename(), of.get_path(),  Path.get_dirname(of.get_path()));
             
         }
-        string event_name = "UKNOWN";
+        //string event_name = "UKNOWN";
         
         
         // extract the event names ... - not sure if introspection is feasible in vala..