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

rollback unnecessary workarounds
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
Dmitry Isaenko 2025-12-28 13:02:07 +03:00
parent beb71b504a
commit a2e9eae460
3 changed files with 2 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/nsusbloader/AppPreferences.java
View file

@ -29,7 +29,7 @@ public class AppPreferences {
private final Preferences preferences;
private final Locale locale;
public static final String[] GOLDLEAF_SUPPORTED_VERSIONS = {"v0.5", "v0.7.x", "v0.8-0.9", "v0.10-1.0.0", "v1.1.1"};
public static final String[] GOLDLEAF_SUPPORTED_VERSIONS = {"v0.5", "v0.7.x", "v0.8-0.9", "v0.10+"};
private static final Font DEFAULT_FONT = Font.getDefault();
private AppPreferences(){

6
src/main/java/nsusbloader/com/usb/UsbCommunications.java
View file

@ -25,7 +25,6 @@ import nsusbloader.NSLDataTypes.EFileStatus;
import nsusbloader.NSLDataTypes.EModule;
import nsusbloader.NSLDataTypes.EMsgType;
import nsusbloader.com.usb.gl.GoldLeaf_010;
import nsusbloader.com.usb.gl.GoldLeaf_111;
import org.usb4java.*;
import java.io.*;
@ -68,10 +67,7 @@ public class UsbCommunications extends CancellableRunnable {
case "TinFoil":
module = new TinFoil(handler, nspMap, this, logPrinter);
break;
case "GoldLeaf v1.1.1":
module = new GoldLeaf_111(handler, nspMap, this, logPrinter, nspFilterForGl);
break;
case "GoldLeaf v0.10-1.0.0":
case "GoldLeaf v0.10+":
module = new GoldLeaf_010(handler, nspMap, this, logPrinter, nspFilterForGl);
break;
case "GoldLeaf v0.8-0.9":

118
src/main/java/nsusbloader/com/usb/gl/GoldLeaf_111.java
View file

@ -1,118 +0,0 @@
/*
Copyright 2019-2025 Dmitry Isaenko
This file is part of NS-USBloader.
NS-USBloader is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
NS-USBloader is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with NS-USBloader. If not, see <https://www.gnu.org/licenses/>.
*/
package nsusbloader.com.usb.gl;
import nsusbloader.ModelControllers.CancellableRunnable;
import nsusbloader.ModelControllers.ILogPrinter;
import nsusbloader.NSLDataTypes.EMsgType;
import org.usb4java.DeviceHandle;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.*;
import static nsusbloader.com.usb.gl.Converters.*;
/**
* GoldLeaf 1.1.1 processing
*/
public class GoldLeaf_111 extends GoldLeaf_010{
public GoldLeaf_111(DeviceHandle handler, LinkedHashMap<String, File> nspMap,
CancellableRunnable task,
ILogPrinter logPrinter,
boolean nspFilter) {
super(handler, nspMap, task, logPrinter, nspFilter);
}
@Override
protected void printWelcomeMessage(){
print("=========== GoldLeaf v1.1.1 ===========\n\t" +
"VIRT:/ equals files added into the application\n\t" +
"HOME:/ equals " + homePath + "\n\t" +
"BE CAREFUL!\n\t" +
"Due to some strange behaviour with Goldleaf v1.1.1, you will see last menu entry " +
"'Do not click (crashes Atmosphere)'\n\t" +
"You should better not clicking on it", EMsgType.INFO);
}
/**
* Fixes issues with incorrect request for 'Home' & 'Virtual'. Forces both to return 'HOME:/'
* v1.1.1 specific fix
* Otherwise v.1.1.1 returns 'HOME:/' once 'Virtual' requested and ':/' once requested 'Home'
* */
@Override
protected boolean getDriveCount(){
return writeGL_PASS(intToArrLE(3),"GL Handle 'ListDrives' command");
}
@Override
protected boolean getDriveInfo(int driveNo){
if (driveNo < 0 || driveNo > 2)
return writeGL_FAIL(INVALID_INDEX, "GL Handle 'GetDriveInfo' command [no such drive]");
byte[] driveLabel,
driveLabelLen,
driveLetter,
driveLetterLen,
totalFreeSpace;
long totalSizeLong;
switch (driveNo){
case 0:
driveLabel = "Home".getBytes(StandardCharsets.UTF_8); // yes, it's hotfix
driveLabelLen = intToArrLE(driveLabel.length);
driveLetter = "VIRT".getBytes(StandardCharsets.UTF_8); // and this is fine
driveLetterLen = intToArrLE(driveLetter.length);
totalFreeSpace = new byte[4];
totalSizeLong = virtDriveSize;
break;
case 1:
driveLabel = "Virtual".getBytes(StandardCharsets.UTF_8); // here as well
driveLabelLen = intToArrLE(driveLabel.length);
driveLetter = "HOME".getBytes(StandardCharsets.UTF_8); // and here
driveLetterLen = intToArrLE(driveLetter.length);
var userHomeDir = new File(System.getProperty("user.home"));
totalFreeSpace = Arrays.copyOfRange(longToArrLE(userHomeDir.getFreeSpace()), 0, 4);;
totalSizeLong = userHomeDir.getTotalSpace();
break;
default:
driveLabel = "Do not click (crashes Atmosphere)".getBytes(StandardCharsets.UTF_8); // and this one is necessary too
driveLabelLen = intToArrLE(driveLabel.length);
driveLetter = "VIRT".getBytes(StandardCharsets.UTF_8);
driveLetterLen = intToArrLE(driveLetter.length);
totalFreeSpace = new byte[4];
totalSizeLong = virtDriveSize;
break;
}
var totalSize = Arrays.copyOfRange(longToArrLE(totalSizeLong), 0, 4);
var command = Arrays.asList(
driveLabelLen,
driveLabel,
driveLetterLen,
driveLetter,
totalFreeSpace,
totalSize);
return writeGL_PASS(command, "GL Handle 'GetDriveInfo' command");
}
}