mirrors/ns-usbloader
1
0
Fork 0
mirror of https://github.com/developersu/ns-usbloader.git synced 2025-06-03 08:38:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Solve - #87. Break LogPrinterGui

Browse source
This commit is contained in:
Dmitry Isaenko 2021-08-09 22:47:52 +03:00
parent 79c519b1f3
commit 1176ad9e83
32 changed files with 1348 additions and 738 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/nsusbloader/Utilities/nxdumptool/NxdtTask.java
View file

@ -38,8 +38,8 @@ public class NxdtTask extends CancellableRunnable {
@Override
public void run() {
logPrinter.print("Save to location: "+ saveToLocation, EMsgType.INFO);
logPrinter.print("=============== nxdumptool ===============", EMsgType.INFO);
print("Save to location: "+ saveToLocation, EMsgType.INFO);
print("=============== nxdumptool ===============", EMsgType.INFO);
UsbConnect usbConnect = UsbConnect.connectHomebrewMode(logPrinter);
@ -54,13 +54,22 @@ public class NxdtTask extends CancellableRunnable {
new NxdtUsbAbi1(handler, logPrinter, saveToLocation, this);
}
catch (Exception e){
logPrinter.print(e.getMessage(), EMsgType.FAIL);
print(e.getMessage(), EMsgType.FAIL);
}
logPrinter.print(".:: Complete ::.", EMsgType.PASS);
print(".:: Complete ::.", EMsgType.PASS);
usbConnect.close();
logPrinter.updateOneLinerStatus(true);
logPrinter.close();
}
private void print(String message, EMsgType type){
try {
logPrinter.print(message, type);
}
catch (InterruptedException ie){
ie.printStackTrace();
}
}
}

4
src/main/java/nsusbloader/Utilities/nxdumptool/NxdtUsbAbi1.java
View file

@ -119,7 +119,7 @@ class NxdtUsbAbi1 {
USBSTATUS_SUCCESS[9] = (byte)((endpointMaxPacketSize >> 8) & 0xFF);
}
private void readLoop(){
private void readLoop() throws InterruptedException{
logPrinter.print("Awaiting for handshake", EMsgType.INFO);
try {
byte[] directive;
@ -292,7 +292,7 @@ class NxdtUsbAbi1 {
return nspFile != null;
}
private String getAbsoluteFilePath(String filename) throws Exception{
private String getAbsoluteFilePath(String filename) {
if (isRomFs(filename) && isWindows) // Since RomFS entry starts from '/' it should be replaced to '\'.
return saveToPath + filename.replaceAll("/", "\\\\");
return saveToPath + filename;