Spawn.vala

[gitlive] / Spawn.vala

diff --git a/Spawn.vala b/Spawn.vala
index 7c85dbc..cb7af6d 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;
@@ -98,6 +100,10 @@ public class  SpawnConfig {
     
 }
 
+errordomain SpawnError {
+    NO_ARGS
+}
+
 /**
  * @class Spawn
  * @param cfg {SpawnConfig} settings - see properties.
@@ -119,7 +125,7 @@ public class  SpawnConfig {
 public class Spawn : Object
 {
 
-
+    SpawnConfig cfg;
 
     public Spawn(SpawnConfig cfg) throws Error
     {
@@ -128,16 +134,16 @@ public class Spawn : Object
         this.cfg = cfg;
      
     
-        this.cwd =  this.cfg.cwd.length || GLib.get_home_dir();
-        if (!this.cfg.args.length) {
-            throw new Error("No arguments");
+        this.cfg.cwd =  this.cfg.cwd.length  < 1 ? GLib.Environment.get_home_dir() : this.cfg.cwd;
+        if (this.cfg.args.length < 0) {
+            throw new SpawnError.NO_ARGS("No arguments");
         }
         this.run();
     
     }
 
     
-    boolean ctx = false; // the mainloop ctx.
+    bool ctx = false; // the mainloop ctx.
     
     /**
      * @property output {String} resulting output
@@ -195,10 +201,9 @@ public class Spawn : Object
         int standard_error;
 
 
-        var ret = {};
         
         if (this.cfg.debug) {
-            print("cd " + this.cfg.cwd +";" + string.joinv(" ", this.cfg.args));
+            printf("cd %s; %s" , this.cfg.cwd , string.joinv(" ", this.cfg.args));
         }
         
         Process.spawn_async_with_pipes (
@@ -247,37 +252,37 @@ public class Spawn : Object
                          
         
         
-        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);
+        this.in_ch = new GLib.IOChannel.unix_new(standard_input);
+        this.out_ch = new GLib.IOChannel.unix_new(standard_output);
+        this.err_ch = new GLib.IOChannel.unix_new(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.
-       
-       this.out_src = this.out_ch.add_watch (
-           IOCondition.OUT | IOCondition.IN  | IOCondition.PRI |  IOCondition.HUP |  IOCondition.ERR  ,
-           (channel, condition) => {
-              return this.read(_this.out_ch);
-           }
-       );
+            
+            // add handlers for output and stderr.
+        
+        this.out_src = this.out_ch.add_watch (
+            IOCondition.OUT | IOCondition.IN  | IOCondition.PRI |  IOCondition.HUP |  IOCondition.ERR  ,
+            (channel, condition) => {
+               return this.read(_this.out_ch);
+            }
+        );
         this.err_src = this.err_ch.add_watch (
            IOCondition.OUT | IOCondition.IN  | IOCondition.PRI |  IOCondition.HUP |  IOCondition.ERR  ,
-           (channel, condition) => {
-              return this.read(_this.err_ch);
-           }
-       );
-          
+            (channel, condition) => {
+               return this.read(_this.err_ch);
+            }
+        );
+              
         
         // call input.. 
         if (this.pid > -1) {
@@ -359,9 +364,9 @@ public class Spawn : Object
      * @arg str {String} string to write to stdin of process
      * @returns GLib.IOStatus (0 == error, 1= NORMAL)
      */
-    int write(String 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);
@@ -385,9 +390,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 +420,7 @@ public class Spawn : Object
                             if (imports.gi.Gtk.events_pending()) {
                                 imports.gi.Gtk.main_iteration();
                             }
-                        } catch(e) {
+                        } catch(Error e) {
                             
                         }
                     }
@@ -439,7 +444,7 @@ public class Spawn : Object
          return false; // allow it to be called again..
     }
     
-};
+}
   /*
 // test
 try {