Update NXDT part

developersu · developersu · commit 96e85056dd91 · 2020-07-07T15:02:37.000+03:00
Add NXDT CLI support
Update MessagesConsumer
diff --git a/src/main/java/nsusbloader/COM/INSTask.java b/src/main/java/nsusbloader/COM/INSTask.java
@@ -18,7 +18,7 @@
 */
 package nsusbloader.COM;
 
-public interface ICommunications extends Runnable {
+public interface INSTask extends Runnable {
     void cancel();
     boolean isCancelled();
 }
diff --git a/src/main/java/nsusbloader/COM/NET/NETCommunications.java b/src/main/java/nsusbloader/COM/NET/NETCommunications.java
@@ -18,7 +18,7 @@
 */
 package nsusbloader.COM.NET;
 
-import nsusbloader.COM.ICommunications;
+import nsusbloader.COM.INSTask;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.ModelControllers.Log;
@@ -32,7 +32,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
-public class NETCommunications implements ICommunications { // todo: rewrite
+public class NETCommunications implements INSTask { // todo: rewrite
 
     private ILogPrinter logPrinter;
 
diff --git a/src/main/java/nsusbloader/COM/USB/GoldLeaf_05.java b/src/main/java/nsusbloader/COM/USB/GoldLeaf_05.java
@@ -18,8 +18,7 @@
 */
 package nsusbloader.COM.USB;
 
-import javafx.concurrent.Task;
-import nsusbloader.COM.ICommunications;
+import nsusbloader.COM.INSTask;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -54,7 +53,7 @@ public class GoldLeaf_05 extends TransferModule {
     private RandomAccessFile raf;   // NSP File
     private NSSplitReader nsr;      // It'a also NSP File
 
-    GoldLeaf_05(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter logPrinter){
+    GoldLeaf_05(DeviceHandle handler, LinkedHashMap<String, File> nspMap, INSTask task, ILogPrinter logPrinter){
         super(handler, nspMap, task, logPrinter);
         status = EFileStatus.FAILED;
 
diff --git a/src/main/java/nsusbloader/COM/USB/GoldLeaf_07.java b/src/main/java/nsusbloader/COM/USB/GoldLeaf_07.java
@@ -19,10 +19,9 @@
 package nsusbloader.COM.USB;
 
 import javafx.application.Platform;
-import javafx.concurrent.Task;
 import javafx.stage.FileChooser;
 import nsusbloader.COM.Helpers.NSSplitReader;
-import nsusbloader.COM.ICommunications;
+import nsusbloader.COM.INSTask;
 import nsusbloader.MediatorControl;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -70,7 +69,7 @@ class GoldLeaf_07 extends TransferModule {
     // For using in CMD_SelectFile with SPEC:/ prefix
     private File selectedFile;
 
-    GoldLeaf_07(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter logPrinter, boolean nspFilter){
+    GoldLeaf_07(DeviceHandle handler, LinkedHashMap<String, File> nspMap, INSTask task, ILogPrinter logPrinter, boolean nspFilter){
         super(handler, nspMap, task, logPrinter);
 
         final byte CMD_GetDriveCount       = 0x00;
diff --git a/src/main/java/nsusbloader/COM/USB/GoldLeaf_08.java b/src/main/java/nsusbloader/COM/USB/GoldLeaf_08.java
@@ -19,9 +19,8 @@
 package nsusbloader.COM.USB;
 
 import javafx.application.Platform;
-import javafx.concurrent.Task;
 import javafx.stage.FileChooser;
-import nsusbloader.COM.ICommunications;
+import nsusbloader.COM.INSTask;
 import nsusbloader.MediatorControl;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -70,7 +69,7 @@ class GoldLeaf_08 extends TransferModule {
     // For using in CMD_SelectFile with SPEC:/ prefix
     private File selectedFile;
 
-    GoldLeaf_08(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter logPrinter, boolean nspFilter){
+    GoldLeaf_08(DeviceHandle handler, LinkedHashMap<String, File> nspMap, INSTask task, ILogPrinter logPrinter, boolean nspFilter){
         super(handler, nspMap, task, logPrinter);
 
         final byte CMD_GetDriveCount       = 1;
diff --git a/src/main/java/nsusbloader/COM/USB/TinFoil.java b/src/main/java/nsusbloader/COM/USB/TinFoil.java
@@ -18,8 +18,7 @@
 */
 package nsusbloader.COM.USB;
 
-import javafx.concurrent.Task;
-import nsusbloader.COM.ICommunications;
+import nsusbloader.COM.INSTask;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -49,7 +48,7 @@ class TinFoil extends TransferModule {
     /*  byte[] magic = new byte[4];
         ByteBuffer bb = StandardCharsets.UTF_8.encode("TUC0").rewind().get(magic); // Let's rephrase this 'string' */
 
-    TinFoil(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter logPrinter){
+    TinFoil(DeviceHandle handler, LinkedHashMap<String, File> nspMap, INSTask task, ILogPrinter logPrinter){
         super(handler, nspMap, task, logPrinter);
         logPrinter.print("============= Tinfoil =============", EMsgType.INFO);
 
diff --git a/src/main/java/nsusbloader/COM/USB/TransferModule.java b/src/main/java/nsusbloader/COM/USB/TransferModule.java
@@ -18,8 +18,7 @@
 */
 package nsusbloader.COM.USB;
 
-import javafx.concurrent.Task;
-import nsusbloader.COM.ICommunications;
+import nsusbloader.COM.INSTask;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -34,9 +33,9 @@ public abstract class TransferModule {
     LinkedHashMap<String, File> nspMap;
     ILogPrinter logPrinter;
     DeviceHandle handlerNS;
-    ICommunications task;
+    INSTask task;
 
-    TransferModule(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter printer){
+    TransferModule(DeviceHandle handler, LinkedHashMap<String, File> nspMap, INSTask task, ILogPrinter printer){
         this.handlerNS = handler;
         this.nspMap = nspMap;
         this.task = task;
diff --git a/src/main/java/nsusbloader/COM/USB/UsbCommunications.java b/src/main/java/nsusbloader/COM/USB/UsbCommunications.java
@@ -18,7 +18,7 @@
 */
 package nsusbloader.COM.USB;
 
-import nsusbloader.COM.ICommunications;
+import nsusbloader.COM.INSTask;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.ModelControllers.Log;
 import nsusbloader.NSLDataTypes.EFileStatus;
@@ -31,7 +31,7 @@
 import java.util.*;
 
 // TODO: add filter option to show only NSP files
-public class UsbCommunications implements ICommunications {
+public class UsbCommunications implements INSTask {
 
     private ILogPrinter logPrinter;
     private LinkedHashMap<String, File> nspMap;
diff --git a/src/main/java/nsusbloader/Controllers/FrontController.java b/src/main/java/nsusbloader/Controllers/FrontController.java
@@ -30,7 +30,7 @@
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
 import nsusbloader.AppPreferences;
-import nsusbloader.COM.ICommunications;
+import nsusbloader.COM.INSTask;
 import nsusbloader.COM.NET.NETCommunications;
 import nsusbloader.COM.USB.UsbCommunications;
 import nsusbloader.MediatorControl;
@@ -63,7 +63,7 @@ public class FrontController implements Initializable {
     private String previouslyOpenedPath;
     private Region btnUpStopImage;
     private ResourceBundle resourceBundle;
-    private ICommunications usbNetCommunications;
+    private INSTask usbNetCommunications;
     private Thread workThread;
 
     @Override
diff --git a/src/main/java/nsusbloader/Controllers/NxdtController.java b/src/main/java/nsusbloader/Controllers/NxdtController.java
@@ -18,14 +18,14 @@
 */
 package nsusbloader.Controllers;
 
-import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
 import javafx.stage.DirectoryChooser;
 import nsusbloader.AppPreferences;
+import nsusbloader.COM.INSTask;
 import nsusbloader.MediatorControl;
 import nsusbloader.NSLDataTypes.EModule;
 import nsusbloader.Utilities.nxdumptool.NxdtTask;
@@ -45,7 +45,7 @@ public class NxdtController implements Initializable {
 
     private Region btnDumpStopImage;
 
-    private Task<Boolean> NxdtTask;
+    private INSTask NxdtTask;
     private Thread workThread;
 
     @Override
@@ -84,13 +84,6 @@ private void startDumpProcess(){
             MediatorControl.getInstance().getContoller().logArea.clear();
 
             NxdtTask = new NxdtTask(saveToLocationLbl.getText());
-            NxdtTask.setOnSucceeded(event -> {
-                if (NxdtTask.getValue())
-                    statusLbl.setText(rb.getString("done_txt"));
-                else
-                    statusLbl.setText(rb.getString("failure_txt"));
-            });
-
             workThread = new Thread(NxdtTask);
             workThread.setDaemon(true);
             workThread.start();
@@ -102,7 +95,7 @@ private void startDumpProcess(){
      * */
     private void stopBtnAction(){
         if (workThread != null && workThread.isAlive()){
-            NxdtTask.cancel(false);
+            NxdtTask.cancel();
         }
     }
 
@@ -130,6 +123,12 @@ public void notifyThreadStarted(boolean isActive, EModule type){
         injectPldBtn.getStyleClass().remove("buttonStop");
         injectPldBtn.getStyleClass().add("buttonUp");
     }
+    public void setOneLineStatus(boolean status){
+        if (status)
+            statusLbl.setText(rb.getString("done_txt"));
+        else
+            statusLbl.setText(rb.getString("failure_txt"));
+    }
     /**
      * Save application settings on exit
      * */
diff --git a/src/main/java/nsusbloader/ModelControllers/MessagesConsumer.java b/src/main/java/nsusbloader/ModelControllers/MessagesConsumer.java
@@ -98,9 +98,14 @@ public void handle(long l) {
                 for (String key : statusMap.keySet())
                     tableViewController.setFileStatus(key, statusMap.get(key));
             }
-            //TODO: rewrite
-            if (appModuleType.equals(EModule.RCM)){
-                MediatorControl.getInstance().getContoller().getRcmCtrlr().setOneLineStatus(oneLinerStatus.get());
+
+            switch (appModuleType){
+                case RCM:
+                    MediatorControl.getInstance().getContoller().getRcmCtrlr().setOneLineStatus(oneLinerStatus.get());
+                    break;
+                case NXDT:
+                    MediatorControl.getInstance().getContoller().getNXDTabController().setOneLineStatus(oneLinerStatus.get());
+                    break;
             }
 
             this.stop();
diff --git a/src/main/java/nsusbloader/Utilities/nxdumptool/NxdtTask.java b/src/main/java/nsusbloader/Utilities/nxdumptool/NxdtTask.java
@@ -18,34 +18,36 @@
 */
 package nsusbloader.Utilities.nxdumptool;
 
-import javafx.concurrent.Task;
+import nsusbloader.COM.INSTask;
 import nsusbloader.COM.USB.UsbConnect;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.ModelControllers.Log;
 import nsusbloader.NSLDataTypes.EModule;
 import nsusbloader.NSLDataTypes.EMsgType;
 import org.usb4java.DeviceHandle;
 
-public class NxdtTask extends Task<Boolean> {
+public class NxdtTask implements INSTask {
 
     private ILogPrinter logPrinter;
     private String saveToLocation;
 
+    private volatile boolean cancel;
+
     public NxdtTask(String saveToLocation){
         this.logPrinter = Log.getPrinter(EModule.NXDT);
         this.saveToLocation = saveToLocation;
     }
 
     @Override
-    protected Boolean call() {
+    public void run() {
         logPrinter.print("Save to location: "+ saveToLocation, EMsgType.INFO);
         logPrinter.print("=============== nxdumptool ===============", EMsgType.INFO);
 
         UsbConnect usbConnect = UsbConnect.connectHomebrewMode(logPrinter);
         
         if (! usbConnect.isConnected()){
             logPrinter.close();
-            return false;
+            return;
         }
 
         DeviceHandle handler = usbConnect.getNsHandler();
@@ -55,7 +57,18 @@ protected Boolean call() {
         logPrinter.print(".:: Complete ::.", EMsgType.PASS);
 
         usbConnect.close();
+        logPrinter.updateOneLinerStatus(true);
         logPrinter.close();
-        return true;
+        return;
+    }
+
+    @Override
+    public void cancel() {
+        cancel = true;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
     }
 }
diff --git a/src/main/java/nsusbloader/Utilities/nxdumptool/NxdtUsbAbi1.java b/src/main/java/nsusbloader/Utilities/nxdumptool/NxdtUsbAbi1.java
@@ -18,7 +18,7 @@
 */
 package nsusbloader.Utilities.nxdumptool;
 
-import javafx.concurrent.Task;
+import nsusbloader.COM.INSTask;
 import nsusbloader.COM.USB.UsbErrorCodes;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -35,7 +35,7 @@
 class NxdtUsbAbi1 {
     private ILogPrinter logPrinter;
     private DeviceHandle handlerNS;
-    private Task<Boolean> task;
+    private INSTask task;
     private String saveToPath;
 
     private boolean isWindows;
@@ -79,7 +79,7 @@ class NxdtUsbAbi1 {
                                                     0x00, 0x00, 0x00, 0x00 };
 
     public NxdtUsbAbi1(DeviceHandle handler,
-                       Task<Boolean> task,
+                       INSTask task,
                        ILogPrinter logPrinter,
                        String saveToPath
     ){
diff --git a/src/main/java/nsusbloader/cli/CommandLineInterface.java b/src/main/java/nsusbloader/cli/CommandLineInterface.java
@@ -57,19 +57,27 @@ public CommandLineInterface(String[] args) {
                 return;
             }
             if (cli.hasOption("n") || cli.hasOption("tfn")){
-                final String[] tfnArguments = cli.getOptionValues("tfn");
-                new TinfoilNet(tfnArguments);
+                final String[] arguments = cli.getOptionValues("tfn");
+                new TinfoilNet(arguments);
                 return;
             }
             if (cli.hasOption("t") || cli.hasOption("tinfoil")){
-                final String[] tfArguments = cli.getOptionValues("tinfoil");
-                new TinfoilUsb(tfArguments);
+                final String[] arguments = cli.getOptionValues("tinfoil");
+                new TinfoilUsb(arguments);
                 return;
             }
             if (cli.hasOption("g") || cli.hasOption("goldleaf")){
-                final String[] glArguments = cli.getOptionValues("goldleaf");
-                new GoldLeaf(glArguments);
+                final String[] arguments = cli.getOptionValues("goldleaf");
+                new GoldLeaf(arguments);
+                return;
+            }
+            /*
+            if (cli.hasOption("x") || cli.hasOption("nxdt")){
+                final String[] arguments = cli.getOptionValues("nxdt");
+                new NXDT(arguments);
+                return;
             }
+            */
         }
         catch (ParseException pe){
             System.out.println(pe.getLocalizedMessage() +
@@ -139,6 +147,15 @@ private Options createCliOptions(){
                 .hasArgs()
                 .argName("...")
                 .build();
+        /* nxdumptool */
+        /*
+        final Option nxdtOption = Option.builder("x")
+                .longOpt("nxdt")
+                .desc("Handle nxdumptool connections.")
+                .hasArg()
+                .argName("DIRECTORY")
+                .build();
+         */
 
         final OptionGroup group = new OptionGroup();
         group.addOption(rcmOption);
@@ -148,6 +165,7 @@ private Options createCliOptions(){
         group.addOption(helpOption);
         group.addOption(tinfoilOption);
         group.addOption(glOption);
+        //group.addOption(nxdtOption);
 
         options.addOptionGroup(group);
 
diff --git a/src/main/java/nsusbloader/cli/GoldLeaf.java b/src/main/java/nsusbloader/cli/GoldLeaf.java
diff --git a/src/main/java/nsusbloader/cli/IncorrectSetupException.java b/src/main/java/nsusbloader/cli/IncorrectSetupException.java
diff --git a/src/main/java/nsusbloader/cli/NXDT.java b/src/main/java/nsusbloader/cli/NXDT.java
diff --git a/src/main/java/nsusbloader/cli/TinfoilUsb.java b/src/main/java/nsusbloader/cli/TinfoilUsb.java

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`package nsusbloader.COM;`
`20`	`20`
`21`		`-public interface ICommunications extends Runnable {`
	`21`	`+public interface INSTask extends Runnable {`
`22`	`22`	`void cancel();`
`23`	`23`	`boolean isCancelled();`
`24`	`24`	`}`