1
0
Fork 0
mirror of https://github.com/marcrobledo/RomPatcher.js.git synced 2025-08-06 16:50:54 +00:00

Merge branch 'marcrobledo:master' into master

This commit is contained in:
-Shiken- 2023-04-19 10:07:41 +08:00 committed by GitHub
commit 558c6a31a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
/* Rom Patcher JS v20230331 - Marc Robledo 2016-2023 - http://www.marcrobledo.com/license */
/* Rom Patcher JS v20230406 - Marc Robledo 2016-2023 - http://www.marcrobledo.com/license */
const TOO_BIG_ROM_SIZE=67108863;
const HEADERS_INFO=[
@ -141,7 +141,7 @@ function fetchPatch(customPatchIndex, compressedFileIndex){
patchFile=CUSTOM_PATCHER[customPatchIndex].fetchedFile=new MarcFile(arrayBuffer);
patchFile.fileName=customPatch.file.replace(/^.*[\/\\]/g,'');
if(patchFile.getExtension()==='zip' && patchFile.readString(4).startsWith(ZIP_MAGIC))
if(patchFile.getExtension()!=='jar' && patchFile.readString(4).startsWith(ZIP_MAGIC))
ZIPManager.parseFile(CUSTOM_PATCHER[customPatchIndex].fetchedFile, compressedFileIndex);
else
parseCustomPatch(CUSTOM_PATCHER[customPatchIndex]);
@ -161,7 +161,7 @@ function fetchPatch(customPatchIndex, compressedFileIndex){
patchFile=CUSTOM_PATCHER[customPatchIndex].fetchedFile=new MarcFile(xhr.response);
patchFile.fileName=customPatch.file.replace(/^.*[\/\\]/g,'');
if(patchFile.getExtension()==='zip' && patchFile.readString(4).startsWith(ZIP_MAGIC))
if(patchFile.getExtension()!=='jar' && patchFile.readString(4).startsWith(ZIP_MAGIC))
ZIPManager.parseFile(CUSTOM_PATCHER[customPatchIndex].fetchedFile, compressedFileIndex);
else
parseCustomPatch(CUSTOM_PATCHER[customPatchIndex]);
@ -184,7 +184,7 @@ function _parseROM(){
el('checkbox-addheader').checked=false;
el('checkbox-removeheader').checked=false;
if(romFile.getExtension()==='zip' && romFile.readString(4).startsWith(ZIP_MAGIC)){
if(romFile.getExtension()!=='jar' && romFile.readString(4).startsWith(ZIP_MAGIC)){
ZIPManager.parseFile(romFile);
setTabApplyEnabled(false);
}else{
@ -653,7 +653,7 @@ function _readPatchFile(){
patchFile.littleEndian=false;
var header=patchFile.readString(6);
if(patchFile.getExtension()==='zip' && header.startsWith(ZIP_MAGIC)){
if(patchFile.getExtension()!=='jar' && header.startsWith(ZIP_MAGIC)){
patch=false;
validateSource();
setTabApplyEnabled(false);