Refactored port scan method and fixed open ports indicator

1 files changed, 11 insertions, 6 deletions

diff --git a/src/main/java/com/it_jaros/networkScanner/ProgressBar.java b/src/main/java/com/it_jaros/networkScanner/ProgressBar.java
index 7de3b18..409668a 100644
--- a/src/main/java/com/it_jaros/networkScanner/ProgressBar.java
+++ b/src/main/java/com/it_jaros/networkScanner/ProgressBar.java
@@ -32,20 +32,21 @@ public class ProgressBar {
     private void drawBar(Progress progress) {
         System.out.print("\u001b[2K\r");
         System.out.println(createBar(
-                progress.host() + " open=" + progress.open().get(),
+                progress.host(),
+                progress.open().get(),
                 progress.done().get(),
                 progress.total()));
     }
 
-    public String createBar(String label, int done, int total) {
+    public String createBar(String label, int open, int done, int total) {
         int width = 30;
         double pct = total == 0 ? 1.0 : (done / (double) total);
         int filled = (int) (pct * width);
 
-        String b = "[" + "#".repeat(filled) + "-".repeat(width - filled) + "]";
+        String brackets = "[" + "#".repeat(filled) + "-".repeat(width - filled) + "]";
         int percent = (int) (pct * 100);
 
-        return String.format("%-25s %s %3d%% (%d/%d)", label, b, percent, done, total);
+        return String.format("%-40s open=%s %s %3d%% (%d/%d)", label, open, brackets, percent, done, total);
     }
 
     public void stop() {
@@ -58,7 +59,11 @@ public class ProgressBar {
         }
     }
 
-    void onPortFinished(Progress p) {
-        p.done().incrementAndGet();
+    void onPortFinished(Progress progress) {
+        progress.done().incrementAndGet();
+    }
+
+    public void onPortOpen(Progress progress) {
+        progress.open().incrementAndGet();
     }
 }