ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Handle empty filesystem correctly

Browse source
This commit is contained in:
copy 2015-03-07 01:24:38 +01:00
parent bd0c20af0a
commit 633013648e
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/filesystem.js
View file

@ -214,6 +214,11 @@ function ReadTag(buffer, offset) {
FS.prototype.OnJSONLoaded = function(fs)
{
if(DEBUG)
{
console.assert(fs, "Invalid fs passed to OnJSONLoaded");
}
//console.time("parse");
var fsroot = JSON.parse(fs)["fsroot"];
//console.timeEnd("parse");
@ -344,19 +349,26 @@ FS.prototype.LoadFile = function(idx) {
// return;
//}
LoadBinaryResource(this.baseurl + this.GetFullPath(inode.fid),
function(buffer){
var data = this.inodedata[idx] = new Uint8Array(buffer);
inode.size = data.length; // correct size if the previous was wrong.
inode.status = STATUS_OK;
//if (inode.name == "rcS") {
// this.AppendDateHack(idx);
//}
this.filesinloadingqueue--;
this.HandleEvent(idx);
}.bind(this),
function(error){throw error;});
if(this.baseurl)
{
LoadBinaryResource(this.baseurl + this.GetFullPath(inode.fid),
function(buffer){
var data = this.inodedata[idx] = new Uint8Array(buffer);
inode.size = data.length; // correct size if the previous was wrong.
inode.status = STATUS_OK;
//if (inode.name == "rcS") {
// this.AppendDateHack(idx);
//}
this.filesinloadingqueue--;
this.HandleEvent(idx);
}.bind(this),
function(error){throw error;});
}
else
{
// If baseurl is not set, we started with an empty filesystem. No files
// can be loaded
}
}
// -----------------------------------------------------

2
src/browser/starter.js
View file

@ -345,7 +345,7 @@ function V86Starter(options)
setTimeout(function()
{
if(settings.fs9p)
if(settings.fs9p && settings.fs9p_json)
{
settings.fs9p.OnJSONLoaded(settings.fs9p_json);
}