Spawn.vala
[gitlive] / Spawn.vala
index 18f5a63..cb7af6d 100644 (file)
@@ -1,17 +1,26 @@
 
 
+using GLib;
+// compile valac 
+
+/// # valac  --pkg gio-2.0  --pkg posix Spawn.vala -o /tmp/Spawn
+
+
 ///using Gee; // for array list?
 
 static int main (string[] args) {
     // A reference to our file
-    var file = File.new_for_path ("data.txt");
-    var m = new Spawn();
+    
+    var cfg = new SpawnConfig("", { "ls" } , { "" });
+    var spawn = new Spawn(cfg);
+    
+    
     return 0;
 
 }
 
-var Gio      = imports.gi.Gio;
-var GLib      = imports.gi.GLib;
+//var Gio      = imports.gi.Gio;
+//var GLib      = imports.gi.GLib;
 
 
 /**
@@ -33,9 +42,9 @@ var GLib      = imports.gi.GLib;
 *
 *
 */
-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();
 
  
 
@@ -43,11 +52,11 @@ 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 SpawnOutput output;
     public SpawnErr stderr;
     public SpawnInput input;
     // defaults..
@@ -68,21 +77,20 @@ public class  SpawnConfig {
         input = null;
         
     }
-    public setCommand(
-    }
-    public setOptions(
-            boolean async,
-            boolean exceptions,
-            boolean debug
+    
+    public void setOptions(
+            bool async,
+            bool exceptions,
+            bool debug
         ) {
         this.async = async;
         this.exceptions = exceptions;
         this.debug = debug;
     }
-    public setHandlers(
-            SpawnOutput output
-           SpawnErr stderr,
-           SpawnInput input
+    public void setHandlers(
+            SpawnOutput output,
+            SpawnErr stderr,
+            SpawnInput input
          ) {
         this.output = output;
         this.stderr = stderr;
@@ -92,6 +100,10 @@ public class  SpawnConfig {
     
 }
 
+errordomain SpawnError {
+    NO_ARGS
+}
+
 /**
  * @class Spawn
  * @param cfg {SpawnConfig} settings - see properties.
@@ -113,25 +125,25 @@ public class  SpawnConfig {
 public class Spawn : Object
 {
 
+    SpawnConfig cfg;
 
-
-    public Spawn(SpawnConfig cfg)
+    public Spawn(SpawnConfig cfg) throws Error
     {
        
      
         this.cfg = cfg;
      
     
-        this.cwd =  this.cfg.cwd.length || GLib.get_home_dir();
-        if (!this.cfg.args.length) {
-            throw "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
@@ -184,26 +196,25 @@ public class Spawn : Object
          
         var err_src = false;
         var out_src = false;
-       int standard_input;
-       int standard_output;
-       int standard_error;
+        int standard_input;
+        int standard_output;
+        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 (
-                       this.cfg.cwd,
-                       this.cfg.args,
-                       this.cfg.env,
-                       SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD,
-                       null,
-                       out this.pid,
-                       out standard_input,
-                       out standard_output,
+        Process.spawn_async_with_pipes (
+                this.cfg.cwd,
+                this.cfg.args,
+                this.cfg.env,
+                SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD,
+                null,
+                out this.pid,
+                out standard_input,
+                out standard_output,
                        out standard_error);
 
                // stdout:
@@ -241,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) {
@@ -286,7 +297,7 @@ public class Spawn : Object
                    this.in_ch = -1;
                     
                    
-                } catch (e) {
+                } catch (Error e) {
                     this.tidyup();
                     throw e;
                     
@@ -328,23 +339,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 !== false) GLib.source_remove(this.err_src);
-       if (this.out_src !== false) GLib.source_remove(this.out_src);
-       this.err_src = false;
-       this.out_src = false;
-       
+        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;
+        
     }
     
     
@@ -353,21 +364,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;
@@ -379,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;
         
@@ -409,7 +420,7 @@ public class Spawn : Object
                             if (imports.gi.Gtk.events_pending()) {
                                 imports.gi.Gtk.main_iteration();
                             }
-                        } catch(e) {
+                        } catch(Error e) {
                             
                         }
                     }
@@ -433,7 +444,7 @@ public class Spawn : Object
          return false; // allow it to be called again..
     }
     
-};
+}
   /*
 // test
 try {