mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 16:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(ems) use idbfs instead of localstorage

Browse Source
This commit is contained in:
radius 2016-09-24 17:12:03 -05:00
parent 9f3102e601
commit 1efdffd191
2 changed files with 110 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
pkg/emscripten/embed/embed.js
View File

@ -72,17 +72,6 @@ function dropboxInit()
}); });
} }
function dropboxSyncComplete()
{
document.getElementById('btnRun').disabled = false;
//$('#icnDrop').removeClass('fa-spinner').removeClass('fa-spin');
//$('#icnDrop').addClass('fa-check');
console.log("WEBPLAYER: Sync successful");
setupFileSystem("dropbox");
preLoadingComplete();
}
function dropboxSync(dropboxClient, cb) function dropboxSync(dropboxClient, cb)
{ {
var dbfs = new BrowserFS.FileSystem.Dropbox(dropboxClient); var dbfs = new BrowserFS.FileSystem.Dropbox(dropboxClient);
@ -98,6 +87,17 @@ function dropboxSync(dropboxClient, cb)
}); });
} }
function dropboxSyncComplete()
{
document.getElementById('btnRun').disabled = false;
//$('#icnDrop').removeClass('fa-spinner').removeClass('fa-spin');
//$('#icnDrop').addClass('fa-check');
console.log("WEBPLAYER: Dropbox sync successful");
setupFileSystem("dropbox");
preLoadingComplete();
}
function preLoadingComplete() function preLoadingComplete()
{ {
/* Make the Preview image clickable to start RetroArch. */ /* Make the Preview image clickable to start RetroArch. */
@ -107,6 +107,45 @@ function preLoadingComplete()
}); });
} }
function idbfsSync()
{
var imfs = new BrowserFS.FileSystem.InMemory();
if (BrowserFS.FileSystem.IndexedDB.isAvailable())
{
var idbfs = BrowserFS.FileSystem.IndexedDB;
afs = new BrowserFS.FileSystem.AsyncMirror(imfs,
new BrowserFS.FileSystem.IndexedDB(function(e, fs)
{
if (e)
{
//fallback to imfs
afs = imfs;
setupFileSystem("browser");
preLoadingComplete();
console.log("WEBPLAYER: error: " + e + "falling back to in-memory filesystem");
}
else
{
// initialize afs by copying files from async storage to sync storage.
afs.initialize(function (e)
{
if (e)
{
afs = imfs;
console.log("WEBPLAYER: error: " + e + "falling back to in-memory filesystem");
}
else
{
console.log("WEBPLAYER: idbfs setup successful");
setupFileSystem("browser");
preLoadingComplete();
}
});
}
},
"RetroArch"));
}
}
function setupFileSystem(backend) function setupFileSystem(backend)
{ {
@ -126,23 +165,8 @@ function setupFileSystem(backend)
var xfs2 = new BrowserFS.FileSystem.XmlHttpRequest var xfs2 = new BrowserFS.FileSystem.XmlHttpRequest
("--your-content-index-file-name--", "--your-index-url--");*/ ("--your-content-index-file-name--", "--your-index-url--");*/
console.log("WEBPLAYER: Initializing Filesystem"); console.log("WEBPLAYER: initializing filesystem: " + backend);
if(backend == "browser") mfs.mount('/home/web_user/retroarch/userdata', afs);
{
console.log("WEBPLAYER: Initializing LocalStorage");
/* create a local filesystem */
var imfs = new BrowserFS.FileSystem.InMemory()();
/* mount the filesystems onto mfs */
mfs.mount('/home/web_user/retroarch/userdata', imfs);
}
else
{
/* mount the filesystems onto mfs */
mfs.mount('/home/web_user/retroarch/userdata', afs);
}
/* setup this if you setup your server to serve assets or core assets, /* setup this if you setup your server to serve assets or core assets,
you can find more information in the included README */ you can find more information in the included README */
@ -153,7 +177,7 @@ function setupFileSystem(backend)
BrowserFS.initialize(mfs); BrowserFS.initialize(mfs);
var BFS = new BrowserFS.EmscriptenFS(); var BFS = new BrowserFS.EmscriptenFS();
FS.mount(BFS, {root: '/home'}, '/home'); FS.mount(BFS, {root: '/home'}, '/home');
console.log("WEBPLAYER: " + backend + " filesystem initialized"); console.log("WEBPLAYER: " + backend + " filesystem initialization successful");
} }
/** /**
@ -202,7 +226,7 @@ function selectFiles(files)
filereader.onload = function(){uploadData(this.result, this.file_name)}; filereader.onload = function(){uploadData(this.result, this.file_name)};
filereader.onloadend = function(evt) filereader.onloadend = function(evt)
{ {
console.log("WEBPLAYER: File: " + this.file_name + " Upload Complete"); console.log("WEBPLAYER: file: " + this.file_name + " upload complete");
if (evt.target.readyState == FileReader.DONE) if (evt.target.readyState == FileReader.DONE)
{ {
$('#btnAdd').removeClass('disabled'); $('#btnAdd').removeClass('disabled');
@ -341,8 +365,7 @@ $(function() {
{ {
$('#lblDrop').removeClass('active'); $('#lblDrop').removeClass('active');
$('#lblLocal').addClass('active'); $('#lblLocal').addClass('active');
preLoadingComplete(); idbfsSync();
setupFileSystem("browser");
} }
}); });
}); });

93
pkg/emscripten/itch/itch.js
View File

@ -70,18 +70,6 @@ function dropboxInit()
}); });
} }
function dropboxSyncComplete()
{
document.getElementById('btnRun').disabled = false;
//document.getElementById('btnDrop').disabled = false;
//$('#icnDrop').removeClass('fa-spinner').removeClass('fa-spin');
//$('#icnDrop').addClass('fa-dropbox');
console.log("WEBPLAYER: Sync successful");
setupFileSystem("dropbox");
preLoadingComplete();
}
function dropboxSync(dropboxClient, cb) function dropboxSync(dropboxClient, cb)
{ {
var dbfs = new BrowserFS.FileSystem.Dropbox(dropboxClient); var dbfs = new BrowserFS.FileSystem.Dropbox(dropboxClient);
@ -97,6 +85,18 @@ function dropboxSync(dropboxClient, cb)
}); });
} }
function dropboxSyncComplete()
{
document.getElementById('btnRun').disabled = false;
//document.getElementById('btnDrop').disabled = false;
//$('#icnDrop').removeClass('fa-spinner').removeClass('fa-spin');
//$('#icnDrop').addClass('fa-dropbox');
console.log("WEBPLAYER: Dropbox sync successful");
setupFileSystem("dropbox");
preLoadingComplete();
}
function preLoadingComplete() function preLoadingComplete()
{ {
/* Make the Preview image clickable to start RetroArch. */ /* Make the Preview image clickable to start RetroArch. */
@ -106,6 +106,44 @@ function preLoadingComplete()
}); });
} }
function idbfsSync()
{
var imfs = new BrowserFS.FileSystem.InMemory();
if (BrowserFS.FileSystem.IndexedDB.isAvailable())
{
var idbfs = BrowserFS.FileSystem.IndexedDB;
afs = new BrowserFS.FileSystem.AsyncMirror(imfs,
new BrowserFS.FileSystem.IndexedDB(function(e, fs)
{
if (e)
{
//fallback to imfs
afs = imfs;
setupFileSystem("browser")
console.log("WEBPLAYER: error: " + e + "falling back to in-memory filesystem");
}
else
{
// initialize afs by copying files from async storage to sync storage.
afs.initialize(function (e)
{
if (e)
{
afs = imfs;
console.log("WEBPLAYER: error: " + e + "falling back to in-memory filesystem");
}
else
{
console.log("WEBPLAYER: idbfs setup successful");
setupFileSystem("browser")
}
});
}
},
"RetroArch"));
}
}
function setupFileSystem(backend) function setupFileSystem(backend)
{ {
/* create a mountable filesystem that will server as a root /* create a mountable filesystem that will server as a root
@ -119,35 +157,15 @@ function setupFileSystem(backend)
var xfs2 = new BrowserFS.FileSystem.XmlHttpRequest var xfs2 = new BrowserFS.FileSystem.XmlHttpRequest
(".index-xhr", "https://bot.libretro.com/assets/cores/"); (".index-xhr", "https://bot.libretro.com/assets/cores/");
console.log("WEBPLAYER: Initializing Filesystem"); console.log("WEBPLAYER: initializing filesystem: " + backend);
if(backend == "browser") mfs.mount('/home/web_user/retroarch/userdata', afs);
{
console.log("WEBPLAYER: Initializing LocalStorage");
/* create a local filesystem */
var lsfs = new BrowserFS.FileSystem.LocalStorage();
/* mount the filesystems onto mfs */
mfs.mount('/home/web_user/retroarch/userdata', lsfs);
/* create a memory filesystem for content only
var imfs = new BrowserFS.FileSystem.InMemory();*/
/* mount the filesystems onto mfs
mfs.mount('/home/web_user/retroarch/userdata/content/', imfs);*/
}
else
{
/* mount the filesystems onto mfs */
mfs.mount('/home/web_user/retroarch/userdata', afs);
}
mfs.mount('/home/web_user/retroarch/bundle', xfs1); mfs.mount('/home/web_user/retroarch/bundle', xfs1);
mfs.mount('/home/web_user/retroarch/userdata/content/downloads', xfs2); mfs.mount('/home/web_user/retroarch/userdata/content/downloads', xfs2);
BrowserFS.initialize(mfs); BrowserFS.initialize(mfs);
var BFS = new BrowserFS.EmscriptenFS(); var BFS = new BrowserFS.EmscriptenFS();
FS.mount(BFS, {root: '/home'}, '/home'); FS.mount(BFS, {root: '/home'}, '/home');
console.log("WEBPLAYER: " + backend + " filesystem initialized"); console.log("WEBPLAYER: " + backend + " filesystem initialization successful");
} }
/** /**
@ -196,7 +214,7 @@ function selectFiles(files)
filereader.onload = function(){uploadData(this.result, this.file_name)}; filereader.onload = function(){uploadData(this.result, this.file_name)};
filereader.onloadend = function(evt) filereader.onloadend = function(evt)
{ {
console.log("WEBPLAYER: File: " + this.file_name + " Upload Complete"); console.log("WEBPLAYER: file: " + this.file_name + " upload complete");
if (evt.target.readyState == FileReader.DONE) if (evt.target.readyState == FileReader.DONE)
{ {
$('#btnAdd').removeClass('disabled'); $('#btnAdd').removeClass('disabled');
@ -340,8 +358,7 @@ $(function() {
{ {
//$('#icnDrop').addClass('fa-globe'); //$('#icnDrop').addClass('fa-globe');
//$('#icnDrop').removeClass('fa-dropbox'); //$('#icnDrop').removeClass('fa-dropbox');
preLoadingComplete(); idbfsSync();
setupFileSystem("browser");
} }
}); });
}); });