X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RooTicket.vala;h=779bcfc151de00621f892ed2e171e2b139aa4a18;hb=48b3d2b4281bfa78ae11b4dfb5f91d5475aefd90;hp=227d005c5ae1f6ef4b421c16121872a8f2d7acb4;hpb=e96203f90515365abe7da8911b623291f9b6ec81;p=gitlive

diff --git a/RooTicket.vala b/RooTicket.vala
index 227d005c..779bcfc1 100644
--- a/RooTicket.vala
+++ b/RooTicket.vala
@@ -2,7 +2,6 @@
 
 code to fetch ticket info...
 
-
 */
 static RooTicket  _RooTicket;
 
@@ -21,16 +20,43 @@ class RooTicket : Object
         return _RooTicket;
     }
 	public Gee.ArrayList<RooTicket> tickets; // only available for singletonn.
+	public string username = ""; // only available for singletonn.
+	public string password = ""; // only available for singletonn.
+
 
-	public int id;
+	public string  id; // not really important that they are numbers..
 	public string summary;
 	public string description;
 	public string project_id_name;
 
 
+	public void addTicket(Json.Object t)
+	{
+		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);
+	}
+ 
+ 	public RooTicket? getById(string id)
+ 	{
+ 		foreach(var t in this.tickets) {
+ 			if (t.id == id) {
+ 				return t;
+			}
+		}
+		return null;
+ 
+ 	}	
+
 	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);
 	 
@@ -40,7 +66,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);
@@ -52,37 +77,71 @@ class RooTicket : Object
 		var message = new Soup.Message ("GET", url);
 		
 		
-		this.bee.auth.newRequest(session, message);
+		RooTicket.setAuth(message);
 		
 		session.send_message (message);
 		
-		return (string) message.response_body.flatten().data;
-	}
-	
-	public void setAuth(session, message) {
-	
-		string str;
-		var username = "";
-		var password = "";
-		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") {
-				continue;
+		var data = (string) message.response_body.flatten().data;
+		GLib.debug("got %s", data);
+		try {
+			var parser = new Json.Parser ();
+			parser.load_from_data (data, -1);
+
+			var response = parser.get_root().get_object();
+			var status = response.get_boolean_member("success");
+		
+			if(!status){
+				GLib.error(response.get_string_member("errorMsg"));
+				return;
 			}
-			// we are gussing.... 
-			username = bits[3];
-			password = bits[5];
+			var rd = response.get_array_member ("data");
 			
+			// got a valid result...
+			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);
+			return;
 		}
-		var authCode = Base64.encode ("%s:%s".printf(username), password)).data);
 		
+	}
+	
+	public  static void setAuth(Soup.Message message) 
+	{
+		var rs =  RooTicket.singleton();		
+		if (rs.username.length < 1) {
+			string 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...
+					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];
+				RooTicket.singleton().username  = bits[3];
+				RooTicket.singleton().password  = bits[5];		
+			}
+		}
+
+		public Gee.ArrayList<RooTicket> tickets; // only available for singletonn.		
+	
+		var authCode = Base64.encode ("%s:%s".printf(rs.username, rs.password).data);
+		message.request_headers.append("Authorization", "Basic %s".printf(authCode));
 	
 	
 	}
 	
 	
 	
-  
\ No newline at end of file
+ }
\ No newline at end of file