X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Monitor.vala;h=5b12963d5972dd94f8f87a77fa2f0f8bf7d3d1fb;hp=63997bfa545ffec78b8395240d102225dbe3eb38;hb=refs%2Fheads%2Fwip_alan_T5632_cache_project_listing;hpb=dc2da3a97cacb537a24721d554fe5441ae33b593 diff --git a/Monitor.vala b/Monitor.vala index 63997bfa..5b12963d 100644 --- a/Monitor.vala +++ b/Monitor.vala @@ -5,21 +5,29 @@ //var XObject = imports.XObject.XObject; //var File = imports.File.File; -/// # valac --pkg gee-0.8 --pkg gio-2.0 --pkg posix Monitor.val +/// # valac --pkg gio-2.0 --pkg posix Monitor.vala -o /tmp/Monitor -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"); + MainLoop loop = new MainLoop (); + print("starting"); + var m = new Monitor(); + + m.add("/home/alan/gitlive"); + m.start(); + loop.run (); + return 0; } - +*/ public class MonitorNamePathDir { - + public string action; public string name; public string path; public string dir; @@ -29,10 +37,13 @@ public class MonitorNamePathDir { this.name = name; this.path = path; this.dir = dir; + this.action = "?"; } } + + public delegate void onEventHander (FileMonitor fm, File f_orig, File of_orig, FileMonitorEvent event_type); @@ -57,7 +68,12 @@ public delegate void onEventHander (FileMonitor fm, File f_orig, File of_orig, F * */ -public class Monitor : Object +public abstract class gitMonitorBase : Object +{ + public abstract void monitor(string path, int depth = 0); +} + +public class Monitor : gitMonitorBase { @@ -66,28 +82,30 @@ public class Monitor : Object { - this.monitors = new ArrayList (); - this.top = new ArrayList (); + this.monitors = new Array (); + this.top = new Array (); this.paused = false; } - public ArrayList monitors;// Array of MonitorNamePathDirileMonitors - public ArrayList top; // list of top level directories.. + public Array monitors;// Array of MonitorNamePathDirileMonitors + public Array 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); + + print("Monitor.add: " + add); + this.top.append_val(add); } /** * start monitoring */ public void start() { - for(int i = 0; i < this.monitors.size ; i++) { - this.monitor(this.top[i], ( fm, f_orig, of_orig, event_type) => {} ); + for(int i = 0; i < this.top.length ; i++) { + this.monitor(this.top.index(i)); } } /** @@ -97,10 +115,10 @@ public class Monitor : Object public void stop() { - for(int i = 0; i < this.monitors.size ; i++) { - this.monitors[i].cancel(); + for(int i = 0; i < this.monitors.length ; i++) { + this.monitors.index(i).cancel(); } - this.monitors = new ArrayList(); // clean /destroy/ kill old? + this.monitors = new Array(); // clean /destroy/ kill old? } /** * pause monitoring - without changing what's monitored @@ -123,10 +141,10 @@ public class Monitor : Object * * */ - public void monitor(string path, onEventHander fn , int depth = 0) + public override void monitor(string path, int depth = 0) { - // print("ADD: " + path) + //GLib.debug("ADD: (%d): %s\n", depth, path); //depth = typeof(depth) == 'number' ? depth *1 : 0; depth = depth > 0 ? depth *1 : 0; @@ -135,21 +153,23 @@ public class Monitor : Object //fn = fn || function (fm, f, of, event_type, uh) { // _this.onEvent(fm, f, of, event_type, uh); //} - - + 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) { - fn (fm, f_orig, of_orig, event_type ) ; - // return; - //} - //this.onEvent (fm, f_orig, of_orig, event_type ) ; - }); - this.monitors.add(fm); + if (depth > 0) { + + try { + var fm = f.monitor(FileMonitorFlags.SEND_MOVED + FileMonitorFlags.WATCH_MOVES,null); + //var fm = f.monitor(FileMonitorFlags.WATCH_MOVES,null); + + fm.changed.connect( this.onEvent ); + this.monitors.append_val(fm); + + } catch (Error e) { + GLib.debug("Error adding monitor: %s\n", e.message); + GLib.debug("Try: \n\nsudo su\necho 512 > /proc/sys/fs/inotify/max_user_instances\n"); + // FIXME -- show error? do nothing.. + } // print("ADD path " + depth + ' ' + path); } // iterate children? @@ -158,25 +178,44 @@ 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; + var cancellable = new Cancellable (); + try { + file_enum = f.enumerate_children( + FileAttribute.STANDARD_DISPLAY_NAME + "," + FileAttribute.STANDARD_TYPE, + FileQueryInfoFlags.NOFOLLOW_SYMLINKS, // FileQueryInfoFlags.NONE, + cancellable); + } catch (Error e) { + // FIXME - show error.. + return; + } FileInfo next_file; - while ((next_file = file_enum.next_file(null)) != null) { - + while (cancellable.is_cancelled () == false ) { + try { + next_file = file_enum .next_file (cancellable); + } catch(Error e) { + print(e.message); + break; + } + + if (next_file == null) { + break; + } + //print("got a file " + next_file.sudo () + '?=' + Gio.FileType.DIRECTORY); - + if (next_file.get_file_type() != FileType.DIRECTORY) { next_file = null; continue; } - - if (next_file.get_file_type() ==FileType.SYMBOLIC_LINK) { + + + //stdout.printf("Monitor.monitor: got file %s : type :%u\n", + // next_file.get_display_name(), next_file.get_file_type()); + + + if (next_file.get_is_symlink()) { next_file = null; continue; } @@ -193,11 +232,14 @@ public class Monitor : Object - this.monitor(sp, fn, depth + 1); + this.monitor(sp, depth + 1); } - - file_enum.close(null); + try { + file_enum.close(null); + } catch(Error e) { + // ignore? + } } @@ -229,25 +271,19 @@ public class Monitor : Object - public void onEvent(FileMonitor fm, File f_orig, File of_orig, FileMonitorEvent event_type) + public void onEvent(File f_orig, File? of_orig, FileMonitorEvent event_type) { if (this.paused) { return; } - + // print("onEvent\n"); var f = this.realpath(f_orig); - var of = this.realpath(of_orig); - - MonitorNamePathDir src = new MonitorNamePathDir( f.get_basename(), f.get_path() , Path.get_dirname(f.get_path())); - MonitorNamePathDir dest = null; + - if (of != null) { - dest = new MonitorNamePathDir( of.get_basename(), of.get_path(), Path.get_dirname(of.get_path())); - - } + //string event_name = "UKNOWN"; @@ -258,36 +294,62 @@ public class Monitor : Object // } //} + + + //print (JSON.stringify([event_name , f.get_path(), of ? of.get_path() : false ] )); //print ("got src: " + src.toString()); //print ("got event: " + src.toString()); try { + switch(event_type) { case FileMonitorEvent.CHANGED: + src.action = "changed"; this.onChanged(src); return; // ingore thise?? -wait for changes_done_htin? case FileMonitorEvent.CHANGES_DONE_HINT: + src.action = "changed"; this.onChangesDoneHint(src); return; case FileMonitorEvent.DELETED: + src.action = "rm"; this.onDeleted(src); return; case FileMonitorEvent.CREATED: + src.action = "created"; this.onCreated(src); return; case FileMonitorEvent.ATTRIBUTE_CHANGED: // eg. chmod/chatt + src.action = "attrib"; this.onAttributeChanged(src); return; case FileMonitorEvent.MOVED: // eg. chmod/chatt + case FileMonitorEvent.MOVED_IN: // eg. chmod/chatt + case FileMonitorEvent.MOVED_OUT: // eg. chmod/chatt + case FileMonitorEvent.RENAMED: // eg. chmod/chatt + + var of = this.realpath(of_orig); + var dest = new MonitorNamePathDir( + of.get_basename(), + of.get_path(), + Path.get_dirname(of.get_path()) + ); + + src.action = "moved"; + dest.action = "moved"; this.onMoved(src,dest); return; - + + + default: + stdout.printf("event type not handled %u", event_type); + break; // rest are mount related - not really relivant.. maybe add later.. } } catch(Error e) { @@ -296,14 +358,15 @@ public class Monitor : Object } + /** override these to do stuff.. */ - public void initRepo(MonitorNamePathDir src) { } // called on startup at the top level repo dir. - public void onChanged(MonitorNamePathDir src) { } - public void onChangesDoneHint(MonitorNamePathDir src) { } - public void onDeleted(MonitorNamePathDir src) { } - public void onCreated(MonitorNamePathDir src) { } - public void onAttributeChanged(MonitorNamePathDir src) { } - public void onMoved(MonitorNamePathDir src,MonitorNamePathDir dest) { } + //public void initRepo(MonitorNamePathDir src) { } // called on startup at the top level repo dir. + public virtual void onChanged(MonitorNamePathDir src) { } + public virtual void onChangesDoneHint(MonitorNamePathDir src) { } + public virtual void onDeleted(MonitorNamePathDir src) { } + public virtual void onCreated(MonitorNamePathDir src) { } + public virtual void onAttributeChanged(MonitorNamePathDir src) { } + public virtual void onMoved(MonitorNamePathDir src,MonitorNamePathDir dest) { } }