The-Homebrew-Cloud
/
fuse-wiiu
mirror of https://github.com/Maschell/fuse-wiiu.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move WUDInfo loading into an Util class

This commit is contained in:
Maschell 2019-04-15 19:30:15 +02:00
parent 53443ef0dc
commit 0e00d6d28a
2 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/de/mas/wiiu/jnus/fuse_wiiu/implementation/WUDFuseContainer.java
View File

@ -2,18 +2,15 @@ package de.mas.wiiu.jnus.fuse_wiiu.implementation;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import org.apache.commons.io.FilenameUtils;
import de.mas.wiiu.jnus.WUDLoader;
import de.mas.wiiu.jnus.fuse_wiiu.Settings;
import de.mas.wiiu.jnus.fuse_wiiu.interfaces.FuseDirectory;
import de.mas.wiiu.jnus.fuse_wiiu.utils.WUDUtils;
import de.mas.wiiu.jnus.implementations.wud.parser.WUDInfo;
import de.mas.wiiu.jnus.interfaces.FSTDataProvider;
import lombok.val;
@ -28,7 +25,7 @@ public class WUDFuseContainer extends GroupFuseContainer {
@Override
protected void doInit() {
Optional<WUDInfo> WUDInfoOpt = loadWUDInfo(input);
Optional<WUDInfo> WUDInfoOpt = WUDUtils.loadWUDInfo(input);
if (WUDInfoOpt.isPresent()) {
parseContents(WUDInfoOpt.get());
} else {
@ -36,35 +33,6 @@ public class WUDFuseContainer extends GroupFuseContainer {
}
}
private Optional<WUDInfo> loadWUDInfo(File file) {
String FSfilename = file.getName();
String basename = FilenameUtils.getBaseName(FSfilename);
File keyFile = new File(file.getParent() + File.separator + basename + ".key");
if (!keyFile.exists() && Settings.disckeyPath != null) {
System.out.println(".key not found at " + keyFile.getAbsolutePath());
keyFile = new File(Settings.disckeyPath.getAbsoluteFile() + File.separator + basename + ".key");
if (!keyFile.exists()) {
System.out.println(".key not found at " + keyFile.getAbsolutePath());
}
}
try {
if (keyFile.exists()) {
return Optional.of(WUDLoader.load(file.getAbsolutePath(), keyFile));
} else {
System.out.println("No .key was not found. Trying dev mode.");
return Optional.of(WUDLoader.loadDev(file.getAbsolutePath()));
}
} catch (Exception e) {
StringWriter errors = new StringWriter();
e.printStackTrace(new PrintWriter(errors));
System.err.println(errors);
}
return Optional.empty();
}
protected void parseContents(WUDInfo wudInfo) {
List<FSTDataProvider> dps = new ArrayList<>();
@ -75,9 +43,12 @@ public class WUDFuseContainer extends GroupFuseContainer {
try {
dps = WUDLoader.getPartitonsAsFSTDataProvider(wudInfo, Settings.devCommonKey);
} catch (IOException | ParseException e1) {
e.printStackTrace();
e1.printStackTrace();
System.out.println("Ignoring " + input.getAbsolutePath() + " :" + e1.getClass().getName() + " " + e1.getMessage());
}
} catch (Exception e) {
e.printStackTrace();
System.out.println("Ignoring " + input.getAbsolutePath() + " :" + e.getClass().getName() + " " + e.getMessage());
}

44
src/main/java/de/mas/wiiu/jnus/fuse_wiiu/utils/WUDUtils.java Normal file
View File

@ -0,0 +1,44 @@
package de.mas.wiiu.jnus.fuse_wiiu.utils;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Optional;
import org.apache.commons.io.FilenameUtils;
import de.mas.wiiu.jnus.WUDLoader;
import de.mas.wiiu.jnus.fuse_wiiu.Settings;
import de.mas.wiiu.jnus.implementations.wud.parser.WUDInfo;
public class WUDUtils {
public static Optional<WUDInfo> loadWUDInfo(File file) {
String FSfilename = file.getName();
String basename = FilenameUtils.getBaseName(FSfilename);
File keyFile = new File(file.getParent() + File.separator + basename + ".key");
if (!keyFile.exists() && Settings.disckeyPath != null) {
System.out.println(".key not found at " + keyFile.getAbsolutePath());
keyFile = new File(Settings.disckeyPath.getAbsoluteFile() + File.separator + basename + ".key");
if (!keyFile.exists()) {
System.out.println(".key not found at " + keyFile.getAbsolutePath());
}
}
try {
if (keyFile.exists()) {
return Optional.of(WUDLoader.load(file.getAbsolutePath(), keyFile));
} else {
System.out.println("No .key was not found. Trying dev mode.");
return Optional.of(WUDLoader.loadDev(file.getAbsolutePath()));
}
} catch (Exception e) {
e.printStackTrace();
StringWriter errors = new StringWriter();
e.printStackTrace(new PrintWriter(errors));
System.err.println(errors);
}
return Optional.empty();
}
}