From 40bf1f4bee21b09eedf5d8e2596ee0b72b234c45 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 5 Nov 2018 14:36:53 +0800 Subject: [PATCH] sync --- GitMonitor.vala | 5 ++- GitRepo.vala | 8 ++-- Monitor.vala | 9 ++++- RooTicket.vala | 97 ++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 107 insertions(+), 12 deletions(-) diff --git a/GitMonitor.vala b/GitMonitor.vala index 2ba96852..d6fd7361 100644 --- a/GitMonitor.vala +++ b/GitMonitor.vala @@ -1,5 +1,8 @@ - + + + + public class GitMonitor : Monitor { diff --git a/GitRepo.vala b/GitRepo.vala index 6374b4ff..823696ec 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -159,7 +159,7 @@ public class GitRepo : Object if (!FileUtils.test(this.gitdir , FileTest.IS_DIR)) { this.gitdir = path; // naked... } - this.cmds = new Array (); + this.cmds = new Gee.ArrayList (); var cache = GitRepo.singleton().cache; //Repo.superclass.constructor.call(this,cfg); @@ -410,7 +410,7 @@ public class GitRepo : Object * * @argument {Array} files the files to add. */ - public string remove ( Array files ) throws Error, SpawnError + public string remove ( Gee.ArrayList files ) throws Error, SpawnError { // this may fail if files do not exist.. // should really find out if these are untracked files each.. @@ -418,8 +418,8 @@ public class GitRepo : Object // not sure if that is how git works.. but just be certian. var ret = ""; - for (var i = 0; i < files.length;i++) { - var f = files.index(i).vname; + for (var i = 0; i < files.size;i++) { + var f = files.get(i).vname; try { string[] cmd = { "rm", "-f" , f }; this.git( cmd ); diff --git a/Monitor.vala b/Monitor.vala index d86d99d7..1b5c4997 100644 --- a/Monitor.vala +++ b/Monitor.vala @@ -68,7 +68,12 @@ public delegate void onEventHander (FileMonitor fm, File f_orig, File of_orig, F * */ -public class Monitor : Object +public abstract class gitMonitorBase : Object +{ + public abstract void monitor(string path, int depth = 0); +} + +public class Monitor : gitMonitorBase { @@ -136,7 +141,7 @@ public class Monitor : Object * * */ - public void monitor(string path, int depth = 0) + public override void monitor(string path, int depth = 0) { //GLib.debug("ADD: (%d): %s\n", depth, path); diff --git a/RooTicket.vala b/RooTicket.vala index c30925dd..0858d1f1 100644 --- a/RooTicket.vala +++ b/RooTicket.vala @@ -10,6 +10,7 @@ static RooTicket _RooTicket; public class RooTicket : Object { + const string baseurl = "https://roojs.com/admin.php/Roo/mtrack_ticket"; public static RooTicket singleton() { @@ -52,7 +53,7 @@ public class RooTicket : Object } - public void addTicket(Json.Object t) + public RooTicket addTicket(Json.Object t) { var add = new RooTicket(); add.id = t.get_string_member("id"); @@ -61,6 +62,7 @@ public class RooTicket : Object 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); + return add; } public RooTicket? getById(string id) @@ -70,16 +72,58 @@ public class RooTicket : Object return t; } } - return null; + return this.loadTicket(id); + } + public RooTicket? loadTicket(string id) + { + + var table = new GLib.HashTable(str_hash, str_equal); + table.insert("_id",id); + + var params = Soup.Form.encode_hash(table); + var url = "%s?%s" . printf(baseurl, params); + GLib.debug("request %s", url); + + var session = new Soup.Session (); + session.timeout = 0; + var message = new Soup.Message ("GET", url); + RooTicket.setAuth(message); + session.send_message (message); + + + 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 null; + } + var rd = response.get_object_member ("data"); + + return this.addTicket(rd); + + + + } catch (Error e) { + GLib.error(e.message); + return null; + } + } public void loadTickets() { RooTicket.singleton().tickets = new Gee.ArrayList(); - var url = "https://roojs.com/admin.php/Roo/mtrack_ticket"; + var table = new GLib.HashTable(str_hash, str_equal); @@ -91,7 +135,7 @@ public class RooTicket : Object var params = Soup.Form.encode_hash(table); - url = "%s?%s" . printf(url, params); + var url = "%s?%s" . printf(baseurl, params); GLib.debug("request %s", url); @@ -164,7 +208,50 @@ public class RooTicket : Object } - + public void close(string commits) + { + var table = new GLib.HashTable(str_hash, str_equal); + table.insert("id",id); + table.insert("status_name","resolved"); + table.insert("reason","fixed by Commits: %s".printf(commits)); + var params = Soup.Form.encode_hash(table); + + GLib.debug("request POST %s / %s", baseurl, id); + + var session = new Soup.Session (); + session.timeout = 0; + var message = new Soup.Message ("POST", baseurl); + RooTicket.setAuth(message); + + message.set_request ("application/x-www-form-urlencoded", Soup.MemoryUse.STATIC, params.data); + session.send_message (message); + + + 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 ; + } + + + + + } catch (Error e) { + GLib.error(e.message); + return ; + } + + } + + } \ No newline at end of file -- 2.39.2