Refactoring:

* Replace UI-friendly Tasks to Runnable in all TF/GL NET/USB processes; implement similar interface for this.
* Add Apache Commons CLI to handle CLI.
* Extend/update CLI commands keys/functions, descriptions etc.
* Add draft CLI command for Tinfoil/Awoo Net-install mode.

Author: developersu

README.md

@@ -30,6 +30,7 @@ Sometimes I add new posts about this project [on my home page](https://developer
 * [usb4java](https://mvnrepository.com/artifact/org.usb4java/usb4java)
 * Few icons taken from: [materialdesignicons.com](http://materialdesignicons.com/)
 * Information, ideas and data from ['fusee-launcher'](https://github.com/reswitched/fusee-launcher) application
+* [Apache Commons CLI](https://commons.apache.org/proper/commons-cli/)
 
 #### List of awesome contributors!
 
@@ -203,4 +204,4 @@ Want to support development? Make a donation* (see below):
 
 Thanks
 
-Appreciate assistance and support of both [Vitaliy](https://github.com/SebastianUA) and [Konstantin](https://github.com/konstantin-kelemen). Without you all this magic would not have happened.
+Appreciate assistance and support of both [Vitaliy](https://github.com/SebastianUA) and [Konstantin](https://github.com/konstantin-kelemen). Without you all this magic would not have happened.

pom.xml

@@ -50,6 +50,13 @@
     </issueManagement>
     <!-- openJFX Linux -->
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.4</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>

src/main/java/nsusbloader/COM/ICommunications.java

@@ -0,0 +1,24 @@
+/*
+    Copyright 2019-2020 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;
+
+public interface ICommunications extends Runnable {
+    void cancel();
+    boolean isCancelled();
+}

src/main/java/nsusbloader/COM/NET/NETCommunications.java

@@ -18,7 +18,7 @@
 */
 package nsusbloader.COM.NET;
 
-import javafx.concurrent.Task;
+import nsusbloader.COM.ICommunications;
 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 extends Task<Void> { // todo: thows IOException?
+public class NETCommunications implements ICommunications { // todo: rewrite
 
     private ILogPrinter logPrinter;
 
@@ -52,10 +52,17 @@ public class NETCommunications extends Task<Void> { // todo: thows IOException?
 
     private OutputStream currSockOS;
     private PrintWriter currSockPW;
+
+    private volatile boolean cancel;
     /**
      * Simple constructor that everybody uses
      * */
-    public NETCommunications(List<File> filesList, String switchIP, boolean doNotServeRequests, String hostIPaddr, String hostPortNum, String extras){
+    public NETCommunications(List<File> filesList,
+                             String switchIP,
+                             boolean doNotServeRequests,
+                             String hostIPaddr,
+                             String hostPortNum,
+                             String extras) {
         this.doNotServeRequests = doNotServeRequests;
         if (doNotServeRequests)
             this.extras = extras;
@@ -263,19 +270,21 @@ private void showAvalIpExamples(){
             logPrinter.print("Can't determine possible variants. Returned:\n\t"+socketException.getMessage(), EMsgType.FAIL);
         }
     }
-    /**
-     * Override cancel block to close connection by ourselves
-     * */
     @Override
-    protected void cancelled() {
-        this.close(EFileStatus.UNKNOWN);
-        super.cancelled();
+    public boolean isCancelled(){
+        return cancel;
+    }
+
+    @Override
+    public void cancel() {
+        cancel = true;
     }
 
     @Override
-    protected Void call() {
+    public void run() {
+
         if (!isValid | isCancelled())
-            return null;
+            return;
         logPrinter.print("\tStart chain", EMsgType.INFO);
         // Create string that we'll send to TF and which initiates chain 
         StringBuilder myStrBuilder;
@@ -307,13 +316,13 @@ protected Void call() {
         catch (IOException uhe){
             logPrinter.print("NET: Unable to connect to NS and send files list. Returned:\n\t"+uhe.getMessage(), EMsgType.FAIL);
             close(EFileStatus.UNKNOWN);
-            return null;
+            return;
         }
         // Check if we should serve requests
         if (this.doNotServeRequests){
             logPrinter.print("NET: List of files transferred. Replies won't be served.", EMsgType.PASS);
             close(EFileStatus.UNKNOWN);
-            return null;
+            return;
         }
         logPrinter.print("NET: Initiation files list has been sent to NS.", EMsgType.PASS);
 
@@ -353,7 +362,7 @@ protected Void call() {
         }
         if ( ! isCancelled() )
             close(EFileStatus.UNKNOWN);
-        return null;
+        return;
     }
 
     // 200 206 400 (inv range) 404 416 (Range Not Satisfiable )

src/main/java/nsusbloader/COM/USB/GoldLeaf.java

@@ -21,6 +21,7 @@
 import javafx.application.Platform;
 import javafx.concurrent.Task;
 import javafx.stage.FileChooser;
+import nsusbloader.COM.ICommunications;
 import nsusbloader.MediatorControl;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -69,7 +70,7 @@ class GoldLeaf extends TransferModule {
     // For using in CMD_SelectFile with SPEC:/ prefix
     private File selectedFile;
 
-    GoldLeaf(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> task, ILogPrinter logPrinter, boolean nspFilter){
+    GoldLeaf(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter logPrinter, boolean nspFilter){
         super(handler, nspMap, task, logPrinter);
 
         final byte CMD_GetDriveCount       = 1;

src/main/java/nsusbloader/COM/USB/GoldLeaf_05.java

@@ -19,6 +19,7 @@
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
+import nsusbloader.COM.ICommunications;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -53,7 +54,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, Task<Void> task, ILogPrinter logPrinter){
+    GoldLeaf_05(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter logPrinter){
         super(handler, nspMap, task, logPrinter);
         status = EFileStatus.FAILED;
 

src/main/java/nsusbloader/COM/USB/GoldLeaf_07.java

@@ -22,6 +22,7 @@
 import javafx.concurrent.Task;
 import javafx.stage.FileChooser;
 import nsusbloader.COM.Helpers.NSSplitReader;
+import nsusbloader.COM.ICommunications;
 import nsusbloader.MediatorControl;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -69,7 +70,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, Task<Void> task, ILogPrinter logPrinter, boolean nspFilter){
+    GoldLeaf_07(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter logPrinter, boolean nspFilter){
         super(handler, nspMap, task, logPrinter);
 
         final byte CMD_GetDriveCount       = 0x00;

src/main/java/nsusbloader/COM/USB/TinFoil.java

@@ -19,6 +19,7 @@
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
+import nsusbloader.COM.ICommunications;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -48,7 +49,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, Task<Void> task, ILogPrinter logPrinter){
+    TinFoil(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter logPrinter){
         super(handler, nspMap, task, logPrinter);
         logPrinter.print("============= Tinfoil =============", EMsgType.INFO);
 

src/main/java/nsusbloader/COM/USB/TransferModule.java

@@ -19,6 +19,7 @@
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
+import nsusbloader.COM.ICommunications;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -33,9 +34,9 @@ public abstract class TransferModule {
     LinkedHashMap<String, File> nspMap;
     ILogPrinter logPrinter;
     DeviceHandle handlerNS;
-    Task<Void> task;
+    ICommunications task;
 
-    TransferModule(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> task, ILogPrinter printer){
+    TransferModule(DeviceHandle handler, LinkedHashMap<String, File> nspMap, ICommunications task, ILogPrinter printer){
         this.handlerNS = handler;
         this.nspMap = nspMap;
         this.task = task;

src/main/java/nsusbloader/COM/USB/UsbCommunications.java

@@ -19,6 +19,7 @@
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
+import nsusbloader.COM.ICommunications;
 import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.ModelControllers.Log;
 import nsusbloader.NSLDataTypes.EFileStatus;
@@ -31,13 +32,15 @@
 import java.util.*;
 
 // TODO: add filter option to show only NSP files
-public class UsbCommunications extends Task<Void> {
+public class UsbCommunications implements ICommunications {
 
     private ILogPrinter logPrinter;
     private LinkedHashMap<String, File> nspMap;
     private String protocol;
     private boolean nspFilterForGl;
 
+    private volatile boolean cancel;
+
     public UsbCommunications(List<File> nspList, String protocol, boolean filterNspFilesOnlyForGl){
         this.protocol = protocol;
         this.nspFilterForGl = filterNspFilesOnlyForGl;
@@ -48,14 +51,14 @@ public UsbCommunications(List<File> nspList, String protocol, boolean filterNspF
     }
 
     @Override
-    protected Void call() {
+    public void run() {
         logPrinter.print("\tStart", EMsgType.INFO);
 
         UsbConnect usbConnect = UsbConnect.connectHomebrewMode(logPrinter);
 
         if (! usbConnect.isConnected()){
             close(EFileStatus.FAILED);
-            return null;
+            return;
         }
 
         DeviceHandle handler = usbConnect.getNsHandler();
@@ -81,7 +84,7 @@ protected Void call() {
 
         close(module.getStatus());
 
-        return null;
+        return;
     }
 
     /**
@@ -93,4 +96,13 @@ private void close(EFileStatus status){
         logPrinter.close();
     }
 
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void cancel() {
+        cancel = true;
+    }
 }