From b30c5f42a85b853eee51a245204fa935670657db Mon Sep 17 00:00:00 2001 From: Ethan O'Brien Date: Thu, 8 Aug 2024 10:26:13 -0500 Subject: [PATCH] Get core config from core json --- data/src/GameManager.js | 15 ++++++++++++--- data/src/emulator.js | 2 +- data/version.json | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/data/src/GameManager.js b/data/src/GameManager.js index 99adce9..06428fd 100644 --- a/data/src/GameManager.js +++ b/data/src/GameManager.js @@ -31,9 +31,6 @@ class EJS_GameManager { getFrameNum: this.Module.cwrap('get_current_frame_count', 'number', ['']), setVSync: this.Module.cwrap('set_vsync', 'null', ['number']) } - this.writeFile("/home/web_user/retroarch/userdata/config/Beetle PSX HW/Beetle PSX HW.opt", 'beetle_psx_hw_renderer = "software"\n'); - this.writeFile("/home/web_user/retroarch/userdata/config/MAME 2003 (0.78)/MAME 2003 (0.78).opt", 'mame2003_skip_disclaimer = "enabled"\nmame2003_skip_warnings = "enabled"\n'); - this.mkdir("/data"); this.mkdir("/data/saves"); @@ -42,6 +39,7 @@ class EJS_GameManager { this.FS.mount(this.FS.filesystems.IDBFS, {autoPersist: true}, '/data/saves'); //this.FS.syncfs(true, () => {}); + this.writeConfigFile(); this.initShaders(); this.EJS.on("exit", () => { @@ -52,6 +50,17 @@ class EJS_GameManager { }, 1000); }) } + writeConfigFile() { + if (!this.EJS.defaultCoreOpts.file || !this.EJS.defaultCoreOpts.settings) { + return; + } + let output = ""; + for (const k in this.EJS.defaultCoreOpts.settings) { + output += k + ' = "' + this.EJS.defaultCoreOpts.settings[k] +'"\n'; + } + + this.writeFile("/home/web_user/retroarch/userdata/config/" + this.EJS.defaultCoreOpts.file, output); + } loadExternalFiles() { return new Promise(async (resolve, reject) => { if (this.EJS.config.externalFiles && this.EJS.config.externalFiles.constructor.name === 'Object') { diff --git a/data/src/emulator.js b/data/src/emulator.js index c347e93..22b159c 100644 --- a/data/src/emulator.js +++ b/data/src/emulator.js @@ -570,7 +570,7 @@ class EmulatorJS { this.downloadFile(corePath, (res) => { if (res === -1) { console.log("File not found, attemping to fetch from emulatorjs cdn"); - this.downloadFile("https://cdn.emulatorjs.org/stable/data/"+corePath, (res) => { + this.downloadFile("https://cdn.emulatorjs.org/latest/data/"+corePath, (res) => { if (res === -1) { if (!this.supportsWebgl2) { this.startGameError(this.localization('Outdated graphics driver')); diff --git a/data/version.json b/data/version.json index 43863c2..8e04a6c 100644 --- a/data/version.json +++ b/data/version.json @@ -1 +1 @@ -{ "readme": "CURRENT_VERSION IS NO LONGER UPDATED. USE VERION", "current_version": 9999, "version": "4.0.12" } +{ "readme": "CURRENT_VERSION IS NO LONGER UPDATED. USE VERION", "current_version": 999999, "version": "4.0.12" }