From a46011c6ea673c2f189fcfe386744890eeb27aee Mon Sep 17 00:00:00 2001 From: Maschell Date: Thu, 6 Dec 2018 17:10:15 +0100 Subject: [PATCH] Added options to disable parellelisation --- src/de/mas/wiiu/jnus/ExtractionService.java | 4 ++-- src/de/mas/wiiu/jnus/Settings.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/de/mas/wiiu/jnus/ExtractionService.java b/src/de/mas/wiiu/jnus/ExtractionService.java index c1fe1ca..e3caef7 100644 --- a/src/de/mas/wiiu/jnus/ExtractionService.java +++ b/src/de/mas/wiiu/jnus/ExtractionService.java @@ -95,7 +95,7 @@ public final class ExtractionService { public void extractEncryptedContentFilesTo(List list, String outputFolder, boolean withHashes) throws IOException { Utils.createDir(outputFolder); - if (parallelizable) { + if (parallelizable && Settings.ALLOW_PARALLELISATION) { try { CompletableFuture.allOf(list.stream().map((Content c) -> CompletableFuture.runAsync(() -> { try { @@ -105,7 +105,7 @@ public final class ExtractionService { } })).toArray(CompletableFuture[]::new)).get(); } catch (InterruptedException | ExecutionException e) { - throw new IOException(e); + throw new RuntimeException(e); } } else { for (Content c : list) { diff --git a/src/de/mas/wiiu/jnus/Settings.java b/src/de/mas/wiiu/jnus/Settings.java index cc28e97..9b08869 100644 --- a/src/de/mas/wiiu/jnus/Settings.java +++ b/src/de/mas/wiiu/jnus/Settings.java @@ -29,6 +29,7 @@ public class Settings { public static final String WOOMY_METADATA_FILENAME = "metadata.xml"; public static final String H3_EXTENTION = ".h3"; public static final String USER_AGENT = "Mozilla/5.0 (Nintendo WiiU) AppleWebKit/536.28 (KHTML, like Gecko) NX/3.0.3.12.12 NintendoBrowser/3.0.0.9561.US"; + public static final boolean ALLOW_PARALLELISATION = true; public static byte[] commonKey = new byte[0x10]; public static int WIIU_DECRYPTED_AREA_OFFSET = 0x18000;