desu/ns-usbloader
1
0
Fork 0
Code Pull requests Releases Wiki Activity Actions

Minor corrections to wolfposd's implementation

Browse source
This commit is contained in:
Dmitry Isaenko 2020-11-29 02:18:35 +03:00
parent dcabf76522
commit 0a8440ef34
1 changed files with 50 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/main/java/nsusbloader/Controllers/GamesController.java
View file

@ -1,5 +1,5 @@
/* /*
Copyright 2019-2020 Dmitry Isaenko Copyright 2019-2020 Dmitry Isaenko, wolfposd
This file is part of NS-USBloader. This file is part of NS-USBloader.
@ -52,6 +52,7 @@ public class GamesController implements Initializable {
private static final String REGEX_ONLY_NSP = ".*\\.nsp$"; private static final String REGEX_ONLY_NSP = ".*\\.nsp$";
private static final String REGEX_ALLFILES_TINFOIL = ".*\\.(nsp$|xci$|nsz$|xcz$)"; private static final String REGEX_ALLFILES_TINFOIL = ".*\\.(nsp$|xci$|nsz$|xcz$)";
private static final String REGEX_ALLFILES = ".*";
@FXML @FXML
private AnchorPane usbNetPane; private AnchorPane usbNetPane;
@ -204,8 +205,8 @@ public class GamesController implements Initializable {
return getSelectedProtocol().equals("TinFoil"); return getSelectedProtocol().equals("TinFoil");
} }
private boolean isNSPFileFilterForGL() { private boolean isAllFiletypesAllowedForGL() {
return MediatorControl.getInstance().getContoller().getSettingsCtrlr().getGoldleafSettings().getNSPFileFilterForGL(); return ! MediatorControl.getInstance().getContoller().getSettingsCtrlr().getGoldleafSettings().getNSPFileFilterForGL();
} }
private boolean isXciNszXczSupport() { private boolean isXciNszXczSupport() {
@ -222,13 +223,18 @@ public class GamesController implements Initializable {
private String getRegexForFiles() { private String getRegexForFiles() {
if (isTinfoil() && isXciNszXczSupport()) if (isTinfoil() && isXciNszXczSupport())
return REGEX_ALLFILES_TINFOIL; return REGEX_ALLFILES_TINFOIL;
else if (isGoldLeaf() && isAllFiletypesAllowedForGL())
return REGEX_ALLFILES;
else else
return REGEX_ONLY_NSP; return REGEX_ONLY_NSP;
// currently only tinfoil supports all filetypes }
// everything else only supports nsp private String getRegexForFolders() {
// else if (isGoldLeaf()) final String regexForFiles = getRegexForFiles();
// return REGEX_ONLY_NSP;
// else if (regexForFiles.equals(REGEX_ALLFILES))
return REGEX_ALLFILES_TINFOIL;
else
return regexForFiles;
} }
/** /**
@ -242,10 +248,12 @@ public class GamesController implements Initializable {
if (isTinfoil() && isXciNszXczSupport()) { if (isTinfoil() && isXciNszXczSupport()) {
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("NSP/XCI/NSZ/XCZ", "*.nsp", "*.xci", "*.nsz", "*.xcz")); fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("NSP/XCI/NSZ/XCZ", "*.nsp", "*.xci", "*.nsz", "*.xcz"));
} else if (isGoldLeaf() && !isNSPFileFilterForGL()) { }
else if (isGoldLeaf() && isAllFiletypesAllowedForGL()) {
fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Any file", "*.*"), fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Any file", "*.*"),
new FileChooser.ExtensionFilter("NSP ROM", "*.nsp")); new FileChooser.ExtensionFilter("NSP ROM", "*.nsp"));
} else { }
else {
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("NSP ROM", "*.nsp")); fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("NSP ROM", "*.nsp"));
} }
@ -270,7 +278,7 @@ public class GamesController implements Initializable {
performInBackgroundAndUpdate(() -> { performInBackgroundAndUpdate(() -> {
final List<File> allFiles = new ArrayList<>(); final List<File> allFiles = new ArrayList<>();
collectFiles(allFiles, startFolder, getRegexForFiles()); collectFiles(allFiles, startFolder, getRegexForFiles(), getRegexForFolders());
return allFiles; return allFiles;
}, (files) -> { }, (files) -> {
if (!files.isEmpty()) { if (!files.isEmpty()) {
@ -285,20 +293,34 @@ public class GamesController implements Initializable {
* used to recursively walk all directories, every file will be added to the storage list * used to recursively walk all directories, every file will be added to the storage list
* @param storage used to hold files * @param storage used to hold files
* @param startFolder where to start * @param startFolder where to start
* @param regex for filenames * @param filesRegex for filenames
*/ */
private void collectFiles(List<File> storage, File startFolder, final String regex) { // TODO: Too sophisticated. Should be moved to simple class to keep things simplier
if (startFolder.isDirectory()) { private void collectFiles(List<File> storage,
File[] files = startFolder.listFiles(); File startFolder,
if(files != null) final String filesRegex,
for (File f : files) { final String foldersRegex)
if (f.isDirectory()) { {
collectFiles(storage, f, regex); final String startFolderNameInLowercase = startFolder.getName().toLowerCase();
} else if (f.getName().toLowerCase().matches(regex)) {
storage.add(f); if (startFolder.isFile()) {
} if (startFolderNameInLowercase.matches(filesRegex)) {
} storage.add(startFolder);
}
return;
} }
if (startFolderNameInLowercase.matches(foldersRegex)) {
storage.add(startFolder);
return;
}
File[] files = startFolder.listFiles();
if (files == null)
return;
for (File file : files)
collectFiles(storage, file, filesRegex, foldersRegex);
} }
/** /**
@ -414,15 +436,15 @@ public class GamesController implements Initializable {
* */ * */
@FXML @FXML
private void handleDrop(DragEvent event) { private void handleDrop(DragEvent event) {
final String regex = getRegexForFiles(); final String regexForFiles = getRegexForFiles();
final String regexForFolders = getRegexForFolders();
List<File> files = event.getDragboard().getFiles(); List<File> files = event.getDragboard().getFiles();
performInBackgroundAndUpdate(() -> { performInBackgroundAndUpdate(() -> {
List<File> allFiles = new ArrayList<>(); List<File> allFiles = new ArrayList<>();
if (files != null && files.size() != 0) { if (files != null && files.size() != 0) {
files.stream().filter(File::isDirectory).forEach(f -> collectFiles(allFiles, f, regex)); files.forEach(f -> collectFiles(allFiles, f, regexForFiles, regexForFolders));
files.stream().filter(f -> f.getName().toLowerCase().matches(regex)).forEach(allFiles::add);
} }
return allFiles; return allFiles;
}, allFiles -> { }, allFiles -> {
@ -484,9 +506,7 @@ public class GamesController implements Initializable {
private <T> void performInBackgroundAndUpdate(Supplier<T> background, Consumer<T> update) { private <T> void performInBackgroundAndUpdate(Supplier<T> background, Consumer<T> update) {
new Thread(() -> { new Thread(() -> {
final T result = background.get(); final T result = background.get();
Platform.runLater(() -> { Platform.runLater(() -> update.accept(result));
update.accept(result);
});
}).start(); }).start();
} }
@ -505,4 +525,4 @@ public class GamesController implements Initializable {
preferences.setNetUsb(getSelectedNetUsb()); preferences.setNetUsb(getSelectedNetUsb());
preferences.setNsIp(getNsIp()); preferences.setNsIp(getNsIp());
} }
} }