mirror of
https://github.com/EmulatorJS/EmulatorJS.git
synced 2024-09-20 02:46:23 +00:00
select first found file, disable cue for pcsx_rearmed by default
This commit is contained in:
parent
61019d929d
commit
65ee1ae321
1 changed files with 12 additions and 5 deletions
|
@ -883,6 +883,13 @@ class EmulatorJS {
|
||||||
|
|
||||||
const altName = this.config.gameUrl.startsWith("blob:") ? (this.config.gameName || "game") : extractFileNameFromUrl(this.config.gameUrl);
|
const altName = this.config.gameUrl.startsWith("blob:") ? (this.config.gameName || "game") : extractFileNameFromUrl(this.config.gameUrl);
|
||||||
|
|
||||||
|
let disableCue = false;
|
||||||
|
if (this.getCore() === 'pcsx_rearmed' && this.config.disableCue === undefined) {
|
||||||
|
disableCue = true;
|
||||||
|
} else {
|
||||||
|
disableCue = this.config.disableCue;
|
||||||
|
}
|
||||||
|
|
||||||
let fileNames = [];
|
let fileNames = [];
|
||||||
this.checkCompression(new Uint8Array(data), this.localization("Decompress Game Data"), (fileName, fileData) => {
|
this.checkCompression(new Uint8Array(data), this.localization("Decompress Game Data"), (fileName, fileData) => {
|
||||||
if (fileName.includes("/")) {
|
if (fileName.includes("/")) {
|
||||||
|
@ -914,17 +921,17 @@ class EmulatorJS {
|
||||||
let selectedCueExt = null;
|
let selectedCueExt = null;
|
||||||
fileNames.forEach(fileName => {
|
fileNames.forEach(fileName => {
|
||||||
const ext = fileName.split('.').pop().toLowerCase();
|
const ext = fileName.split('.').pop().toLowerCase();
|
||||||
if (supportsExt(ext)) {
|
if (supportedFile === null && supportsExt(ext)) {
|
||||||
supportedFile = fileName;
|
supportedFile = fileName;
|
||||||
}
|
}
|
||||||
if (['iso', 'cso', 'chd', 'elf'].includes(ext)) {
|
if (isoFile === null && ['iso', 'cso', 'chd', 'elf'].includes(ext)) {
|
||||||
isoFile = fileName;
|
isoFile = fileName;
|
||||||
}
|
}
|
||||||
if (['cue', 'ccd', 'toc', 'm3u'].includes(ext)) {
|
if (['cue', 'ccd', 'toc', 'm3u'].includes(ext)) {
|
||||||
if (this.getCore(true) === 'psx') {
|
if (this.getCore(true) === 'psx') {
|
||||||
//always prefer m3u files for psx cores
|
//always prefer m3u files for psx cores
|
||||||
if (selectedCueExt !== 'm3u') {
|
if (selectedCueExt !== 'm3u') {
|
||||||
if (ext === 'm3u' || cueFile === null) {
|
if (cueFile === null || ext === 'm3u') {
|
||||||
cueFile = fileName;
|
cueFile = fileName;
|
||||||
selectedCueExt = ext;
|
selectedCueExt = ext;
|
||||||
}
|
}
|
||||||
|
@ -932,7 +939,7 @@ class EmulatorJS {
|
||||||
} else {
|
} else {
|
||||||
//prefer cue or ccd files over toc or m3u
|
//prefer cue or ccd files over toc or m3u
|
||||||
if (!['cue', 'ccd'].includes(selectedCueExt)) {
|
if (!['cue', 'ccd'].includes(selectedCueExt)) {
|
||||||
if (['cue', 'ccd'].includes(ext) || cueFile === null) {
|
if (cueFile === null || ['cue', 'ccd'].includes(ext)) {
|
||||||
cueFile = fileName;
|
cueFile = fileName;
|
||||||
selectedCueExt = ext;
|
selectedCueExt = ext;
|
||||||
}
|
}
|
||||||
|
@ -942,7 +949,7 @@ class EmulatorJS {
|
||||||
});
|
});
|
||||||
if (isoFile !== null && (supportsExt('iso') || supportsExt('cso') || supportsExt('chd') || supportsExt('elf'))) {
|
if (isoFile !== null && (supportsExt('iso') || supportsExt('cso') || supportsExt('chd') || supportsExt('elf'))) {
|
||||||
this.fileName = isoFile;
|
this.fileName = isoFile;
|
||||||
} else if (!this.config.disableCue && (supportsExt('cue') || supportsExt('ccd') || supportsExt('toc') || supportsExt('m3u'))) {
|
} else if (!disableCue && (supportsExt('cue') || supportsExt('ccd') || supportsExt('toc') || supportsExt('m3u'))) {
|
||||||
if (cueFile !== null) {
|
if (cueFile !== null) {
|
||||||
this.fileName = cueFile;
|
this.fileName = cueFile;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue