GitMonitor.js

[gitlive] / Spawn.js

diff --git a/Spawn.js b/Spawn.js
index 6a33511..4d9f202 100644 (file)
--- a/Spawn.js
+++ b/Spawn.js
@@ -31,7 +31,7 @@ var GLib      = imports.gi.GLib;
 *
 *
 *  CRITICAL - needs this change to gir in GLib-2.0.gir g_spawn_async_with_pipes
-*
+*  Fixed in Ubuntu 12.10
     <parameter name="argv" transfer-ownership="none">
          <array c:type="gchar**">
             <type name="utf8"/>
@@ -43,8 +43,9 @@ var GLib      = imports.gi.GLib;
           </array>
         </parameter>
 *
-*
-*<method name="read_line"
+*  ALSO in GLib-2.0.gir
+
+<method name="read_line"
               c:identifier="g_io_channel_read_line"
               throws="1">
         <return-value transfer-ownership="none">
@@ -63,7 +64,7 @@ var GLib      = imports.gi.GLib;
         </parameters>
       </method>
 *
-*
+* run g-ir-compile -o /usr/lib/girepostitory-1.0/GLib-2.0.typelib GLib-2.0.gir
 *
 * 
 */
@@ -108,7 +109,7 @@ Spawn.prototype = {
     cwd: false,
     args: false,
     exceptions : false,
-    debug : true,
+    debug : false,
     /**
      * @property output {String} resulting output
      */
@@ -157,17 +158,28 @@ Spawn.prototype = {
             print("cd " + this.cwd +";" + this.args.join(" "));
         }
         
-        GLib.spawn_async_with_pipes(this.cwd, this.args, this.env, 
+        var gret = GLib.spawn_async_with_pipes(this.cwd, this.args, this.env, 
             GLib.SpawnFlags.DO_NOT_REAP_CHILD + GLib.SpawnFlags.SEARCH_PATH , 
             null, null, ret);
-            
-       //print(JSON.stringify(ret));    
+        
+               var isSeed = true;
+               if (typeof(Seed) == 'undefined') {
+                       ret = {
+                               child_pid : gret[1],
+                               standard_input : gret[2],
+                           standard_output: gret[3], 
+                           standard_error: gret[4]
+                       };
+                       isSeed = false; 
+               }
+               
+       //print(JSON.stringify(gret));    
         this.pid = ret.child_pid;
         
         if (this.debug) {
             print("PID: " + this.pid);
         }
-        
+         
         
        
         GLib.child_watch_add(GLib.PRIORITY_DEFAULT, this.pid, function(pid, result) {
@@ -178,6 +190,7 @@ Spawn.prototype = {
             _this.read(_this.out_ch);
             _this.read(_this.err_ch);
             
+                       
             GLib.spawn_close_pid(_this.pid);
             _this.pid = false;
             if (_this.ctx) {
@@ -212,20 +225,20 @@ Spawn.prototype = {
         }
         
         
-        this.in_ch = GLib.io_channel_unix_new(ret.standard_input);
-        this.out_ch = GLib.io_channel_unix_new(ret.standard_output);
-        this.err_ch = GLib.io_channel_unix_new(ret.standard_error);
+        this.in_ch = new GLib.IOChannel.unix_new(ret.standard_input);
+        this.out_ch = new GLib.IOChannel.unix_new(ret.standard_output);
+        this.err_ch = new GLib.IOChannel.unix_new(ret.standard_error);
         
         // make everything non-blocking!
         
         
       
-         // using NONBLOCKING only works if io_add_watch
-       //returns true/false in right conditions
-       this.in_ch.set_flags (GLib.IOFlags.NONBLOCK);
-       this.out_ch.set_flags (GLib.IOFlags.NONBLOCK);
-       this.err_ch.set_flags (GLib.IOFlags.NONBLOCK);
-         
+                       // using NONBLOCKING only works if io_add_watch
+          //returns true/false in right conditions
+          this.in_ch.set_flags (GLib.IOFlags.NONBLOCK);
+          this.out_ch.set_flags (GLib.IOFlags.NONBLOCK);
+          this.err_ch.set_flags (GLib.IOFlags.NONBLOCK);
+                       
 
       
         // add handlers for output and stderr.
@@ -249,9 +262,9 @@ Spawn.prototype = {
         
         // call input.. 
         if (this.pid !== false) {
-            // child can exit before we get this far..
+            // child can exit before 1we get this far..
             if (this.listeners.input) {
-               print("Trying to call listeners");
+                               print("Trying to call listeners");
                 try {
                     this.write(this.listeners.input.call(this));
                     // this probably needs to be a bit smarter...
@@ -275,8 +288,7 @@ Spawn.prototype = {
         if (this.async && this.pid) {
             return this;
         }
-        
-        
+         
         // start mainloop if not async..
         
         if (this.pid !== false) {
@@ -284,7 +296,7 @@ Spawn.prototype = {
                 print("starting main loop");
             }
            
-            this.ctx = new GLib.MainLoop.c_new (null, false);
+            this.ctx = isSeed ? new GLib.MainLoop.c_new (null, false) : GLib.MainLoop.new (null, false);;
             this.ctx.run(false); // wait fore exit?
             
             //print("main_loop done!");