sync

[gitlive] / RooTicket.vala

diff --git a/RooTicket.vala b/RooTicket.vala
index e02ad88..232b918 100644 (file)
--- a/RooTicket.vala
+++ b/RooTicket.vala
@@ -2,7 +2,6 @@
 
 code to fetch ticket info...
 
-
 */
 static RooTicket  _RooTicket;
 
@@ -28,23 +27,23 @@ class RooTicket : Object
        public string project_id_name;
 
 
-
-       public void addTicket(JSON.Object t)
+       public void addTicket(Json.Object t)
        {
-               var add = new Roo.Ticket();
+               var add = new RooTicket();
                add.id = t.get_string_member("id");
                add.summary = t.get_string_member("summary");
                add.description = t.get_string_member("description");
                add.project_id_name = t.get_string_member("project_id_name");                                           
                this.tickets.add(add);
-               
+               GLib.debug("ADD ticket  %s : %s : %s", add.id, add.summary, add.project_id_name);
        }
+ 
 
-
-
-       static public void loadTickets()
+       public void loadTickets()
        {
-               var url = "https://roojs.com/admin.php/Roo/mtrack_ticket");
+               RooTicket.singleton().tickets = new Gee.ArrayList<RooTicket>();
+               
+               var url = "https://roojs.com/admin.php/Roo/mtrack_ticket";
                
                var table = new GLib.HashTable<string, string>(str_hash, str_equal);
         
@@ -54,7 +53,6 @@ class RooTicket : Object
                table.insert("sort","summary");
                table.insert("dir","ASC");
 
-               
                var params = Soup.Form.encode_hash(table);
                
                url = "%s?%s" . printf(url, params);
@@ -83,14 +81,14 @@ class RooTicket : Object
                                GLib.error(response.get_string_member("errorMsg"));
                                return;
                        }
-                       var data = response.get_array_member ("data");
+                       var rd = response.get_array_member ("data");
                        
                        // got a valid result...
-                       _this = RooTicket.singleton();
-                       for(var i = 0; i < data.get_length(); i++) {
-                               _this.addTicket(data.get_object_element(i);
+                       var _this = RooTicket.singleton();
+                       for(var i = 0; i < rd.get_length(); i++) {
+                               _this.addTicket(rd.get_object_element(i));
                        }
-                       
+                        
                
                } catch (Error e) {
                        GLib.error(e.message);
@@ -99,25 +97,29 @@ class RooTicket : Object
                
        }
        
-       static public void setAuth(message) {
+       public  static void setAuth(Soup.Message message) {
        
                string str;
                var username = "";
                var password = "";
-               GLib.FileUtils.get_contents(GLib.Environment.get_home_dir() + "/.netrc"), out str);
+               GLib.FileUtils.get_contents(GLib.Environment.get_home_dir() + "/.netrc", out str);
                var lines = str.split("\n");
                for(var i=0; i< lines.length; i++) {
                // assumes one line per entry.. if not we are buggered...
-                       var bits =  Regex.split_simple ("[ \t]+", line[i].strip());
-                       if (bits.length < 7 || bits[0] != "machine" || bits[1] != "git.roojs.com") {
+                               GLib.debug("got %s" , lines[i]);
+               
+                       var bits =  Regex.split_simple ("[ \t]+", lines[i].strip());
+                       if (bits.length < 6 || bits[0] != "machine" || bits[1] != "git.roojs.com") {
                                continue;
                        }
+                               GLib.debug("found password?");
                        // we are gussing.... 
                        username = bits[3];
                        password = bits[5];
                        
                }
-               var authCode = Base64.encode ("%s:%s".printf(username), password)).data);
+
+               var authCode = Base64.encode ("%s:%s".printf(username, password).data);
                message.request_headers.append("Authorization", "Basic %s".printf(authCode));
        
        
@@ -125,4 +127,4 @@ class RooTicket : Object
        
        
        
-  
\ No newline at end of file
+ }
\ No newline at end of file