The-Homebrew-Cloud/JNUSLib
2
0
Fork 0
mirror of https://github.com/Maschell/JNUSLib.git synced 2024-09-28 23:18:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change the content and parent attribute of a FSTEntry to an Optional

Browse Source
This commit is contained in:
Maschell 2019-04-19 10:42:33 +02:00
parent 75e28a733b
commit c47c9913ac
4 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/de/mas/wiiu/jnus/DecryptionService.java
View File

@ -66,7 +66,7 @@ public final class DecryptionService {
public CompletableFuture<Void> decryptFSTEntryToAsync(boolean useFullPath, FSTEntry entry, String outputPath, boolean skipExistingFile) {
return CompletableFuture.runAsync(() -> {
try {
if (entry.isNotInPackage() || entry.getContent() == null) {
if (entry.isNotInPackage() || !entry.getContent().isPresent()) {
return;
}
@ -99,7 +99,7 @@ public final class DecryptionService {
return;
}
if (targetFile.length() == entry.getFileSize()) {
Content c = entry.getContent();
Content c = entry.getContent().get();
if (c.isHashed()) {
log.info("File already exists: " + entry.getFilename());
return;

45
src/de/mas/wiiu/jnus/entities/fst/FSTEntry.java
View File

@ -20,14 +20,14 @@ import java.io.File;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
import de.mas.wiiu.jnus.entities.content.Content;
import lombok.Data;
import lombok.Getter;
import lombok.extern.java.Log;
import lombok.NonNull;
@Log
/**
* Represents one FST Entry
*
@ -41,7 +41,7 @@ public class FSTEntry {
private String filename = null;
private final Supplier<String> filenameSupplier;
@Getter private final FSTEntry parent;
@Getter private final Optional<FSTEntry> parent;
@Getter private final List<FSTEntry> children = new ArrayList<>();
@ -50,7 +50,7 @@ public class FSTEntry {
@Getter private final long fileSize;
@Getter private final long fileOffset;
@Getter private final Content content;
@Getter private final Optional<Content> content;
@Getter private final boolean isDir;
@Getter private final boolean isRoot;
@ -62,14 +62,14 @@ public class FSTEntry {
this.filenameSupplier = fstParam.getFileNameSupplier();
this.flags = fstParam.getFlags();
this.parent = fstParam.getParent();
if (parent != null) {
parent.children.add(this);
if (parent.isPresent()) {
parent.get().children.add(this);
}
this.fileSize = fstParam.getFileSize();
this.fileOffset = fstParam.getFileOffset();
this.content = fstParam.getContent();
if (content != null) {
content.addEntry(this);
if (content.isPresent()) {
content.get().addEntry(this);
}
this.isDir = fstParam.isDir();
this.isRoot = fstParam.isRoot();
@ -88,14 +88,14 @@ public class FSTEntry {
param.setDir(true);
return new FSTEntry(param);
}
public static FSTEntry createFSTEntry(FSTEntry parent, String filename, Content content) {
public static FSTEntry createFSTEntry(@NonNull FSTEntry parent, @NonNull String filename, @NonNull Content content) {
FSTEntryParam param = new FSTEntryParam();
param.setFileNameSupplier(() -> filename);
param.setFileSize(content.getDecryptedFileSize());
param.setContent(content);
param.setContent(Optional.of(content));
param.setDir(false);
param.setParent(parent);
param.setParent(Optional.of(parent));
return new FSTEntry(param);
}
@ -111,8 +111,9 @@ public class FSTEntry {
}
private StringBuilder getPathInternal() {
if (parent != null) {
return parent.getPathInternal().append(parent.getFilename()).append(File.separator);
if (parent.isPresent()) {
FSTEntry par = parent.get();
return par.getPathInternal().append(par.getFilename()).append(File.separator);
}
return new StringBuilder();
}
@ -159,14 +160,10 @@ public class FSTEntry {
public List<FSTEntry> getFSTEntriesByContent(Content content) {
List<FSTEntry> entries = new ArrayList<>();
if (this.content == null) {
log.warning("Error in getFSTEntriesByContent, content null");
System.exit(0);
} else {
if (this.content.equals(content)) {
entries.add(this);
}
if (this.content.isPresent() && this.content.get().equals(content)) {
entries.add(this);
}
for (FSTEntry child : getChildren()) {
entries.addAll(child.getFSTEntriesByContent(content));
}
@ -174,7 +171,7 @@ public class FSTEntry {
}
public long getFileOffsetBlock() {
if (getContent().isHashed()) {
if (getContent().isPresent() && getContent().get().isHashed()) {
return (getFileOffset() / 0xFC00) * 0x10000;
} else {
return getFileOffset();
@ -211,14 +208,14 @@ public class FSTEntry {
@Data
protected static class FSTEntryParam {
private Supplier<String> fileNameSupplier = () -> "";
private FSTEntry parent = null;
private Optional<FSTEntry> parent = Optional.empty();
private short flags;
private long fileSize = 0;
private long fileOffset = 0;
private Content content = null;
private Optional<Content> content = Optional.empty();
private boolean isDir = false;
private boolean isRoot = false;

5
src/de/mas/wiiu/jnus/entities/fst/FSTService.java
View File

@ -20,6 +20,7 @@ import java.text.ParseException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import de.mas.wiiu.jnus.entities.content.Content;
import de.mas.wiiu.jnus.entities.content.ContentFSTInfo;
@ -109,7 +110,7 @@ public final class FSTService {
}
} else {
// TODO: make content attribute in a fstentry optional
entryParam.setContent(content);
entryParam.setContent(Optional.of(content));
ContentFSTInfo contentFSTInfo = contentsFSTByIndex.get((int) contentIndex);
if (contentFSTInfo == null) {
log.warning("ContentFSTInfo for FST Entry not found");
@ -121,7 +122,7 @@ public final class FSTService {
}
entryParam.setContentFSTID(contentIndex);
entryParam.setParent(parent);
entryParam.setParent(Optional.of(parent));
FSTEntry entry = new FSTEntry(entryParam);
fstEntryToOffsetMap.put(entryOffset, entry);

17
src/de/mas/wiiu/jnus/implementations/FSTDataProviderNUSTitle.java
View File

@ -75,11 +75,16 @@ public class FSTDataProviderNUSTitle implements FSTDataProvider, HasNUSTitle {
@Override
public void readFileToStream(OutputStream out, FSTEntry entry, long offset, Optional<Long> size) throws IOException {
if (!entry.getContent().isPresent()) {
out.close();
throw new IOException("Content for the FSTEntry not found: " + entry);
}
long fileOffset = entry.getFileOffset() + offset;
long fileOffsetBlock = fileOffset;
long usedSize = size.orElse(entry.getFileSize());
Content c = entry.getContent().get();
if (entry.getContent().isHashed()) {
if (c.isHashed()) {
fileOffsetBlock = (fileOffset / 0xFC00) * 0x10000;
} else {
fileOffsetBlock = (fileOffset / 0x8000) * 0x8000;
@ -97,12 +102,12 @@ public class FSTDataProviderNUSTitle implements FSTDataProvider, HasNUSTitle {
private boolean decryptFSTEntryToStream(FSTEntry entry, OutputStream outputStream, long fileOffsetBlock, long fileOffset, long fileSize)
throws IOException, CheckSumWrongException {
if (entry.isNotInPackage() || entry.getContent() == null || !title.getTicket().isPresent()) {
if (entry.isNotInPackage() || !entry.getContent().isPresent() || !title.getTicket().isPresent()) {
if (!title.getTicket().isPresent()) {
log.info("Decryption not possible because no ticket was set.");
}else if(entry.isNotInPackage()) {
} else if (entry.isNotInPackage()) {
log.info("Decryption not possible because the FSTEntry is not in this package");
}else if(entry.getContent() == null) {
} else if (entry.getContent() == null) {
// TODO: convert it to an Optional
log.info("Decryption not possible because the Content was null");
}
@ -110,7 +115,7 @@ public class FSTDataProviderNUSTitle implements FSTDataProvider, HasNUSTitle {
return false;
}
Content c = entry.getContent();
Content c = entry.getContent().get();
NUSDataProvider dataProvider = title.getDataProvider();
@ -124,7 +129,7 @@ public class FSTDataProviderNUSTitle implements FSTDataProvider, HasNUSTitle {
}
return nusdecryption.decryptStreams(in, outputStream, fileSize, fileOffset, c, h3HashedOpt);
} catch (CheckSumWrongException e) {
if (entry.getContent().isUNKNWNFlag1Set()) {
if (c.isUNKNWNFlag1Set()) {
log.info("Hash doesn't match. But file is optional. Don't worry.");
} else {
StringBuilder sb = new StringBuilder();