X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=src%2FResources.vala;h=f35b38972fc9799cfbd3515fa3ca2886af21cc0c;hb=e3b3c362a18cd63487a65bfa0230a9162a49ff8a;hp=8b349772897074f001e6b73b54be38fc1624e52f;hpb=a8b4271cce4628e6ec1910530d473d209a2bf499;p=app.Builder.js

diff --git a/src/Resources.vala b/src/Resources.vala
index 8b3497728..f35b38972 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -88,7 +88,8 @@ public class Resources : Object
 		string[] avail_files = { 
 			"roodata.json",
 			"*",
-			"Editors/*.js"
+			"Editors/*.js",
+			"vapi/*"
 			
 		};
 		this.fetch_files = new Gee.ArrayList<ResourcesItem>();
@@ -102,7 +103,13 @@ public class Resources : Object
 			}
 			if (target.contains("*")) {
 				var split = target.split("*");
+				
 				src = "https://api.github.com/repos/roojs/app.Builder.js/contents/resources/" + split[0];
+				if (split[0] == "vapi/") {
+					src = "https://api.github.com/repos/roojs/app.Builder.js/contents/src/vapi";
+					
+				}
+				
 			}
 			
 			this.fetch_files.add(new ResourcesItem(src,target, ""));
@@ -126,11 +133,11 @@ public class Resources : Object
     {
         var cur = this.fetch_pos;
         this.fetch_pos++;
-        this.updateProgress(this.fetch_pos); // min=0;
+        this.updateProgress(this.fetch_pos, this.fetch_files.size); // min=0;
         
         
         if (this.fetch_pos > this.fetch_files.size) {
-			 this.updateProgress(0);
+			 this.updateProgress(0,0);
 		     this.fetch_pos = 0;
 		     return;
 			
@@ -176,6 +183,7 @@ public class Resources : Object
 		 
 	public void parseDirectory(string json, string target)
 	{
+		print("%s\n", json);
 		var pa = new Json.Parser();
 		pa.load_from_data(json);
 		var node = pa.get_root();
@@ -199,7 +207,11 @@ public class Resources : Object
 			if (this.files_has_target(split[0] + n)) {
 				continue;
 			}
-			var src = "https://raw.githubusercontent.com/roojs/app.Builder.js/master/resources/" + split[0] + n;
+			
+			
+			
+			var src = ob.get_string_member("download_url"); 
+					// "https://raw.githubusercontent.com/roojs/app.Builder.js/master/resources/" + split[0] + n;
 			var add = new ResourcesItem(src, split[0] + n, ob.get_string_member("sha") );
 			//add.new_sha = ob.get_string_member("sha");
 			this.fetch_files.add(add);