Spawn.vala

[gitlive] / Spawn.vala

diff --git a/Spawn.vala b/Spawn.vala
index 837a821..676588e 100644 (file)
--- a/Spawn.vala
+++ b/Spawn.vala
@@ -1,4 +1,6 @@
 
+
+using GLib;
 // compile valac 
 
 /// # valac  --pkg gio-2.0  --pkg posix Spawn.vala -o /tmp/Spawn
@@ -9,7 +11,7 @@
 static int main (string[] args) {
     // A reference to our file
     
-    var cfg = new SpawnConfig(null, { "ls" } , "");
+    var cfg = new SpawnConfig("", { "ls" } , { "" });
     var spawn = new Spawn(cfg);
     
     
@@ -40,9 +42,9 @@ static int main (string[] args) {
 *
 *
 */
-delegate void SpawnOutput(string line);
-delegate void SpawnErr(string line);
-delegate string SpawnInput();
+public delegate void SpawnOutput(string line);
+public delegate void SpawnErr(string line);
+public delegate string SpawnInput();
 
  
 
@@ -50,9 +52,9 @@ public class  SpawnConfig {
     public string cwd;
     public string[] args;
     public string[]  env;
-    public boolean async;
-    public boolean exceptions; // fire exceptions.
-    public boolean debug; // fire exceptions.
+    public bool async;
+    public bool exceptions; // fire exceptions.
+    public bool debug; // fire exceptions.
     
     public SpawnOutput output;
     public SpawnErr stderr;
@@ -77,9 +79,9 @@ public class  SpawnConfig {
     }
     
     public void setOptions(
-            boolean async,
-            boolean exceptions,
-            boolean debug
+            bool async,
+            bool exceptions,
+            bool debug
         ) {
         this.async = async;
         this.exceptions = exceptions;
@@ -119,7 +121,7 @@ public class  SpawnConfig {
 public class Spawn : Object
 {
 
-
+    SpawnConfig cfg;
 
     public Spawn(SpawnConfig cfg) throws Error
     {
@@ -128,7 +130,7 @@ public class Spawn : Object
         this.cfg = cfg;
      
     
-        this.cwd =  this.cfg.cwd.length || GLib.get_home_dir();
+        this.cfg.cwd =  this.cfg.cwd.length || GLib.Environment.get_home_dir();
         if (!this.cfg.args.length) {
             throw new Error("No arguments");
         }
@@ -137,7 +139,7 @@ public class Spawn : Object
     }
 
     
-    boolean ctx = false; // the mainloop ctx.
+    bool ctx = false; // the mainloop ctx.
     
     /**
      * @property output {String} resulting output
@@ -334,23 +336,23 @@ public class Spawn : Object
 
     private void tidyup()
     {
-       if (this.pid > -1) {
-           Process.close_pid(this.pid); // hopefully kills it..
-           this.pid = -1;
-       }
-       if (this.in_ch)  this.in_ch.close();
-       if (this.out_ch)  this.out_ch.close();
-       if (this.err_ch)  this.err_ch.close();
-       // blank out channels
-       this.in_ch = false;
-       this.err_ch = false;
-       this.out_ch = false;
-       // rmeove listeners !! important otherwise we kill the CPU
-       if (this.err_src > -1 ) GLib.source_remove(this.err_src);
-       if (this.out_src > -1 ) GLib.source_remove(this.out_src);
-       this.err_src = -1;
-       this.out_src = -1;
-       
+        if (this.pid > -1) {
+            Process.close_pid(this.pid); // hopefully kills it..
+            this.pid = -1;
+        }
+        if (this.in_ch)  this.in_ch.close();
+        if (this.out_ch)  this.out_ch.close();
+        if (this.err_ch)  this.err_ch.close();
+        // blank out channels
+        this.in_ch = false;
+        this.err_ch = false;
+        this.out_ch = false;
+        // rmeove listeners !! important otherwise we kill the CPU
+        if (this.err_src > -1 ) GLib.source_remove(this.err_src);
+        if (this.out_src > -1 ) GLib.source_remove(this.out_src);
+        this.err_src = -1;
+        this.out_src = -1;
+        
     }
     
     
@@ -359,21 +361,21 @@ public class Spawn : Object
      * @arg str {String} string to write to stdin of process
      * @returns GLib.IOStatus (0 == error, 1= NORMAL)
      */
-    integer write(str) // write a line to 
+    private int write(string str) // write a line to 
     {
-        if (this.in_ch is null) {
+        if (this.in_ch == null) {
             return 0; // input is closed
         }
-       //print("write: " + str);
-       // NEEDS GIR FIX! for return value.. let's ignore for the time being..
-       //var ret = {};
-        //var res = this.in_ch.write_chars(str, str.length, ret);
-       var res = this.in_ch.write_chars(str, str.length);
-       
-       //print("write_char retunred:" + JSON.stringify(res) +  ' ' +JSON.stringify(ret)  );
-       
-        if (res != GLib.IOStatus.NORMAL) {
-            throw "Write failed";
+        //print("write: " + str);
+        // NEEDS GIR FIX! for return value.. let's ignore for the time being..
+        //var ret = {};
+            //var res = this.in_ch.write_chars(str, str.length, ret);
+        var res = this.in_ch.write_chars(str, str.length);
+        
+        //print("write_char retunred:" + JSON.stringify(res) +  ' ' +JSON.stringify(ret)  );
+        
+            if (res != GLib.IOStatus.NORMAL) {
+                throw "Write failed";
         }
         //return ret.value;
         return str.length;
@@ -385,9 +387,9 @@ public class Spawn : Object
      * @arg giochannel to read from.
      * @returns none
      */
-    read: function(ch) 
+    private bool read(IOChannel ch) 
     {
-        var prop = ch == this.out_ch ? 'output' : 'stderr';
+        string prop = (ch == this.out_ch) ? "output" : "stderr";
        // print("prop: " + prop);
         var _this = this;
         
@@ -415,7 +417,7 @@ public class Spawn : Object
                             if (imports.gi.Gtk.events_pending()) {
                                 imports.gi.Gtk.main_iteration();
                             }
-                        } catch(e) {
+                        } catch(Error e) {
                             
                         }
                     }
@@ -439,7 +441,7 @@ public class Spawn : Object
          return false; // allow it to be called again..
     }
     
-};
+}
   /*
 // test
 try {