maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch exceptions and handle graceful zip closes when cancelled

Browse Source
This commit is contained in:
Tom Hicks
2026-09-22 21:40:04 -07:00
committed by Tom
parent a7f1ff712a
commit 5ee7f02b42
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Android/app/src/main/java/com/majinnaibu/monstercards/importers/GitRepoImporterService.java
View File

@@ -112,12 +112,19 @@ public class GitRepoImporterService {
}
}
private static int unzipAndFilter(File zipFile, File extractDir, String filterExtension, String subfolder, BooleanSupplier isCancelled) throws IOException {
private static int unzipAndFilter(File zipFile, File extractDir, String filterExtension, String subfolder, BooleanSupplier isCancelled) {
int extractedCount = 0;
try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile))) {
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (isCancelled.getAsBoolean()) break;
if (isCancelled.getAsBoolean()) {
try {
zis.closeEntry();
} catch (Exception e) {
Logger.logError("Failed to close zip entry upon cancellation", e);
}
break;
}
if (!entry.isDirectory()) {
String name = entry.getName();
boolean inSubfolder = subfolder == null || subfolder.isEmpty() || name.contains("/" + subfolder + "/") || name.startsWith(subfolder + "/");
@@ -133,13 +140,20 @@ public class GitRepoImporterService {
if (isCancelled.getAsBoolean()) break;
fos.write(buffer, 0, count);
}
}
extractedCount++;
} catch (Exception e) {
Logger.logError("Failed to write extracted file to disk: " + name, e);
}
}
}
try {
zis.closeEntry();
} catch (Exception e) {
Logger.logError("Failed to close zip entry", e);
}
}
} catch (Exception e) {
Logger.logError("Failed during unzip stream processing", e);
}
return extractedCount;
}