Add drag-n-drop for Split'n'merge tab. Fix minor issues.

developersu · Feb 10, 2020 · 2e0d583 · 2e0d583
1 parent 8eb05bb
commit 2e0d583
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 31 deletions.
diff --git a/src/main/java/nsusbloader/Controllers/FrontController.java b/src/main/java/nsusbloader/Controllers/FrontController.java
@@ -292,7 +292,7 @@ private void stopBtnAction(){
      * */
     @FXML
     private void handleDragOver(DragEvent event){
-        if (event.getDragboard().hasFiles())
+        if (event.getDragboard().hasFiles() && ! MediatorControl.getInstance().getTransferActive())
             event.acceptTransferModes(TransferMode.ANY);
         event.consume();
     }
@@ -301,10 +301,6 @@ private void handleDragOver(DragEvent event){
      * */
     @FXML
     private void handleDrop(DragEvent event){
-        if (MediatorControl.getInstance().getTransferActive()) {
-            event.setDropCompleted(true);
-            return;
-        }
         List<File> filesDropped = event.getDragboard().getFiles();
 
         if (getSelectedProtocol().equals("TinFoil") && MediatorControl.getInstance().getContoller().getSettingsCtrlr().getTfXciNszXczSupport())

diff --git a/src/main/java/nsusbloader/Controllers/RcmController.java b/src/main/java/nsusbloader/Controllers/RcmController.java
@@ -231,26 +231,28 @@ private void bntSelectPayloader(ActionEvent event){
         );
 
         File payloadFile = fileChooser.showOpenDialog(payloadFPathLbl1.getScene().getWindow());
-        if (payloadFile != null) {
-            final String fullFileName = payloadFile.getAbsolutePath();
-            final Node btn = (Node)event.getSource();
 
-            switch (btn.getId()){
-                case "selPldBtn1":
-                    setPayloadFile(1, fullFileName);
-                    break;
-                case "selPldBtn2":
-                    setPayloadFile(2, fullFileName);
-                    break;
-                case "selPldBtn3":
-                    setPayloadFile(3, fullFileName);
-                    break;
-                case "selPldBtn4":
-                    setPayloadFile(4, fullFileName);
-                    break;
-                case "selPldBtn5":
-                    setPayloadFile(5, fullFileName);
-            }
+        if (payloadFile == null)
+            return;
+
+        final String fullFileName = payloadFile.getAbsolutePath();
+        final Node btn = (Node)event.getSource();
+
+        switch (btn.getId()){
+            case "selPldBtn1":
+                setPayloadFile(1, fullFileName);
+                break;
+            case "selPldBtn2":
+                setPayloadFile(2, fullFileName);
+                break;
+            case "selPldBtn3":
+                setPayloadFile(3, fullFileName);
+                break;
+            case "selPldBtn4":
+                setPayloadFile(4, fullFileName);
+                break;
+            case "selPldBtn5":
+                setPayloadFile(5, fullFileName);
         }
     }
     @FXML

diff --git a/src/main/java/nsusbloader/Controllers/SplitMergeController.java b/src/main/java/nsusbloader/Controllers/SplitMergeController.java
@@ -3,7 +3,10 @@
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.Node;
 import javafx.scene.control.*;
+import javafx.scene.input.DragEvent;
+import javafx.scene.input.TransferMode;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
@@ -101,7 +104,6 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
                 if (fileFile == null)
                     return;
                 fileFolderActualPathLbl.setText(fileFile.getAbsolutePath());
-                convertBtn.setDisable(false);
             }
             else{
                 DirectoryChooser dc = new DirectoryChooser();
@@ -120,14 +122,14 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
                 if (folderFile == null)
                     return;
                 fileFolderActualPathLbl.setText(folderFile.getAbsolutePath());
-                convertBtn.setDisable(false);
             }
+            convertBtn.setDisable(false);
         });
 
         convertBtn.setOnAction(actionEvent -> setConvertBtnAction());
     }
 
-    public void notifySmThreadStarted(boolean isStart, EModule type){
+    public void notifySmThreadStarted(boolean isStart, EModule type){ // todo: refactor: remove everything, place to separate container and just disable.
         if (! type.equals(EModule.SPLIT_MERGE_TOOL)){
             smToolPane.setDisable(isStart);
             return;
@@ -176,7 +178,10 @@ private void stopBtnAction(){
     private void setConvertBtnAction(){
         statusLbl.setText("");
         if (MediatorControl.getInstance().getTransferActive()) {
-            ServiceWindow.getErrorNotification(resourceBundle.getString("windowTitleError"), resourceBundle.getString("windowBodyPleaseFinishTransfersFirst"));
+            ServiceWindow.getErrorNotification(
+                    resourceBundle.getString("windowTitleError"),
+                    resourceBundle.getString("windowBodyPleaseFinishTransfersFirst")
+            );
             return;
         }
 
@@ -195,6 +200,32 @@ private void setConvertBtnAction(){
         smThread.setDaemon(true);
         smThread.start();
     }
+    /**
+     * Drag-n-drop support (dragOver consumer)
+     * */
+    @FXML
+    private void handleDragOver(DragEvent event){
+        if (event.getDragboard().hasFiles() && ! MediatorControl.getInstance().getTransferActive())
+            event.acceptTransferModes(TransferMode.ANY);
+        event.consume();
+    }
+    /**
+     * Drag-n-drop support (drop consumer)
+     * */
+    @FXML
+    private void handleDrop(DragEvent event) {
+        Node sourceNode = (Node) event.getSource();
+        File fileDrpd = event.getDragboard().getFiles().get(0);
+
+        if (fileDrpd.isDirectory())
+            mergeRad.fire();
+        else
+            splitRad.fire();
+        fileFolderActualPathLbl.setText(fileDrpd.getAbsolutePath());
+        convertBtn.setDisable(false);
+        event.setDropCompleted(true);
+        event.consume();
+    }
     /**
      * Save application settings on exit
      * */

diff --git a/src/main/java/nsusbloader/Utilities/SplitMergeTool.java b/src/main/java/nsusbloader/Utilities/SplitMergeTool.java
@@ -175,15 +175,15 @@ class MergeTask extends Task<Boolean> {
     }
     @Override
     protected Boolean call() {
-        logPrinter.print("Merge file:      "+filePath, EMsgType.INFO);
+        logPrinter.print("Merge file: "+filePath, EMsgType.INFO);
 
         File folder = new File(filePath);
 
         long cnkTotalSize = 0;
 
         File[] chunkFiles = folder.listFiles((file, s) -> s.matches("^[0-9][0-9]$"));
 
-        if (chunkFiles == null){
+        if (chunkFiles == null || chunkFiles.length == 0){
             logPrinter.print("Selected folder doesn't have any chunks. Nothing to do here.", EMsgType.FAIL);
             logPrinter.close();
             return false;

diff --git a/src/main/resources/SplitMergeTab.fxml b/src/main/resources/SplitMergeTab.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox fx:id="smToolPane" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nsusbloader.Controllers.SplitMergeController">
+<VBox fx:id="smToolPane" onDragDropped="#handleDrop" onDragOver="#handleDragOver" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nsusbloader.Controllers.SplitMergeController">
    <VBox spacing="15.0">
       <children>
          <Pane minHeight="-Infinity" prefHeight="10.0" style="-fx-background-color: linear-gradient(from 41px 34px to 50px 50px, reflect,  #00c8fc 40%, transparent  45%);" />