1 files changed, 36 insertions, 20 deletions
diff --git a/src/main/java/com/it_jaros/networkScanner/Scanner.java b/src/main/java/com/it_jaros/networkScanner/Scanner.java
index cfef136..b136182 100644
--- a/src/main/java/com/it_jaros/networkScanner/Scanner.java
+++ b/src/main/java/com/it_jaros/networkScanner/Scanner.java
@@ -9,8 +9,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -37,13 +39,22 @@ public class Scanner {
 
     public List<ScanResult> scanTargets(List<String> targets, String ports) {
         List<ScanResult> results = new ArrayList<>();
+        List<Future<ScanResult>> futures = new ArrayList<>();
+        progressBar.start();
         try (ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor();) {
-            progressBar.start();
             for (String target : targets) {
-                ScanResult result = scanTargetPorts(target, ports, executor);
-                results.add(result);
-                progressBar.submit(result.progress());
+                futures.add(executor.submit(() -> {
+                    return scanTargetPorts(target, ports);
+                }));
             }
+
+            futures.forEach((f) -> {
+                try {
+                    results.add(f.get());
+                } catch (InterruptedException | ExecutionException e) {
+                    e.printStackTrace();
+                }
+            });
         }
 
         progressBar.stop();
@@ -51,27 +62,32 @@ public class Scanner {
         return results;
     }
 
-    private ScanResult scanTargetPorts(String target, String ports, ExecutorService executor) {
+    private ScanResult scanTargetPorts(String target, String ports) {
         PortRange portRange = new PortRange(ports);
-        Progress progress = new Progress(target, portRange.getTotal(), new AtomicInteger(),
-                new AtomicInteger());
         AtomicLong scanSlotFactory = new AtomicLong(System.nanoTime());
         Queue<Integer> openPorts = new ConcurrentLinkedQueue<>();
-        while (portRange.hasNext()) {
-            final int currentPort = portRange.next();
-            executor.submit(() -> {
-                try {
-                    waitForSlot(scanSlotFactory);
-                    if (isTargetPortOpen(target, currentPort)) {
-                        openPorts.add(currentPort);
-                        progressBar.onPortOpen(progress);
+
+        Progress progress = new Progress(target, portRange.getTotal(), new AtomicInteger(), new AtomicInteger());
+        progressBar.submit(progress);
+
+        try (ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor();) {
+            while (portRange.hasNext()) {
+                final int currentPort = portRange.next();
+                executor.submit(() -> {
+                    try {
+                        waitForSlot(scanSlotFactory);
+                        if (isTargetPortOpen(target, currentPort)) {
+                            openPorts.add(currentPort);
+                            progress.open().incrementAndGet();
+                        }
+                    } finally {
+                        progress.done().incrementAndGet();
                     }
-                } finally {
-                    progressBar.onPortFinished(progress);
-                }
-            });
+                });
+            }
         }
-        return new ScanResult(target, openPorts, progress);
+
+        return new ScanResult(target, openPorts);
     }
 
     private void waitForSlot(AtomicLong scanSlotFactory) {