1 files changed, 28 insertions, 26 deletions

diff --git a/src/main/java/com/it_jaros/jscanner/Scan.java b/src/main/java/com/it_jaros/jscanner/Scan.java
index bdc3f3a..e0fec32 100644
--- a/src/main/java/com/it_jaros/jscanner/Scan.java
+++ b/src/main/java/com/it_jaros/jscanner/Scan.java
@@ -12,27 +12,27 @@ import java.util.stream.Stream;
  * Object holder for stateful volatile data during scan
  */
 public class Scan {
+    private final Counter hostCounter;
+    private final Counter hostTotalCounter;
+    private final Counter socketCounter;
+    private final Counter threadCounter;
     private final Stream<String> hosts;
     private final String ports;
-    private final Counter counter;
-    private final ProgressBar progressBar;
 
-    private Scan(Stream<String> hosts, String ports, boolean quiet) {
+    private Scan(Stream<String> hosts, String ports) {
         this.hosts = hosts;
         this.ports = ports;
-        this.counter = new Counter();
-        this.progressBar = new ProgressBar(quiet);
-    }
-
-    public int getPeakConcurrentConnects() {
-        return counter.max();
+        this.hostCounter = new Counter();
+        this.socketCounter = new Counter();
+        this.threadCounter = new Counter();
+        this.hostTotalCounter = new Counter();
     }
 
     public static Scan create(ScanOptions options) throws IOException {
         if (options.hostsFile() != null) {
-            return create(options.hostsFile(), options.ports(), options.quiet());
+            return create(options.hostsFile(), options.ports());
         }
-        return create(options.hostsArgv(), options.ports(), options.quiet());
+        return create(options.hostsArgv(), options.ports());
     }
 
     /**
@@ -40,11 +40,10 @@ public class Scan {
      *
      * @param sourceFile
      * @param ports
-     * @param quiet
      * @return
      * @throws IOException
      */
-    public static Scan create(String sourceFile, String ports, boolean quiet) throws IOException {
+    public static Scan create(String sourceFile, String ports) throws IOException {
         Stream<String> hosts;
         if ("-".equals(sourceFile)) {
             BufferedReader stdinReader = new BufferedReader(new InputStreamReader(System.in));
@@ -60,15 +59,15 @@ public class Scan {
             });
         }
 
-        return create(hosts, ports, quiet);
+        return create(hosts, ports);
     }
 
-    private static Scan create(Stream<String> lines, String ports, boolean quiet) {
-        return new Scan(lines, ports, quiet);
+    private static Scan create(Stream<String> lines, String ports) {
+        return new Scan(lines, ports);
     }
 
-    public static Scan create(List<String> hostsArgv, String ports, boolean quiet) {
-        return new Scan(hostsArgv.stream(), ports, quiet);
+    public static Scan create(List<String> hostsArgv, String ports) {
+        return new Scan(hostsArgv.stream(), ports);
     }
 
     public Stream<String> getHosts() {
@@ -80,23 +79,26 @@ public class Scan {
     }
 
     public void start() {
-        progressBar.start();
+        // start
     }
 
     public void stop() {
-        progressBar.stop();
         hosts.close(); // close stream
     }
 
-    public void addHostProgress(Progress progress) {
-        progressBar.add(progress);
+    public Counter getThreadCounter() {
+        return threadCounter;
+    }
+
+    public Counter getHostCounter() {
+        return hostCounter;
     }
 
-    public void incSocketCounter() {
-        counter.inc();
+    public Counter getSocketCounter() {
+        return socketCounter;
     }
 
-    public void decSocketCounter() {
-        counter.dec();
+    public Counter getHostTotalCounter() {
+        return hostTotalCounter;
     }
 }