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

Solve - #87. Break LogPrinterGui

Browse source
This commit is contained in:
Dmitry Isaenko 2021-08-09 22:47:52 +03:00
parent 79c519b1f3
commit 1176ad9e83
32 changed files with 1348 additions and 738 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/nsusbloader/cli/MergeCli.java
View file

@ -18,8 +18,7 @@
*/
package nsusbloader.cli;
import nsusbloader.Utilities.splitmerge.MergeTask;
import nsusbloader.Utilities.splitmerge.SplitTask;
import nsusbloader.Utilities.splitmerge.SplitMergeTaskExecutor;
import java.io.File;
import java.util.ArrayList;
@ -27,7 +26,7 @@ import java.util.List;
public class MergeCli {
private String[] arguments;
private final String[] arguments;
private String saveTo;
private String[] splitFiles;
@ -97,12 +96,20 @@ public class MergeCli {
}
private void runBackend() throws InterruptedException{
for (String filePath : splitFiles){
Runnable mergeTask = new MergeTask(filePath, saveTo);
Thread thread = new Thread(mergeTask);
thread.setDaemon(true);
thread.start();
thread.join();
Runnable mergeTask = new SplitMergeTaskExecutor(
false,
getFilesFromStrings(),
saveTo);
Thread thread = new Thread(mergeTask);
thread.setDaemon(true);
thread.start();
thread.join();
}
private List<File> getFilesFromStrings(){
ArrayList<File> realFiles = new ArrayList<>();
for (String splitFileString : splitFiles){
realFiles.add(new File(splitFileString));
}
return realFiles;
}
}

28
src/main/java/nsusbloader/cli/SplitCli.java
View file

@ -18,16 +18,14 @@
*/
package nsusbloader.cli;
import nsusbloader.Utilities.splitmerge.SplitTask;
import nsusbloader.Utilities.splitmerge.SplitMergeTaskExecutor;
import java.io.File;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
public class SplitCli {
private String[] arguments;
private final String[] arguments;
private String saveTo;
private String[] files;
@ -95,12 +93,20 @@ public class SplitCli {
}
private void runBackend() throws InterruptedException{
for (String filePath : files){
Runnable splitTaks = new SplitTask(filePath, saveTo);
Thread thread = new Thread(splitTaks);
thread.setDaemon(true);
thread.start();
thread.join();
Runnable splitTasks = new SplitMergeTaskExecutor(
true,
getFilesFromStrings(),
saveTo);
Thread thread = new Thread(splitTasks);
thread.setDaemon(true);
thread.start();
thread.join();
}
private List<File> getFilesFromStrings(){
ArrayList<File> realFiles = new ArrayList<>();
for (String fileString : files){
realFiles.add(new File(fileString));
}
return realFiles;
}
}