Refactor some old UI-related code. Rewrite LogPrinter to handle commandline. Add RCM-payload module into CLI interface: now it could be executed on system without graphical environment (x86/amd64 only).

E.g.: java -jar app.jar --rcm payload.bin

Author: developersu

pom.xml

@@ -8,7 +8,7 @@
     <name>NS-USBloader</name>
 
     <artifactId>ns-usbloader</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>4.0-SNAPSHOT</version>
 
     <url>https://github.com/developersu/ns-usbloader/</url>
     <description>

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

@@ -19,8 +19,9 @@
 package nsusbloader.COM.NET;
 
 import javafx.concurrent.Task;
+import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
-import nsusbloader.ModelControllers.LogPrinter;
+import nsusbloader.ModelControllers.Log;
 import nsusbloader.NSLDataTypes.EModule;
 import nsusbloader.NSLDataTypes.EMsgType;
 import nsusbloader.COM.Helpers.NSSplitReader;
@@ -33,7 +34,7 @@
 
 public class NETCommunications extends Task<Void> { // todo: thows IOException?
 
-    private LogPrinter logPrinter;
+    private ILogPrinter logPrinter;
 
     private String hostIP;
     private int hostPort;
@@ -61,7 +62,7 @@ public NETCommunications(List<File> filesList, String switchIP, boolean doNotSer
         else
             this.extras = "";
         this.switchIP = switchIP;
-        this.logPrinter = new LogPrinter(EModule.USB_NET_TRANSFERS);
+        this.logPrinter = Log.getPrinter(EModule.USB_NET_TRANSFERS);
         this.nspMap = new HashMap<>();
         this.nspFileSizes = new HashMap<>();
         // Filter and remove empty/incorrect split-files

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

@@ -22,7 +22,7 @@
 import javafx.concurrent.Task;
 import javafx.stage.FileChooser;
 import nsusbloader.MediatorControl;
-import nsusbloader.ModelControllers.LogPrinter;
+import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EMsgType;
 import nsusbloader.COM.Helpers.NSSplitReader;
 import org.usb4java.DeviceHandle;
@@ -69,7 +69,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, LogPrinter logPrinter, boolean nspFilter){
+    GoldLeaf(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> 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,7 +19,7 @@
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
-import nsusbloader.ModelControllers.LogPrinter;
+import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EMsgType;
 import nsusbloader.COM.Helpers.NSSplitReader;
@@ -53,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, Task<Void> task, LogPrinter logPrinter){
+    GoldLeaf_05(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> task, ILogPrinter logPrinter){
         super(handler, nspMap, task, logPrinter);
         status = EFileStatus.FAILED;
 

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

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

src/main/java/nsusbloader/COM/USB/PFS/PFSProvider.java

@@ -18,7 +18,7 @@
 */
 package nsusbloader.COM.USB.PFS;
 
-import nsusbloader.ModelControllers.LogPrinter;
+import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EMsgType;
 
 import java.io.*;
@@ -38,7 +38,7 @@ public class PFSProvider {
     private long bodySize;
     private int ticketID = -1;
 
-    public PFSProvider(File nspFile, LogPrinter logPrinter) throws Exception{
+    public PFSProvider(File nspFile, ILogPrinter logPrinter) throws Exception{
         if (nspFile.isDirectory()) {
             nspFileName = nspFile.getName();
             nspFile = new File(nspFile.getAbsolutePath() + File.separator + "00");

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

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

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

@@ -19,7 +19,7 @@
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
-import nsusbloader.ModelControllers.LogPrinter;
+import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EMsgType;
 import org.usb4java.DeviceHandle;
@@ -31,11 +31,11 @@ public abstract class TransferModule {
     EFileStatus status = EFileStatus.UNKNOWN;
 
     LinkedHashMap<String, File> nspMap;
-    LogPrinter logPrinter;
+    ILogPrinter logPrinter;
     DeviceHandle handlerNS;
     Task<Void> task;
 
-    TransferModule(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> task, LogPrinter printer){
+    TransferModule(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> task, ILogPrinter printer){
         this.handlerNS = handler;
         this.nspMap = nspMap;
         this.task = task;

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

@@ -19,7 +19,8 @@
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
-import nsusbloader.ModelControllers.LogPrinter;
+import nsusbloader.ModelControllers.ILogPrinter;
+import nsusbloader.ModelControllers.Log;
 import nsusbloader.NSLDataTypes.EFileStatus;
 import nsusbloader.NSLDataTypes.EModule;
 import nsusbloader.NSLDataTypes.EMsgType;
@@ -32,7 +33,7 @@
 // TODO: add filter option to show only NSP files
 public class UsbCommunications extends Task<Void> {
 
-    private LogPrinter logPrinter;
+    private ILogPrinter logPrinter;
     private LinkedHashMap<String, File> nspMap;
     private String protocol;
     private boolean nspFilterForGl;
@@ -43,7 +44,7 @@ public UsbCommunications(List<File> nspList, String protocol, boolean filterNspF
         this.nspMap = new LinkedHashMap<>();
         for (File f: nspList)
             nspMap.put(f.getName(), f);
-        this.logPrinter = new LogPrinter(EModule.USB_NET_TRANSFERS);
+        this.logPrinter = Log.getPrinter(EModule.USB_NET_TRANSFERS);
     }
 
     @Override

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

@@ -18,7 +18,7 @@
 */
 package nsusbloader.COM.USB;
 
-import nsusbloader.ModelControllers.LogPrinter;
+import nsusbloader.ModelControllers.ILogPrinter;
 import nsusbloader.NSLDataTypes.EMsgType;
 import org.usb4java.*;
 
@@ -39,7 +39,7 @@ public class UsbConnect {
     private DeviceHandle handlerNS;
     private Device deviceNS;
 
-    private LogPrinter logPrinter;
+    private ILogPrinter logPrinter;
 
     private boolean connected; // TODO: replace to 'connectionFailure' and invert requests everywhere
 
@@ -49,7 +49,7 @@ public class UsbConnect {
     private int returningValue;
     private DeviceList deviceList;
 
-    public static UsbConnect connectRcmMode(LogPrinter logPrinter){
+    public static UsbConnect connectRcmMode(ILogPrinter logPrinter){
         UsbConnect usbConnect = new UsbConnect(logPrinter);
         usbConnect.VENDOR_ID = RCM_VID;
         usbConnect.PRODUCT_ID = RCM_PID;
@@ -71,7 +71,7 @@ public static UsbConnect connectRcmMode(LogPrinter logPrinter){
 
         return usbConnect;
     }
-    public static UsbConnect connectHomebrewMode(LogPrinter logPrinter){
+    public static UsbConnect connectHomebrewMode(ILogPrinter logPrinter){
         UsbConnect usbConnect = new UsbConnect(logPrinter);
         usbConnect.VENDOR_ID = HOMEBREW_VID;
         usbConnect.PRODUCT_ID = HOMEBREW_PID;
@@ -96,7 +96,7 @@ public static UsbConnect connectHomebrewMode(LogPrinter logPrinter){
 
     private UsbConnect(){}
 
-    private UsbConnect(LogPrinter logPrinter){
+    private UsbConnect(ILogPrinter logPrinter){
         this.logPrinter = logPrinter;
         this.connected = false;
     };