X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitMonitor.vala;h=4c7dfde9b93edf1c9c2b06bcb4b264cb4573343c;hp=67288bbcf70664e937bc32a8691909783634cd7e;hb=08415bc285bb4d01c01b0965bdd3789a63e3dba7;hpb=318641674fdef643dfb50333adfa575c10963dc0 diff --git a/GitMonitor.vala b/GitMonitor.vala index 67288bbc..4c7dfde9 100644 --- a/GitMonitor.vala +++ b/GitMonitor.vala @@ -1,160 +1,5 @@ - - -public class GitMonitorQueue : MonitorNamePathDir { - // name = basename - // path = full path.. - // dir = dir path - - public string gitpath; - public string vdir; // relative path (within git) - public string vname; // relative filename (within git) - public string message ; // for commit - public bool commit_all; - - public GitMonitorQueue(MonitorNamePathDir f) { - - base(f.name, f.path, f.dir); - - this.message = ""; - this.commit_all = false; - - var vpath_ar = this.dir.substring(GitMonitor.gitlive.length +1).split("/", 0); - - if (vpath_ar[0].length < 1) { - - this.gitpath = ""; - this.vdir = ""; - this.vname = ""; - } - - - this.gitpath = GitMonitor.gitlive + "/" + vpath_ar[0]; - - string[] vpath = {}; - for (var i = 1; i< vpath_ar.length; i++) { - vpath += vpath_ar[i]; - } - - this.vdir = string.joinv("/", vpath); - - this.vname = this.vdir + (this.vdir.length > 0 ? "/" : "") + this.name; -/* - stdout.printf( - "NEW GitMonitorQueue\nname: %s\npath: %s\ndir: %s\n" + - "gitpath: %s\nvdir: %s\nvname: %s\n", - this.name, this.path, this.dir, - this.gitpath, this.vdir, this.vname - ); -*/ - - //f.repo = new imports.Scm.Git.Repo({ repopath: f.gitpath }) - - - } - - public bool shouldIgnore() - { - - - // vim.. what a seriously brain dead program.. - if (this.name == "4913") { - return true; - } - - if (this.name[0] == '.') { - // except! - if (this.name == ".htaccess") { - return false; - } - - return true; - } - - if (this.name[this.name.length -1] == '~') { - return true; - } - // netbeans / android studio.. silly temp files.. - - if (Regex.match_simple("___jb_old___$", this.name)) { - return true; - } - if (Regex.match_simple("___jb_bak___$", this.name)) { - return true; - } - //if (f.name.match(/^nbproject/)) { - // return true; - //} - // ignore anything in top level!!!! - if (this.gitpath.length < 1) { - return true; - } - - return false; - } - - /** -- statics --*/ - - public static int indexOfAdd( Array add_files, string add) - { - for(var i =0; i < add_files.length; i++) { - if (add_files.index(i).vname == add) { - return i; - } - } - return -1; - } - public static int indexOfMessage(Array messages, string message) { - for(var i =0; i < messages.length; i++) { - if (messages.index(i).message == message) { - return i; - } - } - return -1; - } - public static string messageToString(Array messages ) { - string[] ret = {}; - for(var i =0; i < messages.length; i++) { - ret+= messages.index(i).message; - } - return string.joinv("\n",ret); - } - public static string queueArrayToString(Array list) { - var ret = ""; - for(var i =0; i < list.length; i++) { - - ret += (ret.length > 0 ? ", " : "") + list.index(i).vname; - } - return ret; - - } - - public static bool queueHas(Array list , GitMonitorQueue cmd_s, string action) { - for(var i =0; i < list.length; i++) { - var test = list.index(i); - if (list.index(i).gitpath != cmd_s.gitpath) { - continue; - } - if (list.index(i).vname != cmd_s.vname) { - continue; - } - if (list.index(i).action != action) { - continue; - } - return true; - } - return false; - } - public string fullpath() - { - return this.gitpath + "/" + this.vname; - } - - - -} - - + public class GitMonitor : Monitor { @@ -172,21 +17,88 @@ public class GitMonitor : Monitor public bool queueRunning = false; public DateTime lastAdd; - + + + + public GitMonitor () + { - public GitMonitor () { this.queue = new Array(); GitMonitor.gitmonitor = this; + Timeout.add_full(Priority.LOW, 500, () => { + + //GLib.debug("TIMEOUT queue length = %d, is_runing = %s\n", (int)this.queue.length , this.queueRunning ? "Y" : "N"); + + //stdout.printf("QL %u: QR: %d\n", this.queue.length, this.queueRunning ? 1 : 0); + if (this.queue.length < 1 || this.queueRunning) { + return true; + } + + var last = -1 * this.lastAdd.difference(new DateTime.now(new TimeZone.local())); + + // stdout.printf("LAST RUN: %s (expect %s) \n" , + // last.to_string(), (5 * TimeSpan.SECOND).to_string() ); + + if (last < 5 * TimeSpan.SECOND) { // wait 5 seconds before running. ???? + return true; + } + //_this.lastAdd = new Date(); + //return 1; + + this.runQueue(); + return true; // + }); + } - public new void pauseError() { + public new void pauseError(string failure) + { + + var notification = new Notify.Notification( + "Git Live ERROR!!", + failure, + "dialog-information" + + ); + + notification.set_timeout(60); // show errros for longer + notification.show(); + + Canberra.Context context; + Canberra.Proplist props; + + Canberra.Context.create (out context); + Canberra.Proplist.create (out props); + + props.sets (Canberra.PROP_EVENT_ID, "phone-outgoing-busy"); + props.sets (Canberra.PROP_EVENT_DESCRIPTION, "Gitlive stopped on error"); + + + context.play_full (0, props, null); + + + + this.paused = true; + this.queueRunning = false; // what does this do to the old one... this.queue = new Array (); + this.stop(); StatusIconA.statusicon.pauseError(); - + + var m = new Gtk.MessageDialog(null, Gtk.DialogFlags.MODAL,Gtk.MessageType.ERROR,Gtk.ButtonsType.CLOSE, + "A Serious problem occured running git, you will probably have to resolve this manually\n" + + "Committing is paused now, so fix the problem, close this window, then press start again\n\n\n" + + failure + ); + m.set_keep_above(true); + m.show(); + m.set_position(Gtk.WindowPosition.CENTER); + m.response.connect( (id_pressed) => { + m.hide(); + }); + } - public new void pause() { this.paused = true; @@ -196,6 +108,7 @@ public class GitMonitor : Monitor } + /* public new void resume () { this.paused = false; this.queue = new Array (); @@ -203,12 +116,14 @@ public class GitMonitor : Monitor } + */ /** * Start the monitoring * and run the queue every 500 milliseconds.. * */ - public new void start() { + public new void start() + { StatusIconA.statusicon.refreshing(); @@ -222,7 +137,7 @@ public class GitMonitor : Monitor this.monitor(this.top.index(i) ); } StatusIconA.statusicon.resume(); - + this.paused = false; try { @@ -237,35 +152,14 @@ public class GitMonitor : Monitor notification.set_timeout(5); notification.show(); } catch(Error e) { - print("Error %s\n",e.message); + GLib.debug("Error sending notification to screen: %s",e.message); } return false; // do not keep doing this.. }); - Timeout.add_full(Priority.LOW, 1000, () => { - //TIMEOUT", _this.queue.length , _this.queueRunning].join(', ')); - - //stdout.printf("QL %u: QR: %d\n", this.queue.length, this.queueRunning ? 1 : 0); - if (this.queue.length < 1 || this.queueRunning) { - return true; - } - - var last = -1 * this.lastAdd.difference(new DateTime.now(new TimeZone.local())); - - // stdout.printf("LAST RUN: %s (expect %s) \n" , - // last.to_string(), (5 * TimeSpan.SECOND).to_string() ); - - if (last < 5 * TimeSpan.SECOND) { // wait 5 seconds before running. ???? - return true; - } - //_this.lastAdd = new Date(); - //return 1; - this.runQueue(); - return true; // - }); } @@ -319,7 +213,7 @@ public class GitMonitor : Monitor if (this.paused) { return; } - print("GitMonitor.runQueue\n"); + GLib.debug("GitMonitor.runQueue\n"); this.queueRunning = true; @@ -347,21 +241,29 @@ public class GitMonitor : Monitor this.paused = true; - print("GitMonitor.runQueue - creating repos\n"); + var leave_queued = new Gee.ArrayList(); + GLib.debug("GitMonitor.runQueue - creating repos"); for(var i = 0; i < cmds.length; i++) { var cmd = cmds.index(i); var gitpath = cmd.gitpath; - stdout.printf("GitMonitor.runQueue - finding %s\n", cmd.gitpath); + + var repo = GitRepo.get( gitpath ); + if ( !repo.is_wip_branch()) { + leave_queued.add(cmd); + continue; + } + + GLib.debug("GitMonitor.runQueue - finding %s", cmd.gitpath); - var ix = GitRepo.indexOf(repo_list, cmd.gitpath); + var ix = GitRepo.indexOf(repo_list, gitpath); if (ix < 0) { - repo_list.append_val(new GitRepo( gitpath )); + repo_list.append_val( GitRepo.get( gitpath )); ix = GitRepo.indexOf(repo_list, cmd.gitpath); } - stdout.printf("GitMonitor.runQueue - adding to repolist %d\n", ix); + GLib.debug("GitMonitor.runQueue - adding to repolist %d", ix); //if (typeof(repo_list[gitpath]) == 'undefined') { // repo_list[gitpath] = new imports.Scm.Git.Repo.Repo( { repopath : gitpath }); @@ -374,7 +276,7 @@ public class GitMonitor : Monitor this.paused = false; // build add, remove and commit message list.. - print("GitMonitor.runQueue - creating actions\n"); + GLib.debug("GitMonitor.runQueue - creating actions"); for(var i = 0;i < repo_list.length;i++) { @@ -389,6 +291,10 @@ public class GitMonitor : Monitor for(var ii = 0;ii < repo.cmds.length;ii++) { var cmd = repo.cmds.index(ii); + if (repo.is_ignore(cmd.vname)) { + continue; + } + switch(cmd.action) { case "add" : @@ -425,8 +331,12 @@ public class GitMonitor : Monitor break; } } - print( "ADD : %s\n", GitMonitorQueue.queueArrayToString(add_files)); - print( "REMOVE FILES: %s\n", GitMonitorQueue.queueArrayToString(remove_files)); + + repo.cmds.clear(); + + GLib.debug( "ADD : %s", GitMonitorQueue.queueArrayToString(add_files)); + GLib.debug( "REMOVE FILES: %s", GitMonitorQueue.queueArrayToString(remove_files)); + //repo.debug = 1; // these can fail... at present... as we wildcard stuff. @@ -470,39 +380,47 @@ public class GitMonitor : Monitor add_files_f.append_val(add_files.index(ii)); }; - print( "ADD : %s\n", GitMonitorQueue.queueArrayToString(add_files_f)); - print( "REMOVE FILES: %s\n", GitMonitorQueue.queueArrayToString(remove_files_f)); - - + GLib.debug( "ADD : %s", GitMonitorQueue.queueArrayToString(add_files_f)); + GLib.debug( "REMOVE FILES: %s", GitMonitorQueue.queueArrayToString(remove_files_f)); + + if (add_files_f.length < 1 && remove_files_f.length < 1) { + continue; + } + // make sure monitoring is paused so it does not recursively pick up // deletions + this.paused = true; + + try { + repo.pull(); } catch(Error e) { this.pauseError(e.message); //failure += e.message; - ..print("Pull failed:\n"); + //print("Pull failed:\n"); return; } - - + // -- DO STUFF.. try { repo.add(add_files_f); } catch(Error e) { + this.pauseError(e.message); + return; failure += e.message; - print("Add failed:\n"); + GLib.debug("Add failed:"); } try { repo.remove(remove_files_f); } catch(Error e) { + this.pauseError(e.message); + return; failure += e.message; - print("Remove failed:\n"); + GLib.debug("Remove failed:"); } - this.paused = false; - - + try { success += repo.commit( GitMonitorQueue.messageToString(messages), @@ -511,10 +429,27 @@ public class GitMonitor : Monitor success += repo.push(); } catch(Error e) { - failure += e.message; - print("Push failed:\n"); + + // if the error is 'nothing to commit, working tree clean' + // then it's not an error, - just continue; + if (/nothing to commit, working tree clean/.match(e.message)) { + GLib.debug("%s",e.message); + success += e.message; + this.paused = false; + continue; + } + + + + this.paused = false; + this.pauseError(e.message); + + return; + //failure += e.message; + //print("Push failed:\n"); } + this.paused = false; } @@ -536,23 +471,13 @@ public class GitMonitor : Monitor notification.show(); } - if (failure.length > 0) { + //if (failure.length > 0) { - var notification = new Notify.Notification( - "Git Live ERROR!!", - string.joinv("\n",failure), - "dialog-information" - - ); - - - notification.set_timeout(10); // show errros for longer - notification.show(); - - this.pauseError(); - } + // should never get this far... + // this.pauseError(); + //} } catch(Error e) { - print(e.message); + GLib.debug(e.message); } this.queueRunning = false; @@ -573,7 +498,7 @@ public class GitMonitor : Monitor public override void onChanged(MonitorNamePathDir src) { - print("GitMonitor.onChanged\n"); + //print("GitMonitor.onChanged\n"); return; // always ignore this..? //this.parsePath(src); } @@ -586,19 +511,19 @@ public class GitMonitor : Monitor */ public override void onChangesDoneHint(MonitorNamePathDir src) { - print("GitMonitor.onChangedHint\n"); + if (this.paused) { return; } - + GLib.debug("GitMonitor.onChangedHint"); this.lastAdd = new DateTime.now(new TimeZone.local()); var cmd = new GitMonitorQueue(src); if (cmd.shouldIgnore()) { + GLib.debug("GitMonitor.onChangedHint - ignored"); return; } - //var add_it = false; /* if (this.is_just_created(cmd.path)) { @@ -627,10 +552,11 @@ public class GitMonitor : Monitor } public override void onDeleted(MonitorNamePathDir src) { - print("GitMonitor.onDeleted\n"); + if (this.paused) { return; } + GLib.debug("GitMonitor.onDeleted"); this.lastAdd = new DateTime.now(new TimeZone.local()); var cmd = new GitMonitorQueue(src); if (cmd.shouldIgnore()) { @@ -650,10 +576,11 @@ public class GitMonitor : Monitor } public override void onCreated(MonitorNamePathDir src) { - print("GitMonitor.onCreated\n"); + if (this.paused) { return; } + GLib.debug("GitMonitor.onCreated"); this.lastAdd = new DateTime.now(new TimeZone.local()); var cmd = new GitMonitorQueue(src); if (cmd.shouldIgnore()) { @@ -680,10 +607,11 @@ public class GitMonitor : Monitor } public override void onAttributeChanged(MonitorNamePathDir src) { - print("GitMonitor.onAttributeChanged\n"); + if (this.paused) { return; } + GLib.debug("GitMonitor.onAttributeChanged %s", src.name); if (src.dir == GitMonitor.gitlive) { return; // attribute on top level.. } @@ -704,10 +632,11 @@ public class GitMonitor : Monitor public override void onMoved(MonitorNamePathDir src,MonitorNamePathDir dest) { - print("GitMonitor.onMoved\n"); + if (this.paused) { return; } + GLib.debug("GitMonitor.onMoved"); this.lastAdd = new DateTime.now(new TimeZone.local()); var cmd_s = new GitMonitorQueue(src); @@ -737,13 +666,13 @@ public class GitMonitor : Monitor } - print("RM: %s\n", cmd_s.vname); + GLib.debug("RM: %s", cmd_s.vname); cmd_s.action = "rm"; this.queue.append_val(cmd_s); - print("ADD: %s\n", cmd_d.vname); + GLib.debug("ADD: %s", cmd_d.vname); cmd_d.action = "add"; this.queue.append_val(cmd_d);