fixes to new project - compile rules and handle notices from compiler (typo)

[roobuilder] / src / Resources.vala

diff --git a/src/Resources.vala b/src/Resources.vala
index 1c623cc..a2d4ad4 100644 (file)
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -39,20 +39,24 @@ public class ResourcesItem : Object {
                }
                uint8[] data;
                uint8[] zero = { 0 };
-               GLib.FileUtils.get_data(tfn, out data);
-               
-               var  file = File.new_for_path (tfn);
-                
-               var info = file.query_info(
-                                "standard::*",
-                               FileQueryInfoFlags.NONE
-               );
-               var csdata = new GLib.ByteArray.take("blob %s".printf(info.get_size().to_string()).data);
-               csdata.append(zero);
-               csdata.append(data);
-                
-               // git method... blob %d\0...string...
-               this.cur_sha = GLib.Checksum.compute_for_data(GLib.ChecksumType.SHA1, csdata.data       );
+               try {
+                       GLib.FileUtils.get_data(tfn, out data);
+                       
+                       var  file = File.new_for_path (tfn);
+                        
+                       var info = file.query_info(
+                                        "standard::*",
+                                       FileQueryInfoFlags.NONE
+                       );
+                       var csdata = new GLib.ByteArray.take("blob %s".printf(info.get_size().to_string()).data);
+                       csdata.append(zero);
+                       csdata.append(data);
+                        
+                       // git method... blob %d\0...string...
+                       this.cur_sha = GLib.Checksum.compute_for_data(GLib.ChecksumType.SHA1, csdata.data       );
+               } catch (GLib.Error e) {
+                       GLib.debug("Failed to update SHA: %s", e.message);
+               }
        }
        
 }
@@ -192,9 +196,14 @@ public class Resources : Object
                 
        public void parseDirectory(string json, string target)
        {
-               print("%s\n", json);
+               GLib.debug("%s\n", json);
                var pa = new Json.Parser();
-               pa.load_from_data(json);
+               try {
+                       pa.load_from_data(json);
+               } catch (GLib.Error e) {
+                       GLib.debug("Faile dto load json file %s", e.message);
+                       return;
+               }
                var node = pa.get_root();
                if (node.get_node_type () != Json.NodeType.ARRAY) {
                        return;
@@ -253,12 +262,22 @@ public class Resources : Object
                var session = new Soup.Session ();
                session.user_agent = "App Builder ";
            var message = new Soup.Message ("GET",  item.src );
-        session.queue_message (message, (sess, mess) => {
+        session.send_and_read_async.begin( message, 0,  null, (obj, res) => {
+               GLib.Bytes bytes;
+                try {
+                               bytes = session.send_and_read_async.end(res);
+                         } catch (GLib.Error e) {
+                               GLib.debug("Failed to fetch stream %s" , e.message);
+                               this.fetchNext();
+                               return;
+                       }
+                               
                        
+               
                        if (item.target.contains("*")) {
                                // then it's a directory listing in JSON, and we need to add any new items to our list..
                                // it's used to fetch Editors (and maybe other stuff..)
-                               this.parseDirectory((string) message.response_body.data,item.target );
+                               this.parseDirectory( (string) bytes.get_data(),item.target );
                                this.fetchNext();
                                return;
                        }
@@ -270,15 +289,20 @@ public class Resources : Object
                        // create parent directory if needed
                        if (!GLib.FileUtils.test (GLib.Path.get_dirname(tfn), FileTest.IS_DIR)) {
                                var f =  GLib.File.new_for_path(GLib.Path.get_dirname(tfn));
-                               f.make_directory_with_parents ();
+                               try {
+                                       f.make_directory_with_parents ();
+                               } catch(GLib.Error e) {
+                                       GLib.error("Problem creating directory %s", e.message);
+                               }
                        }
                        
                        
-                       
-                       
                        // set data??? - if it's binary?
-            FileUtils.set_contents(  tfn, (string) message.response_body.data );
-            
+                       try {
+                        FileUtils.set_contents(  tfn,  (string) bytes.get_data());
+            } catch(GLib.Error e) {
+                                       GLib.error("Problem writing data %s", e.message);
+                               }
             switch (item.target) {
                                case "Gir.overides":
                                        // clear all the project caches....