desu/libKonogonka
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor optimizations
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
Dmitry Isaenko 2025-02-19 23:33:15 +03:00
parent 6f04213307
commit 9425a43464
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/libKonogonka/fs/other/System2/System2Provider.java
View file

@ -140,7 +140,6 @@ public class System2Provider extends ExportAble {
if (kernelMap != null) if (kernelMap != null)
return; return;
} }
System.out.println();
} }
else { else {
for (int i = 0; i < 0x1000; i += 4) { for (int i = 0; i < 0x1000; i += 4) {

40
src/test/java/libKonogonka/examples/ExtractDecompressedKip1Test.java
View file

@ -20,7 +20,11 @@ import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class ExtractDecompressedKip1Test extends LKonTest { 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") @DisplayName("Extract FS.kip1")
@Test @Test
void testSystem2() throws Exception{ void testSystem2() throws Exception{
@ -42,28 +46,22 @@ public class ExtractDecompressedKip1Test extends LKonTest {
} }
void iterate(String pathToFirmware, String exportFat, String exportExFat) throws Exception{ void iterate(String pathToFirmware, String exportFat, String exportExFat) throws Exception{
//try { //try {
String[] ncaFileNames = collectNcaFileNames(pathToFirmware); String[] ncaFileNames = collectNcaFileNames(pathToFirmware);
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames, pathToFirmware); List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames, pathToFirmware);
NCAProvider system2FatNcaProvider = null; NCAProvider system2FatNcaProvider = ncaProviders.stream()
NCAProvider system2ExFatNcaProvider = null; .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
.findFirst().get();
for (NCAProvider ncaProvider : ncaProviders) { NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId()); .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
if (titleId.equals("0100000000000819")) .findFirst().get();
system2FatNcaProvider = ncaProvider;
else if (titleId.equals("010000000000081b"))
system2ExFatNcaProvider = ncaProvider;
}
Assertions.assertNotNull(system2FatNcaProvider); System.out.println("\nFAT " + system2FatNcaProvider.getFile().getName() + "\t" + exportFat +
Assertions.assertNotNull(system2ExFatNcaProvider); "\nExFAT " + system2ExFatNcaProvider.getFile().getName() + "\t" + exportExFat);
System.out.println("\nFAT " + system2FatNcaProvider.getFile().getName() + "\t" + exportFat + testExportedFiles(system2FatNcaProvider, exportFat);
"\nExFAT " + system2ExFatNcaProvider.getFile().getName() + "\t" + exportExFat); testExportedFiles(system2ExFatNcaProvider, exportExFat);
testExportedFiles(system2FatNcaProvider, exportFat);
testExportedFiles(system2ExFatNcaProvider, exportExFat);
//} //}
//catch (Exception ignore){} //catch (Exception ignore){}
} }
@ -116,4 +114,8 @@ public class ExtractDecompressedKip1Test extends LKonTest {
System.out.printf("Exported: %b%n%s%n", System.out.printf("Exported: %b%n%s%n",
kip1Providers.get().exportAsDecompressed(exportIntoFolder), exportIntoFolder); kip1Providers.get().exportAsDecompressed(exportIntoFolder), exportIntoFolder);
} }
protected boolean is(byte[] byteArray, String pattern){
return Converter.byteArrToHexStringAsLE(byteArray).equals(pattern);
}
} }