sync

diff --git a/GitMonitor.vala b/GitMonitor.vala
index 2ba9685..d6fd736 100644 (file)
--- a/GitMonitor.vala
+++ b/GitMonitor.vala
@@ -1,5 +1,8 @@
 
 

-  
+
+
+
+

 
 public class GitMonitor : Monitor
 {
 
 public class GitMonitor : Monitor
 {

diff --git a/GitRepo.vala b/GitRepo.vala
index 6374b4f..823696e 100644 (file)
--- 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...
         }
         if (!FileUtils.test(this.gitdir , FileTest.IS_DIR)) {
             this.gitdir = path; // naked...
         }

-        this.cmds = new  Array<GitMonitorQueue> ();
+        this.cmds = new  Gee.ArrayList<GitMonitorQueue> ();

         
                var cache = GitRepo.singleton().cache;
         //Repo.superclass.constructor.call(this,cfg);
         
                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.
      */
      *
      * @argument {Array} files the files to add.
      */

-    public string remove  ( Array<GitMonitorQueue> files ) throws Error, SpawnError
+    public string remove  ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError

     {
         // this may fail if files do not exist..
         // should really find out if these are untracked files each..
     {
         // 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 = "";
 
         // 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 );
             try {
                 string[] cmd = { "rm",  "-f" ,  f  };
                 this.git( cmd );

diff --git a/Monitor.vala b/Monitor.vala
index d86d99d..1b5c499 100644 (file)
--- 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);
     {
          
         //GLib.debug("ADD: (%d): %s\n", depth, path);

diff --git a/RooTicket.vala b/RooTicket.vala
index c30925d..0858d1f 100644 (file)
--- a/RooTicket.vala
+++ b/RooTicket.vala
@@ -10,6 +10,7 @@ static RooTicket  _RooTicket;
 public class RooTicket : Object
 {
        
 public class RooTicket : Object
 {
        

+   const string baseurl = "https://roojs.com/admin.php/Roo/mtrack_ticket"; 

        
        public static RooTicket singleton()
     {
        
        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");
        {
                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);
                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)
        }
  
        public RooTicket? getById(string id)


@@ -70,16 +72,58 @@ public class RooTicket : Object
                                return t;
                        }
                }
                                return t;
                        }
                }

-               return null;
+        return this.loadTicket(id);
+

  
        }
 
  
        }
 

+       public RooTicket? loadTicket(string id)
+       {
+       
+               var table = new GLib.HashTable<string, string>(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<RooTicket>();
                
 
        public void loadTickets()
        {
                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);
         
                
                var table = new GLib.HashTable<string, string>(str_hash, str_equal);
         


@@ -91,7 +135,7 @@ public class RooTicket : Object
 
                var params = Soup.Form.encode_hash(table);
                
 
                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);
                
                
                GLib.debug("request %s", url);
                


@@ -164,7 +208,50 @@ public class RooTicket : Object
        }
 
 
        }
 
 

-       
+       public void close(string commits)
+       {
+               var table = new GLib.HashTable<string, string>(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
        
        
  }
\ No newline at end of file