mirrors/ns-usbloader
1
0
Fork 0
mirror of https://github.com/developersu/ns-usbloader.git synced 2025-05-14 07:04:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finish split-merge files backend functionality

Browse source
This commit is contained in:
Dmitry Isaenko 2020-01-24 00:02:47 +03:00
parent d00b914214
commit 98155bc1f8
2 changed files with 190 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/main/java/nsusbloader/Controllers/SplitMergeController.java
View file

@ -1,5 +1,6 @@
package nsusbloader.Controllers;
import javafx.concurrent.Task;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
@ -106,25 +107,52 @@ public class SplitMergeController implements Initializable {
ServiceWindow.getErrorNotification(resourceBundle.getString("windowTitleError"), resourceBundle.getString("windowBodyPleaseFinishTransfersFirst"));
return;
}
MediatorControl.getInstance().setTransferActive(true);
/*
if (splitRad.isSelected()){
SplitMergeTool.splitFile(fileFolderActualPathLbl.getText(), saveToPathLbl.getText());
System.out.println("split");
updateProcess(true);
Task<Void> task = SplitMergeTool.splitFile(fileFolderActualPathLbl.getText(), saveToPathLbl.getText());
task.setOnSucceeded(workerStateEvent -> this.updateProcess(false));
Thread thread = new Thread(task);
thread.setDaemon(true);
thread.start();
}
else{
System.out.println("merge");
SplitMergeTool.mergeFile(fileFolderActualPathLbl.getText(), saveToPathLbl.getText());
updateProcess(true);
Task<Void> task = SplitMergeTool.mergeFile(fileFolderActualPathLbl.getText(), saveToPathLbl.getText());
task.setOnSucceeded(workerStateEvent -> this.updateProcess(false));
Thread thread = new Thread(task);
thread.setDaemon(true);
thread.start();
}
*/
});
}
private void updateProcess(boolean isStart){
if (isStart){
MediatorControl.getInstance().getContoller().logArea.clear();
MediatorControl.getInstance().setTransferActive(true); // TODO: remove & rewrite to interrupt function
convertBtn.setDisable(true);// TODO: remove & rewrite to interrupt function
splitRad.setDisable(true);
mergeRad.setDisable(true);
selectFileFolderBtn.setDisable(true);
changeSaveToBtn.setDisable(true);
return;
}
MediatorControl.getInstance().setTransferActive(false);
convertBtn.setDisable(false);// TODO: remove & rewrite to interrupt function
splitRad.setDisable(false);
mergeRad.setDisable(false);
selectFileFolderBtn.setDisable(false);
changeSaveToBtn.setDisable(false);
}
public void updatePreferencesOnExit(){
if (splitRad.isSelected())
AppPreferences.getInstance().setSplitMergeType(0);
else
AppPreferences.getInstance().setSplitMergeType(1);
AppPreferences.getInstance().setSplitMergeRecent(saveToPathLbl.getText());
}
}