anthonycicc/UniPatcher
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improved recognition of APS format

Browse source
This commit is contained in:
Boris Timofeev 2017-01-12 17:37:13 +03:00
parent 082d64894f
commit 3791fb5d29
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/emunix/unipatcher/patch/APS.java
View file

@ -36,7 +36,7 @@ public class APS extends Patch {
public static final int APS_GBA_PATCH = 2; public static final int APS_GBA_PATCH = 2;
private static final byte[] APS_N64_MAGIC = {0x41, 0x50, 0x53, 0x31, 0x30}; // APS10 private static final byte[] APS_N64_MAGIC = {0x41, 0x50, 0x53, 0x31, 0x30}; // APS10
private static final byte[] APS_GBA_MAGIC = {0x41, 0x50, 0x53, 0x31, 0x00}; // APS1 TODO удалить 0x00 private static final byte[] APS_GBA_MAGIC = {0x41, 0x50, 0x53, 0x31}; // APS1
public APS(Context context, File patch, File rom, File output) { public APS(Context context, File patch, File rom, File output) {
super(context, patch, rom, output); super(context, patch, rom, output);
@ -57,16 +57,22 @@ public class APS extends Patch {
aps.apply(); aps.apply();
} }
public int checkAPS(File file) throws IOException { public int checkAPS(File file) throws PatchException, IOException {
FileInputStream stream = null; FileInputStream stream = null;
try { try {
stream = new FileInputStream(file); stream = new FileInputStream(file);
byte[] magic = new byte[5]; byte[] magicN64 = new byte[5];
stream.read(magic); int count = stream.read(magicN64);
if (Arrays.equals(magic, APS_N64_MAGIC)) { if (count < 5)
throw new PatchException(context.getString(R.string.notify_error_not_aps_patch));
if (Arrays.equals(magicN64, APS_N64_MAGIC)) {
return APS_N64_PATCH; return APS_N64_PATCH;
} else if (Arrays.equals(magic, APS_GBA_MAGIC)) { } else {
return APS_GBA_PATCH; byte[] magicGBA = new byte[4];
System.arraycopy(magicN64, 0, magicGBA, 0, 4);
if (Arrays.equals(magicGBA, APS_GBA_MAGIC)) {
return APS_GBA_PATCH;
}
} }
} finally { } finally {
IOUtils.closeQuietly(stream); IOUtils.closeQuietly(stream);