From 9425a4346411e1f36050481c65bf8218aac92010 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Wed, 19 Feb 2025 23:33:15 +0300 Subject: [PATCH] Minor optimizations --- .../fs/other/System2/System2Provider.java | 1 - .../examples/ExtractDecompressedKip1Test.java | 40 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/libKonogonka/fs/other/System2/System2Provider.java b/src/main/java/libKonogonka/fs/other/System2/System2Provider.java index 01670df..d8930d8 100644 --- a/src/main/java/libKonogonka/fs/other/System2/System2Provider.java +++ b/src/main/java/libKonogonka/fs/other/System2/System2Provider.java @@ -140,7 +140,6 @@ public class System2Provider extends ExportAble { if (kernelMap != null) return; } - System.out.println(); } else { for (int i = 0; i < 0x1000; i += 4) { diff --git a/src/test/java/libKonogonka/examples/ExtractDecompressedKip1Test.java b/src/test/java/libKonogonka/examples/ExtractDecompressedKip1Test.java index d28524d..7f2ce21 100644 --- a/src/test/java/libKonogonka/examples/ExtractDecompressedKip1Test.java +++ b/src/test/java/libKonogonka/examples/ExtractDecompressedKip1Test.java @@ -20,7 +20,11 @@ import java.util.Optional; import java.util.stream.Collectors; public class ExtractDecompressedKip1Test extends LKonTest { - @Disabled + + private static final String SYSTEM2_FAT_NCA_PATTERN = "0100000000000819"; + private static final String SYSTEM2_EXFAT_NCA_PATTERN = "010000000000081b"; + + //@Disabled @DisplayName("Extract FS.kip1") @Test void testSystem2() throws Exception{ @@ -42,28 +46,22 @@ public class ExtractDecompressedKip1Test extends LKonTest { } void iterate(String pathToFirmware, String exportFat, String exportExFat) throws Exception{ //try { - String[] ncaFileNames = collectNcaFileNames(pathToFirmware); - List ncaProviders = makeNcaProviders(ncaFileNames, pathToFirmware); + String[] ncaFileNames = collectNcaFileNames(pathToFirmware); + List ncaProviders = makeNcaProviders(ncaFileNames, pathToFirmware); - NCAProvider system2FatNcaProvider = null; - NCAProvider system2ExFatNcaProvider = null; + NCAProvider system2FatNcaProvider = ncaProviders.stream() + .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN)) + .findFirst().get(); - for (NCAProvider ncaProvider : ncaProviders) { - String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId()); - if (titleId.equals("0100000000000819")) - system2FatNcaProvider = ncaProvider; - else if (titleId.equals("010000000000081b")) - system2ExFatNcaProvider = ncaProvider; - } + NCAProvider system2ExFatNcaProvider = ncaProviders.stream() + .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN)) + .findFirst().get(); - Assertions.assertNotNull(system2FatNcaProvider); - Assertions.assertNotNull(system2ExFatNcaProvider); + System.out.println("\nFAT " + system2FatNcaProvider.getFile().getName() + "\t" + exportFat + + "\nExFAT " + system2ExFatNcaProvider.getFile().getName() + "\t" + exportExFat); - System.out.println("\nFAT " + system2FatNcaProvider.getFile().getName() + "\t" + exportFat + - "\nExFAT " + system2ExFatNcaProvider.getFile().getName() + "\t" + exportExFat); - - testExportedFiles(system2FatNcaProvider, exportFat); - testExportedFiles(system2ExFatNcaProvider, exportExFat); + testExportedFiles(system2FatNcaProvider, exportFat); + testExportedFiles(system2ExFatNcaProvider, exportExFat); //} //catch (Exception ignore){} } @@ -116,4 +114,8 @@ public class ExtractDecompressedKip1Test extends LKonTest { System.out.printf("Exported: %b%n%s%n", kip1Providers.get().exportAsDecompressed(exportIntoFolder), exportIntoFolder); } + + protected boolean is(byte[] byteArray, String pattern){ + return Converter.byteArrToHexStringAsLE(byteArray).equals(pattern); + } }