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

Late Friday ad-hoc updates
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
Dmitry Isaenko 2025-02-07 23:15:06 +03:00
parent d1e18d1e51
commit c8dab73095
3 changed files with 37 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/test/java/libKonogonka/package2/KernelBinExtractTest.java
View file

@ -27,6 +27,9 @@ public class KernelBinExtractTest extends LKonPackage2Test {
private static final String SYSTEM2_FAT_NCA_PATTERN = "0100000000000819";
private static final String SYSTEM2_EXFAT_NCA_PATTERN = "010000000000081b";
private static final String REFERENCE_FILE_PATH = File.separator+"package2"+File.separator+"Kernel.bin";
private static final String OWN_FILE_PATH = File.separator+"Kernel.bin";
@DisplayName("Kernel.bin extract test")
@Test
void testSystem2() throws Exception{
@ -84,43 +87,31 @@ public class KernelBinExtractTest extends LKonPackage2Test {
.collect(Collectors.toList())
.get(0);
Path referenceFilePath = Paths.get(referenceFilesFolder+File.separator+"package2"+File.separator+"Kernel.bin");
Path myFilePath = Paths.get(exportIntoFolder+File.separator+"Kernel.bin");
Path referenceFilePath = Paths.get(referenceFilesFolder+REFERENCE_FILE_PATH);
Path ownFilePath = Paths.get(exportIntoFolder+OWN_FILE_PATH);
System.out.println("\n" +
"\nReference : " + referenceFilePath +
"\nOwn : " + myFilePath);
long referenceCrc32 = calculateReferenceCRC32(referenceFilePath);
System.out.printf("\nReference : %s\nOwn : %s\n", referenceFilePath, ownFilePath);
long referenceCrc32 = calcCRC32(referenceFilePath);
romFsProvider.exportContent(exportIntoFolder, package2FileSystemEntry);
System2Provider providerFile = new System2Provider(exportIntoFolder+File.separator+"package2", keyChainHolder);
providerFile.exportKernel(exportIntoFolder);
validateChecksums(myFilePath, referenceCrc32);
validateSizes(referenceFilePath, myFilePath);
long ownCrc32 = calcCRC32(ownFilePath);
Assertions.assertEquals(ownCrc32, referenceCrc32);
Assertions.assertEquals(Files.size(referenceFilePath), Files.size(ownFilePath));
// Alternative approach
InFileStreamProducer producer = romFsProvider.getStreamProducer(package2FileSystemEntry);
System2Provider providerStream = new System2Provider(producer, keyChainHolder);
providerStream.exportKernel(exportIntoFolder);
validateChecksums(myFilePath, referenceCrc32);
validateSizes(referenceFilePath, myFilePath);
ownCrc32 = calcCRC32(ownFilePath);
Assertions.assertEquals(ownCrc32, referenceCrc32);
Assertions.assertEquals(Files.size(referenceFilePath), Files.size(ownFilePath));
}
long calculateReferenceCRC32(Path refPackage2Path) throws Exception{
byte[] refPackage2Bytes = Files.readAllBytes(refPackage2Path);
long calcCRC32(Path package2Path) throws Exception{
byte[] package2Bytes = Files.readAllBytes(package2Path);
CRC32 crc32 = new CRC32();
crc32.update(refPackage2Bytes, 0, refPackage2Bytes.length);
crc32.update(package2Bytes, 0, package2Bytes.length);
return crc32.getValue();
}
void validateChecksums(Path myPackage2Path, long refPackage2Crc32) throws Exception{
// Check CRC32 for package2 file only
byte[] myPackage2Bytes = Files.readAllBytes(myPackage2Path);
CRC32 crc32 = new CRC32();
crc32.update(myPackage2Bytes, 0, myPackage2Bytes.length);
long myPackage2Crc32 = crc32.getValue();
Assertions.assertEquals(myPackage2Crc32, refPackage2Crc32);
}
void validateSizes(Path a, Path b) throws Exception{
Assertions.assertEquals(Files.size(a), Files.size(b));
}
}

16
src/test/java/libKonogonka/package2/Kip1ExtractDecompressedTest.java
View file

@ -108,12 +108,10 @@ public class Kip1ExtractDecompressedTest extends LKonPackage2Test {
Path referenceFilePath = Paths.get(referenceFilesFolder+File.separator+kip1Name+".dec");
Path myFilePath = Paths.get(exportIntoFolder+File.separator+kip1Name+"_decompressed.kip1");
System.out.println(
"\nReference : " + referenceFilePath+
"\nOwn : " + myFilePath);
System.out.printf("\nReference : %s\nOwn : %s\n", referenceFilePath, myFilePath);
validateChecksums(myFilePath, referencePathCrc32.get(kip1Name));
validateSizes(referenceFilePath, myFilePath);
Assertions.assertEquals(Files.size(referenceFilePath), Files.size(myFilePath));
}
System.out.println("Stream");
@ -125,12 +123,10 @@ public class Kip1ExtractDecompressedTest extends LKonPackage2Test {
Path referenceFilePath = Paths.get(referenceFilesFolder+File.separator+kip1Name+".dec");
Path myFilePath = Paths.get(exportIntoFolder+File.separator+kip1Name+"_decompressed.kip1");
System.out.println(
"\nReference : " + referenceFilePath+
"\nOwn : " + myFilePath);
System.out.printf("\nReference : %s\nOwn : %s\n", referenceFilePath, myFilePath);
validateChecksums(myFilePath, referencePathCrc32.get(kip1Name));
validateSizes(referenceFilePath, myFilePath);
Assertions.assertEquals(Files.size(referenceFilePath), Files.size(myFilePath));
}
System.out.println("---");
}
@ -154,8 +150,4 @@ public class Kip1ExtractDecompressedTest extends LKonPackage2Test {
long myPackage2Crc32 = crc32.getValue();
Assertions.assertEquals(myPackage2Crc32, refPackage2Crc32);
}
void validateSizes(Path a, Path b) throws Exception{
Assertions.assertEquals(Files.size(a), Files.size(b));
}
}

42
src/test/java/libKonogonka/package2/Kip1ExtractTest.java
View file

@ -31,6 +31,9 @@ public class Kip1ExtractTest extends LKonPackage2Test {
private static final String SYSTEM2_FAT_NCA_PATTERN = "0100000000000819";
private static final String SYSTEM2_EXFAT_NCA_PATTERN = "010000000000081b";
private static final String REFERENCE_FILE_PATH = File.separator+"ini1_extracted"+File.separator+"FS.kip1";
private static final String OWN_FILE_PATH = File.separator+"FS.kip1";
@DisplayName("KIP1 extract test (case 'FS')")
@Test
void testSystem2() throws Exception{
@ -89,13 +92,11 @@ public class Kip1ExtractTest extends LKonPackage2Test {
.collect(Collectors.toList())
.get(0);
Path referenceFilePath = Paths.get(referenceFilesFolder+File.separator+"ini1_extracted"+File.separator+"FS.kip1");
Path myFilePath = Paths.get(exportIntoFolder+File.separator+"FS.kip1");
Path referenceFilePath = Paths.get(referenceFilesFolder+REFERENCE_FILE_PATH);
Path ownFilePath = Paths.get(exportIntoFolder+OWN_FILE_PATH);
System.out.println(
"\nReference : " + referenceFilePath +
"\nOwn : " + myFilePath);
long referenceCrc32 = calculateReferenceCRC32(referenceFilePath);
System.out.printf("\nReference : %s\nOwn : %s\n", referenceFilePath, ownFilePath);
long referenceCrc32 = calcCRC32(referenceFilePath);
romFsProvider.exportContent(exportIntoFolder, package2FileSystemEntry);
System2Provider kernelProviderFile = new System2Provider(exportIntoFolder+File.separator+"package2", keyChainHolder);
@ -103,33 +104,22 @@ public class Kip1ExtractTest extends LKonPackage2Test {
Ini1Provider ini1Provider = new Ini1Provider(Paths.get(exportIntoFolder+File.separator+"INI1.bin"));
for (KIP1Provider kip1Provider : ini1Provider.getKip1List())
kip1Provider.export(exportIntoFolder);
validateChecksums(myFilePath, referenceCrc32);
validateSizes(referenceFilePath, myFilePath);
long ownCrc32 = calcCRC32(ownFilePath);
Assertions.assertEquals(ownCrc32, referenceCrc32);
Assertions.assertEquals(Files.size(referenceFilePath), Files.size(ownFilePath));
InFileStreamProducer producer = romFsProvider.getStreamProducer(package2FileSystemEntry);
System2Provider providerStream = new System2Provider(producer, keyChainHolder);
for (KIP1Provider kip1Provider : providerStream.getIni1Provider().getKip1List())
kip1Provider.export(exportIntoFolder);
validateChecksums(myFilePath, referenceCrc32);
validateSizes(referenceFilePath, myFilePath);
ownCrc32 = calcCRC32(ownFilePath);
Assertions.assertEquals(ownCrc32, referenceCrc32);
Assertions.assertEquals(Files.size(referenceFilePath), Files.size(ownFilePath));
}
long calculateReferenceCRC32(Path refPackage2Path) throws Exception{
byte[] refPackage2Bytes = Files.readAllBytes(refPackage2Path);
long calcCRC32(Path package2Path) throws Exception{
byte[] package2Bytes = Files.readAllBytes(package2Path);
CRC32 crc32 = new CRC32();
crc32.update(refPackage2Bytes, 0, refPackage2Bytes.length);
crc32.update(package2Bytes, 0, package2Bytes.length);
return crc32.getValue();
}
void validateChecksums(Path myPackage2Path, long refPackage2Crc32) throws Exception{
// Check CRC32 for package2 file only
byte[] myPackage2Bytes = Files.readAllBytes(myPackage2Path);
CRC32 crc32 = new CRC32();
crc32.update(myPackage2Bytes, 0, myPackage2Bytes.length);
long myPackage2Crc32 = crc32.getValue();
Assertions.assertEquals(myPackage2Crc32, refPackage2Crc32);
}
void validateSizes(Path a, Path b) throws Exception{
Assertions.assertEquals(Files.size(a), Files.size(b));
}
}