The-Homebrew-Cloud/JNUSLib
2
0
Fork 0
mirror of https://github.com/Maschell/JNUSLib.git synced 2024-11-17 13:39:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Allow to (de)compress files to/from wux which don't have the size of a wii u disc.

Browse Source 
- Fix writing the WUX header for really big files.
This commit is contained in:
Maschell 2020-12-20 11:23:09 +01:00
parent e4d32e9910
commit 2aa0ddff17
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/de/mas/wiiu/jnus/WUDService.java
View File

@ -54,22 +54,22 @@ public final class WUDService {
} }
public static Optional<File> compressWUDToWUX(WUDImage image, String outputFolder) throws IOException { public static Optional<File> compressWUDToWUX(WUDImage image, String outputFolder) throws IOException {
return compressWUDToWUX(image, outputFolder, "game.wux", false); return compressWUDToWUX(image, outputFolder, "game.wux", false, Optional.empty());
} }
public static Optional<File> compressWUDToWUX(WUDImage image, String outputFolder, boolean overwrite) throws IOException { public static Optional<File> compressWUDToWUX(WUDImage image, String outputFolder, boolean overwrite) throws IOException {
return compressWUDToWUX(image, outputFolder, "game.wux", overwrite); return compressWUDToWUX(image, outputFolder, "game.wux", overwrite, Optional.empty());
} }
public static Optional<File> compressWUDToWUX(WUDImage image, String outputFolder, String filename, boolean overwrite) throws IOException { public static Optional<File> compressWUDToWUX(WUDImage image, String outputFolder, String filename, boolean overwrite, Optional<Long> inputFileSize) throws IOException {
if (image.isCompressed()) { if (image.isCompressed()) {
log.info("Given image is already compressed"); log.info("Given image is already compressed");
return Optional.empty(); //return Optional.empty();
} }
if (image.getWUDFileSize() != WUDImage.WUD_FILESIZE) { if (image.getWUDFileSize() != WUDImage.WUD_FILESIZE) {
log.info("Given WUD has not the expected filesize"); log.info("Given WUD has not the expected filesize");
return Optional.empty(); //return Optional.empty();
} }
String usedOutputFolder = outputFolder; String usedOutputFolder = outputFolder;
@ -90,20 +90,25 @@ public final class WUDService {
return Optional.empty(); return Optional.empty();
} }
long toReadFilesize = image.getWUDFileSize();
if(inputFileSize.isPresent()) {
toReadFilesize = inputFileSize.get();
}
log.info("Writing compressed file to: " + outputFile.getAbsolutePath()); log.info("Writing compressed file to: " + outputFile.getAbsolutePath());
RandomAccessFile fileOutput = new RandomAccessFile(outputFile, "rw"); RandomAccessFile fileOutput = new RandomAccessFile(outputFile, "rw");
try { try {
WUDImageCompressedInfo info = WUDImageCompressedInfo.getDefaultCompressedInfo(); WUDImageCompressedInfo info = new WUDImageCompressedInfo(WUDImageCompressedInfo.SECTOR_SIZE, 0, toReadFilesize);
byte[] header = info.getHeaderAsBytes(); byte[] header = info.getHeaderAsBytes();
log.info("Writing header"); log.info("Writing header + " + header.length);
fileOutput.write(header); fileOutput.write(header);
int sectorTableEntryCount = (int) ((image.getWUDFileSize() + WUDImageCompressedInfo.SECTOR_SIZE - 1) / (long) WUDImageCompressedInfo.SECTOR_SIZE); int sectorTableEntryCount = (int) ((toReadFilesize + WUDImageCompressedInfo.SECTOR_SIZE - 1) / (long) WUDImageCompressedInfo.SECTOR_SIZE);
long sectorTableStart = fileOutput.getFilePointer(); long sectorTableStart = fileOutput.getFilePointer();
long sectorTableEnd = Utils.align(sectorTableEntryCount * 0x04, WUDImageCompressedInfo.SECTOR_SIZE); long sectorTableEnd = Utils.align(sectorTableStart + (sectorTableEntryCount * 0x04), WUDImageCompressedInfo.SECTOR_SIZE);
byte[] sectorTablePlaceHolder = new byte[(int) (sectorTableEnd - sectorTableStart)]; byte[] sectorTablePlaceHolder = new byte[(int) (sectorTableEnd - sectorTableStart)];
fileOutput.write(sectorTablePlaceHolder); fileOutput.write(sectorTablePlaceHolder);
@ -111,7 +116,7 @@ public final class WUDService {
Map<ByteArrayWrapper, Integer> sectorHashes = new HashMap<>(); Map<ByteArrayWrapper, Integer> sectorHashes = new HashMap<>();
Map<Integer, Integer> sectorMapping = new TreeMap<>(); Map<Integer, Integer> sectorMapping = new TreeMap<>();
InputStream in = image.getWUDDiscReader().readEncryptedToStream(0, image.getWUDFileSize()); InputStream in = image.getWUDDiscReader().readEncryptedToStream(0, toReadFilesize);
int bufferSize = WUDImageCompressedInfo.SECTOR_SIZE; int bufferSize = WUDImageCompressedInfo.SECTOR_SIZE;
byte[] blockBuffer = new byte[bufferSize]; byte[] blockBuffer = new byte[bufferSize];
@ -147,12 +152,12 @@ public final class WUDService {
if (curSector % 10 == 0) { if (curSector % 10 == 0) {
double readMB = written / 1024.0 / 1024.0; double readMB = written / 1024.0 / 1024.0;
double writtenMB = ((long) realSector * (long) bufferSize) / 1024.0 / 1024.0; double writtenMB = ((long) realSector * (long) bufferSize) / 1024.0 / 1024.0;
double percent = ((double) written / image.getWUDFileSize()) * 100; double percent = ((double) written / toReadFilesize) * 100;
double ratio = 1 / (writtenMB / readMB); double ratio = 1 / (writtenMB / readMB);
System.out.print(String.format(Locale.ROOT, "\rCompressing into .wux | Progress %.2f%% | Ratio: 1:%.2f | Read: %.2fMB | Written: %.2fMB\t", System.out.print(String.format(Locale.ROOT, "\rCompressing into .wux | Progress %.2f%% | Ratio: 1:%.2f | Read: %.2fMB | Written: %.2fMB\t",
percent, ratio, readMB, writtenMB)); percent, ratio, readMB, writtenMB));
} }
} while (written < image.getWUDFileSize()); } while (written < toReadFilesize);
System.out.println(); System.out.println();
log.info("Sectors compressed."); log.info("Sectors compressed.");
log.info("Writing sector table"); log.info("Writing sector table");
@ -235,7 +240,7 @@ public final class WUDService {
if (image.getWUDFileSize() != WUDImage.WUD_FILESIZE) { if (image.getWUDFileSize() != WUDImage.WUD_FILESIZE) {
log.info("Given WUX has not the expected filesize"); log.info("Given WUX has not the expected filesize");
return Optional.empty(); //return Optional.empty();
} }
String usedOutputFolder = outputFolder; String usedOutputFolder = outputFolder;
@ -256,8 +261,10 @@ public final class WUDService {
return Optional.empty(); return Optional.empty();
} }
long toReadFilesize = image.getWUDFileSize() ;
log.info("Writing decompressed file to: " + outputFile.getAbsolutePath()); log.info("Writing decompressed file to: " + outputFile.getAbsolutePath());
InputStream in = image.getWUDDiscReader().readEncryptedToStream(0, WUDImage.WUD_FILESIZE); InputStream in = image.getWUDDiscReader().readEncryptedToStream(0, toReadFilesize);
OutputStream out = new FileOutputStream(outputFile); OutputStream out = new FileOutputStream(outputFile);
int bufferSize = 1024 * 1024; int bufferSize = 1024 * 1024;
@ -279,10 +286,10 @@ public final class WUDService {
curSector++; curSector++;
if (curSector % 1 == 0) { if (curSector % 1 == 0) {
double readMB = totalread / 1024.0 / 1024.0; double readMB = totalread / 1024.0 / 1024.0;
double percent = ((double) totalread / WUDImage.WUD_FILESIZE) * 100; double percent = ((double) totalread / toReadFilesize) * 100;
System.out.print(String.format("\rDecompressing: %.2fMB done (%.2f%%)", readMB, percent)); System.out.print(String.format("\rDecompressing: %.2fMB done (%.2f%%)", readMB, percent));
} }
} while (totalread < WUDImage.WUD_FILESIZE); } while (totalread < toReadFilesize);
System.out.println(); System.out.println();
log.info("Decompressing done!"); log.info("Decompressing done!");
in.close(); in.close();