- 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 stop() {
- StatusIconA.statusicon.set_from_stock( Gtk.Stock.MEDIA_PAUSE );;
- base.stop();
- }
-
-
- public new void monitor (string path, int depth = 0)
- {
-
- //var depth = typeof(depth) == 'number' ? depth *1 : 0;
-
-
- // if we are not at top level.. and there is a .git directory (it's a submodule .. ignore)
- if (depth > 1 && FileUtils.test(path + "/.git" , FileTest.IS_DIR)) {
- return;
- }
-
- if (depth == 1) {
- // FIXME - check if repo is flagged as not autocommit..
- //var repo = imports.Scm.Repo.Repo.get(path);
- //if (!repo || !repo.autocommit()) {
- // return;
- //}
- }
-
-
- // check if the repo is to be monitored.
- //print("PATH : " + path);
-
-
- base.monitor(path, depth);
- }
-
-
-
- /**
- * run the queue.
- * - pulls the items off the queue
- * (as commands run concurrently and new items may get added while it's running)
- * - runs the queue items
- * - pushes upstream.
- *
- */
- public void runQueue()
- {
-
- if (this.paused) {
- return;
- }
- print("GitMonitor.runQueue\n");
-
- this.queueRunning = true;
-
- var cmds = new Array<GitMonitorQueue>();
-
- for(var i = 0; i < this.queue.length; i++) {
- cmds.append_val(this.queue.index(i));
- }
-
- this.queue = new Array<GitMonitorQueue>();// empty queue!
-
-
- string[] success = {};
- string[] failure = {};
- //var repos = new Array<GitRepo>(); //??
- //var done = new Array<GitMonitorQueue>();
-
- // first build a array of repo's to work with
- var repo_list = new Array<GitRepo>();
-
- // pull and group.
-
- //print(JSON.stringify(cmds));
- // make sure nothing get's added to the queue where we are doing this..
-
- this.paused = true;
-
- print("GitMonitor.runQueue - creating repos\n");
-
- 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 ix = GitRepo.indexOf(repo_list, cmd.gitpath);
- if (ix < 0) {
- repo_list.append_val(new GitRepo( gitpath ));
- ix = GitRepo.indexOf(repo_list, cmd.gitpath);
- }
- stdout.printf("GitMonitor.runQueue - adding to repolist %d\n", ix);
-
- //if (typeof(repo_list[gitpath]) == 'undefined') {
- // repo_list[gitpath] = new imports.Scm.Git.Repo.Repo( { repopath : gitpath });
- // repo_list[gitpath].cmds = [];
- // repo_list[gitpath].pull();
- //}
- repo_list.index(ix).cmds.append_val(cmd);
-
- }
- this.paused = false;
- // build add, remove and commit message list..
-
- print("GitMonitor.runQueue - creating actions\n");
-
- for(var i = 0;i < repo_list.length;i++) {
-
- 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));
-
- for(var ii = 0;ii < repo.cmds.length;ii++) {
- var cmd = repo.cmds.index(ii);
-
-
- switch(cmd.action) {
- case "add" :
-
- if (GitMonitorQueue.indexOfAdd(add_files, cmd.vname) > -1) {
- break;
- }
-
- add_files.append_val(cmd);
- break;
-
- case "rm":
- if (GitMonitorQueue.indexOfAdd(remove_files, cmd.vname) > -1 ) {
- break;
- }
-
- // if file exists, do not try and delete it.
- if (FileUtils.test(cmd.vname, FileTest.EXISTS)) {
- break;
- }
-
- remove_files.append_val(cmd);
- break;
-
- case "commit" :
- if (GitMonitorQueue.indexOfMessage(messages, cmd.message) > -1 ) {
- break;
- }
- messages.append_val(cmd);
-
- break;
- default:
- stdout.printf("Opps unmatched action %s\n", cmd.action);
- break;
- }
- }
- print( "ADD : %s\n", GitMonitorQueue.queueArrayToString(add_files));
- print( "REMOVE FILES: %s\n", GitMonitorQueue.queueArrayToString(remove_files));
- //repo.debug = 1;
- // these can fail... at present... as we wildcard stuff.
-
- // 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 ) {
- continue;
- }
- 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,
- 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 ) {
- // in add and remove - do not remvove
- continue;
- }
- remove_files_f.append_val(remove_files.index(ii));
- };
- for(var ii = 0;ii < add_files.length;ii++) {
- if (GitMonitorQueue.indexOfAdd(remove_files, add_files.index(ii).vname) > -1 ) {
- // the add file is in the remove list, and it does not exist - do not add it..
- if (!FileUtils.test(add_files.index(ii).vname, FileTest.EXISTS)) {
- continue;
+
+ context.play_full (0, props, null);
+
+
+
+
+ this.paused = true;
+ this.queueRunning = false;
+ // what does this do to the old one...
+ //this.queue = new Gee.ArrayList<GitMonitorQueue> ();
+ 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;
+ // what does this do to the old one...
+ //this.queue = new Gee.ArrayList<GitMonitorQueue> ();
+ StatusIconA.statusicon.pause();
+
+ }
+
+ public void restoreQueue( Gee.ArrayList<GitMonitorQueue> queue)
+ {
+ //used to restore teh queue after switch branches?/ - breaks our privte queue idea..
+ this.queue = queue;
+ }
+
+ /*
+ public new void resume () {
+ this.paused = false;
+ this.queue = new Array<GitMonitorQueue> ();
+ StatusIconA.statusicon.resume();
+
+
+ }
+ */
+ /**
+ * Start the monitoring
+ * and run the queue every 500 milliseconds..
+ *
+ */
+ public new void start()
+ {
+ StatusIconA.statusicon.refreshing();
+
+
+ this.lastAdd = new DateTime.now(new TimeZone.local());
+
+ Timeout.add_full(Priority.LOW, 500, () => {
+ //stdout.printf("GitMonitor.start :: top.length = %u\n", this.top.length);
+ // call this.monitor on each of 'top'
+ for(int i = 0; i < this.top.length ; i++) {
+
+ this.monitor(this.top.index(i) );
+ }
+ StatusIconA.statusicon.resume();
+ this.paused = false;
+
+
+ try {
+
+
+ var notification = new Notify.Notification(
+ "Git Live",
+ "%s\nMonitoring %u Directories".printf(GitMonitor.gitlive, this.monitors.length),
+ "dialog-information"
+ );
+
+ notification.set_timeout(5);
+ notification.show();
+ } catch(Error e) {
+ GLib.debug("Error sending notification to screen: %s",e.message);
+ }
+ return false; // do not keep doing this..
+
+ });
+
+
+
+
+ }
+
+
+ public new void stop() {
+ StatusIconA.statusicon.pause();
+ base.stop();
+ }
+
+
+ public override void monitor (string path, int depth = 0)
+ {
+
+ //GLib.debug("GitMonitor : monitor %d %s", depth, path);
+ //var depth = typeof(depth) == 'number' ? depth *1 : 0;
+
+
+ // if we are not at top level.. and there is a .git directory (it's a submodule .. ignore)
+ if (depth > 1 && FileUtils.test(path + "/.git" , FileTest.IS_DIR)) {
+ return;
+ }
+
+ if (depth == 1) {
+
+ if (!FileUtils.test(path + "/.git" , FileTest.IS_DIR)) {
+ return; // skip non-git directories..
+ }
+
+ GitRepo.get(path);
+
+ // FIXME - check if repo is flagged as not autocommit..
+ //var repo = imports.Scm.Repo.Repo.get(path);
+ //if (!repo || !repo.autocommit()) {
+ // return;
+ //}
+ }
+
+
+ // check if the repo is to be monitored.
+ //print("PATH : " + path);
+
+
+ base.monitor(path, depth);
+ }
+
+
+
+ /**
+ * run the queue.
+ * - pulls the items off the queue
+ * (as commands run concurrently and new items may get added while it's running)
+ * - runs the queue items
+ * - pushes upstream.
+ *
+ */
+ public void runQueue()
+ {
+
+ if (this.paused || this.queue.size < 1 ) {
+ return;
+ }
+
+ foreach(var q in this.queue) {
+ if (!q.shouldIgnore() && q.repo.is_master_branch() && q.repo.is_auto_branch()) {
+ var oldq = this.queue;
+ this.queue = new Gee.ArrayList<GitMonitorQueue>();
+ NewBranch.singleton().show(q.repo, oldq);
+
+ return;
+ }
+
+ }
+
+
+
+ GLib.debug("GitMonitor.runQueue size =%d\n", this.queue.size);
+
+ this.queueRunning = true;
+
+ var cmds = new Gee.ArrayList<GitMonitorQueue>();
+
+ for(var i = 0; i < this.queue.size; i++) {
+ cmds.add(this.queue.get(i));
+ }
+
+ this.queue = new Gee.ArrayList<GitMonitorQueue>();// empty queue!
+
+ string[] success = {};
+ string[] failure = {};
+ //var repos = new Array<GitRepo>(); //??
+ //var done = new Array<GitMonitorQueue>();
+
+ // first build a array of repo's to work with
+ var repo_list = new Array<GitRepo>();
+
+ // pull and group.
+
+ //print(JSON.stringify(cmds));
+ // make sure nothing get's added to the queue where we are doing this..
+
+ this.paused = true;
+
+ var leave_queued = new Gee.ArrayList<GitMonitorQueue>();
+ GLib.debug("GitMonitor.runQueue - creating repos");
+
+ for(var i = 0; i < cmds.size; i++) {
+
+ var cmd = cmds.get(i);
+
+ var gitpath = cmd.gitpath;
+
+ var repo = GitRepo.get( gitpath );
+ if ( repo.is_master_branch() && repo.is_auto_branch()) {
+ leave_queued.add(cmd);
+ continue;
+ }
+
+ GLib.debug("GitMonitor.runQueue - finding %s", cmd.gitpath);
+
+ var ix = GitRepo.indexOf(repo_list, gitpath);
+ if (ix < 0) {
+ repo_list.append_val( GitRepo.get( gitpath ));
+ ix = GitRepo.indexOf(repo_list, cmd.gitpath);
+ }
+ 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 });
+ // repo_list[gitpath].cmds = [];
+ // repo_list[gitpath].pull();
+ //}
+ repo_list.index(ix).cmds.add(cmd);
+
+ }
+ this.queue = leave_queued;
+
+ this.paused = false;
+ // build add, remove and commit message list..
+
+ GLib.debug("GitMonitor.runQueue - creating actions");
+
+ for(var i = 0;i < repo_list.length;i++) {
+
+ var repo = repo_list.index(i);
+
+ var add_files = new Gee.ArrayList<GitMonitorQueue>();
+ var add_files_f = new Gee.ArrayList<GitMonitorQueue>();
+ var remove_files = new Gee.ArrayList<GitMonitorQueue>();
+ var messages = new Gee.ArrayList<GitMonitorQueue>();
+ //print(JSON.stringify(repo.cmds,null,4));
+
+ for(var ii = 0;ii < repo.cmds.size;ii++) {
+ var cmd = repo.cmds.get(ii);
+
+ if (repo.is_ignore(cmd.vname)) {
+ continue;
+ }
+
+
+ switch(cmd.action) {
+ case "add" :
+
+ if (GitMonitorQueue.indexOfAdd(add_files, cmd.vname) > -1) {
+ break;
+ }
+
+ add_files.add(cmd);
+ break;
+
+ case "rm":
+ if (GitMonitorQueue.indexOfAdd(remove_files, cmd.vname) > -1 ) {
+ break;
+ }
+
+ // if file exists, do not try and delete it.
+ if (FileUtils.test(cmd.fullpath(), FileTest.EXISTS)) {
+ break;
+ }
+
+ remove_files.add(cmd);
+ break;
+
+ case "commit" :
+ if (GitMonitorQueue.indexOfMessage(messages, cmd.message) > -1 ) {
+ break;
+ }
+ messages.add(cmd);
+
+ break;
+ default:
+ stdout.printf("Opps unmatched action %s\n", cmd.action);
+ break;
+ }
+ }
+
+ repo.cmds.clear(); // reset the repo's command list..
+
+ 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.
+
+ // 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 ) {
+ continue;
+ }
+ 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,
+ var remove_files_f = new Gee.ArrayList<GitMonitorQueue>();
+ for(var ii = 0;ii < remove_files.size;ii++) {
+
+
+
+ if (GitMonitorQueue.indexOfAdd(add_files, remove_files.get(ii).vname) > -1 ) {
+ // in add and remove - do not remvove
+ continue;
+ }
+ remove_files_f.add(remove_files.get(ii));
+ };
+ for(var ii = 0;ii < add_files.size;ii++) {
+ if (GitMonitorQueue.indexOfAdd(remove_files, add_files.get(ii).vname) > -1 ) {
+ // the add file is in the remove list, and it does not exist - do not add it..
+ print("check exists ? %s\n",add_files.get(ii).fullpath());
+
+ if (!FileUtils.test(add_files.get(ii).fullpath(), FileTest.EXISTS)) {
+ continue;