public string src;
public string new_sha;
public string cur_sha;
- public ResourcesItem(string src, string target)
+ public ResourcesItem(string src, string target, string new_sha)
{
this.target = target;
this.src = src;
- this.new_sha = "";
+ this.new_sha = new_sha;
+ this.cur_sha = "";
this.update_cur_sha();
- print("New ResourcesItem %s (%s) => %s\n", target , this.cur_sha ,src);
+ print("New ResourcesItem %s (%s) => (%s) %s\n", target , this.cur_sha , new_sha, src);
}
- public update_cur_sha()
+ public void update_cur_sha()
{
-
- var tfn = BuilderApplication.configDirectory() + "/resources/" + target;
- if (!GLib.FileUtils.test (GLib.Path.get_dirname(tfn), FileTest.IS_REGULAR)) {
+ if (this.target.contains("*")) {
return;
}
-
+ var tfn = BuilderApplication.configDirectory() + "/resources/" + this.target;
+ if (!GLib.FileUtils.test (tfn, FileTest.IS_REGULAR)) {
+ return;
+ }
+ uint8[] data;
+ uint8[] zero = { 0 };
GLib.FileUtils.get_data(tfn, out data);
var file = File.new_for_path (tfn);
"standard::*",
FileQueryInfoFlags.NONE
);
+ var csdata = new GLib.ByteArray.take("blob %s".printf(info.get_size().to_string()).data);
+ csdata.append(zero);
+ csdata.append(data);
- this.size = info.get_size();
// git method... blob %d\0...string...
- this.cur_sha = GLib.Checksum.compute_for_data(GLib.ChecksumType.SHA1,
- "blob %d\0".printf(info.get_size()).data + data
- );
-
+ this.cur_sha = GLib.Checksum.compute_for_data(GLib.ChecksumType.SHA1, csdata.data );
+ }
}
public class Resources : Object
{
- public signal void updateProgress(uint cur_pos);
+ public signal void updateProgress(uint cur_pos, uint total);
static Resources singleton_val;
}
public Resources ()
{
+ this.initFiles();
+ }
+
- var avail_files = {
+ public void initFiles()
+ {
+ string[] avail_files = {
"roodata.json",
- "bootstrap.builder.html",
- "roo.builder.html",
- "roo.builder.js",
- "Gir.overides",
- "RooUsage.txt",
- "GtkUsage.txt",
- "Editors/*.js"
- //"Editors/Editor.Roo.grid.GridPanel.js"
+ "*",
+ "Editors/*.js",
+ "vapi/*"
+
};
- this.fetch_files = new Gee.ArrayList<string>();
+ this.fetch_files = new Gee.ArrayList<ResourcesItem>();
for (var i=0;i < avail_files.length; i++) {
var target = avail_files[i];
var src = "https://raw.githubusercontent.com/roojs/app.Builder.js/master/resources/" + target;
src = "https://raw.githubusercontent.com/roojs/roojs1/master/docs/json/roodata.json";
//src = "http://git.roojs.org/?p=roojs1;a=blob_plain;f=docs/json/roodata.json";
}
- if (target.contains('*')) {
- var split = target.split('*');
+ 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));
+ this.fetch_files.add(new ResourcesItem(src,target, ""));
}
-
-
-
- }
-
+
+ }
- uint fetch_pos = 0;
+ int fetch_pos = 0;
public void fetchStart()
{
+ this.initFiles();
if (this.fetch_pos > 0) { // only fetch one at a time...
return;
}
{
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;
}
- this.fetchResourceFrom ( src, target );
+ this.fetchResourceFrom ( this.fetch_files.get(cur) );
}
+ /**
+ * called on start to check we have all the required files..
+ */
public void checkResources()
{
bool needsload = false;
- string[] res = this.fetch_files;
-
- for (var i = 0; i < this.fetch_files.length; i++ ) {
+
+ // this has to check the required files, not the list...
+ string[] required = {
+ "bootstrap.builder.html",
+ "Gir.overides",
+ "GtkUsage.txt",
+ "mailer.builder.html",
+ "roo.builder.html",
+ "roo.builder.js",
+ "roodata.json",
+ "RooUsage.txt"
+ };
+
+ for (var i = 0; i < required.length; i++ ) {
if (!FileUtils.test(
- BuilderApplication.configDirectory() + "/resources/" + this.fetch_files.get(i).target
+ BuilderApplication.configDirectory() + "/resources/" + required[i],
FileTest.EXISTS
)) {
needsload = true;
public void parseDirectory(string json, string target)
{
+ print("%s\n", json);
var pa = new Json.Parser();
- pa.load_from_file(json);
+ pa.load_from_data(json);
var node = pa.get_root();
if (node.get_node_type () != Json.NodeType.ARRAY) {
return;
//throw new Error.INVALID_FORMAT ("Unexpected element type %s", node.type_name ());
}
- var split = target.split('*');
- var obj = node.get_array ();
- for(var i = 0; i < node.get_length(); i++) {
- var ob = node.get_object_element(i);
+ var split = target.split("*");
+ var ar = node.get_array ();
+ for(var i = 0; i < ar.get_length(); i++) {
+ var ob = ar.get_object_element(i);
var n = ob.get_string_member("name");
-
- if (split.length > 1 && !name.has_suffix(split[1])) {
- // not related..
+ if (ob.get_string_member("type") == "dir") {
+ continue;
+ }
+ if (split.length > 1 && !n.has_suffix(split[1])) {
+ // not needed..
continue;
}
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 add = new ResourcesItem(src, split[0] + n);
- add.new_sha = ob.get_string_member("sha");
+
+
+
+ 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);
}
}
public bool files_has_target(string target)
{
- for (var i = 0; i < this.fetch_files.length; i++ ) {
+ for (var i = 0; i < this.fetch_files.size; i++ ) {
if (this.fetch_files.get(i).target == target) {
return true;
}
public void fetchResourceFrom(ResourcesItem item)
{
+ if (item.new_sha != "" && item.new_sha == item.cur_sha) {
+ this.fetchNext();
+ return;
+ }
// fetch...
print("downloading %s \nto : %s\n", item.src,item.target);
var message = new Soup.Message ("GET", item.src );
session.queue_message (message, (sess, mess) => {
- if (item.target.contains('*')) {
+ 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 );
}
- var tfn = BuilderApplication.configDirectory() + "/resources/" + target;
+ var tfn = BuilderApplication.configDirectory() + "/resources/" + item.target;
// create parent directory if needed
projects / app.Builder.js / blobdiff