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

Throw and safely catch InterruptedException on task cancellation

Browse Source
This commit is contained in:
Tom Hicks
2026-09-22 21:43:53 -07:00
committed by Tom
parent 5ee7f02b42
commit 509ac11749
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java
View File

@@ -268,7 +268,14 @@ public class MainActivity extends AppCompatActivity {
return totalImported; return totalImported;
}; };
} else { } else {
importTask = () -> GitRepoImporterService.importFromGitRepository(getApplicationContext(), source, () -> mImportDisposable != null && mImportDisposable.isDisposed()); importTask = () -> {
try {
return GitRepoImporterService.importFromGitRepository(getApplicationContext(), source, () -> mImportDisposable != null && mImportDisposable.isDisposed());
} catch (InterruptedException e) {
Logger.logError("Import task was interrupted", e);
return 0; // Return gracefully on interruption
}
};
} }
mImportDisposable = Single.fromCallable(importTask) mImportDisposable = Single.fromCallable(importTask)

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

@@ -80,7 +80,7 @@ public class GitRepoImporterService {
return totalImported; return totalImported;
} }
private static void downloadZip(String urlStr, File dest, BooleanSupplier isCancelled) throws IOException { private static void downloadZip(String urlStr, File dest, BooleanSupplier isCancelled) throws IOException, InterruptedException {
URL url = new URL(urlStr); URL url = new URL(urlStr);
HttpURLConnection conn = (HttpURLConnection) url.openConnection(); HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET"); conn.setRequestMethod("GET");
@@ -106,13 +106,15 @@ public class GitRepoImporterService {
byte[] buffer = new byte[8192]; byte[] buffer = new byte[8192];
int count; int count;
while ((count = in.read(buffer)) != -1) { while ((count = in.read(buffer)) != -1) {
if (isCancelled.getAsBoolean()) break; if (isCancelled.getAsBoolean()) {
throw new InterruptedException("Git download was cancelled.");
}
out.write(buffer, 0, count); out.write(buffer, 0, count);
} }
} }
} }
private static int unzipAndFilter(File zipFile, File extractDir, String filterExtension, String subfolder, BooleanSupplier isCancelled) { private static int unzipAndFilter(File zipFile, File extractDir, String filterExtension, String subfolder, BooleanSupplier isCancelled) throws InterruptedException {
int extractedCount = 0; int extractedCount = 0;
try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile))) { try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile))) {
ZipEntry entry; ZipEntry entry;
@@ -123,7 +125,7 @@ public class GitRepoImporterService {
} catch (Exception e) { } catch (Exception e) {
Logger.logError("Failed to close zip entry upon cancellation", e); Logger.logError("Failed to close zip entry upon cancellation", e);
} }
break; throw new InterruptedException("Git extraction was cancelled.");
} }
if (!entry.isDirectory()) { if (!entry.isDirectory()) {
String name = entry.getName(); String name = entry.getName();
@@ -137,9 +139,13 @@ public class GitRepoImporterService {
byte[] buffer = new byte[8192]; byte[] buffer = new byte[8192];
int count; int count;
while ((count = zis.read(buffer)) != -1) { while ((count = zis.read(buffer)) != -1) {
if (isCancelled.getAsBoolean()) break; if (isCancelled.getAsBoolean()) {
throw new InterruptedException("Git extraction was cancelled during file read.");
}
fos.write(buffer, 0, count); fos.write(buffer, 0, count);
} }
} catch (InterruptedException e) {
throw e;
} catch (Exception e) { } catch (Exception e) {
Logger.logError("Failed to write extracted file to disk: " + name, e); Logger.logError("Failed to write extracted file to disk: " + name, e);
} }
@@ -151,13 +157,15 @@ public class GitRepoImporterService {
Logger.logError("Failed to close zip entry", e); Logger.logError("Failed to close zip entry", e);
} }
} }
} catch (InterruptedException e) {
throw e;
} catch (Exception e) { } catch (Exception e) {
Logger.logError("Failed during unzip stream processing", e); Logger.logError("Failed during unzip stream processing", e);
} }
return extractedCount; return extractedCount;
} }
private static int processDirectory(File dir, EntityImporter<Monster> importer, MonsterRepository repository, BooleanSupplier isCancelled) { private static int processDirectory(File dir, EntityImporter<Monster> importer, MonsterRepository repository, BooleanSupplier isCancelled) throws InterruptedException {
int importedCount = 0; int importedCount = 0;
File[] files = dir.listFiles(); File[] files = dir.listFiles();
if (files == null) { if (files == null) {
@@ -168,7 +176,9 @@ public class GitRepoImporterService {
Logger.logWTF("Attempting to process " + files.length + " JSON files."); Logger.logWTF("Attempting to process " + files.length + " JSON files.");
for (File file : files) { for (File file : files) {
if (isCancelled.getAsBoolean()) break; if (isCancelled.getAsBoolean()) {
throw new InterruptedException("Git import processing was cancelled.");
}
if (file.isFile()) { if (file.isFile()) {
String content = readFileContent(file); String content = readFileContent(file);
if (content != null) { if (content != null) {