TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-10 13:16:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix[nativesextractor]: improve style, address performance/debuggability concerns

Browse Source
This commit is contained in:
artdeell 2025-02-15 18:33:54 +03:00
parent d713fe52ea
commit 81c6813a6b
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/NativesExtractor.java
View File

@ -42,7 +42,8 @@ public class NativesExtractor {
} }
private static String getAarArchitectureName() { private static String getAarArchitectureName() {
switch (Architecture.getDeviceArchitecture()) { int architecture = Architecture.getDeviceArchitecture();
switch (architecture) {
case Architecture.ARCH_ARM: case Architecture.ARCH_ARM:
return "armeabi-v7a"; return "armeabi-v7a";
case Architecture.ARCH_ARM64: case Architecture.ARCH_ARM64:
@ -52,37 +53,33 @@ public class NativesExtractor {
case Architecture.ARCH_X86_64: case Architecture.ARCH_X86_64:
return "x86_64"; return "x86_64";
} }
throw new RuntimeException("Unknown CPU architecture!"); throw new RuntimeException("Unknown CPU architecture: "+architecture);
} }
public void extractFromAar(File source) throws IOException { public void extractFromAar(File source) throws IOException {
try (FileInputStream fileInputStream = new FileInputStream(source)) { byte[] buffer = new byte[8192];
try(ZipInputStream zipInputStream = new ZipInputStream(fileInputStream)) { try (FileInputStream fileInputStream = new FileInputStream(source);
// Wrap the ZIP input stream into a non-closeable stream to ZipInputStream zipInputStream = new ZipInputStream(fileInputStream)) {
// avoid it being closed by processEntry() // Wrap the ZIP input stream into a non-closeable stream to
NonCloseableInputStream entryCopyStream = new NonCloseableInputStream(zipInputStream); // avoid it being closed by processEntry()
NonCloseableInputStream entryCopyStream = new NonCloseableInputStream(zipInputStream);
ZipEntry entry;
while((entry = zipInputStream.getNextEntry()) != null) {
String entryName = entry.getName();
if(!entryName.startsWith(mLibraryLocation) || entry.isDirectory()) continue;
// Entry name is actually the full path, so we need to strip the path before extraction
entryName = FileUtils.getFileName(entryName);
// getFileName may make the file name null, avoid that case.
if(entryName == null || LIBRARY_BLACKLIST.contains(entryName)) continue;
while(true) { processEntry(entryCopyStream, entry, new File(mDestinationDir, entryName), buffer);
ZipEntry entry = zipInputStream.getNextEntry();
if(entry == null) break;
String entryName = entry.getName();
if(!entryName.startsWith(mLibraryLocation) || entry.isDirectory()) continue;
// Entry name is actually the full path, so we need to strip the path before extraction
entryName = FileUtils.getFileName(entryName);
// getFileName may make the file name null, avoid that case.
if(entryName == null || LIBRARY_BLACKLIST.contains(entryName)) continue;
processEntry(entryCopyStream, entry, new File(mDestinationDir, entryName));
}
} }
} }
} }
private static long fileCrc32(File target) throws IOException { private static long fileCrc32(File target, byte[] buffer) throws IOException {
try(FileInputStream fileInputStream = new FileInputStream(target)) { try(FileInputStream fileInputStream = new FileInputStream(target)) {
CRC32 crc32 = new CRC32(); CRC32 crc32 = new CRC32();
byte[] buffer = new byte[1024];
int len; int len;
while((len = fileInputStream.read(buffer)) != -1) { while((len = fileInputStream.read(buffer)) != -1) {
crc32.update(buffer, 0, len); crc32.update(buffer, 0, len);
@ -91,12 +88,12 @@ public class NativesExtractor {
} }
} }
private void processEntry(InputStream sourceStream, ZipEntry zipEntry, File entryDestination) throws IOException { private void processEntry(InputStream sourceStream, ZipEntry zipEntry, File entryDestination, byte[] buffer) throws IOException {
if(entryDestination.exists()) { if(entryDestination.exists()) {
long expectedSize = zipEntry.getSize(); long expectedSize = zipEntry.getSize();
long expectedCrc32 = zipEntry.getCrc(); long expectedCrc32 = zipEntry.getCrc();
long realSize = entryDestination.length(); long realSize = entryDestination.length();
long realCrc32 = fileCrc32(entryDestination); long realCrc32 = fileCrc32(entryDestination, buffer);
// File in archive is the same as the local one, don't extract // File in archive is the same as the local one, don't extract
if(realSize == expectedSize && realCrc32 == expectedCrc32) return; if(realSize == expectedSize && realCrc32 == expectedCrc32) return;
} }