v1.13

StupidRepo · Jul 17, 2023 · d601a03 · d601a03
1 parent 318126c
commit d601a03
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Changes
 All notable changes to this project will be documented in `CHANGELOG.md`.
 ## Added
-* A menu that allows for configuring the MongoDB URI.
-<img alt="MongoDB menu screen thingy" height="50%" src="images/1_12-mongomenu.png" width="50%"/>
+Nothing has been added.
 
 ## Modified
-* Fixed an IllegalStateException (`IllegalStateException: state should be: open`) stopping servers from being saved to the database.
+* Fixed the percentage going over 100%
+* Changed thread code a little bit
+* Added a "Hits" counter for successfully scanned servers
 
 ## Removed
-* Removed a few unnecessary comments and debug outputs.
+Nothing has been removed.
diff --git a/src/com/stupidrepo/mcscanner/MCScanner.java b/src/com/stupidrepo/mcscanner/MCScanner.java
@@ -136,9 +136,16 @@ public static void main(String[] var0) {
         scannedLabel.setHorizontalAlignment(0);
 
         frame.add(scannedLabel, "Center");
-        frame.setVisible(true);
 
         long scanned = 0;
+        long hits = 0;
+
+        JLabel hitsLabel = new JLabel("Hits: 0/0");
+        hitsLabel.setHorizontalAlignment(0);
+
+        frame.add(hitsLabel, "South");
+
+        frame.setVisible(true);
 
         // TODO: Make this whole thing more efficient, and less ugly.
         for (int i = minimumRange; i <= maxRange; ++i) {
@@ -147,7 +154,8 @@ public static void main(String[] var0) {
                     for (int l = 0; l <= 255; ++l) {
                         String ip = i + "." + j + "." + k + "." + l;
 
-                        Thread scanThread = new Thread(new ScannerThread(ip, port, timeout, databaseHandler));
+                        ScannerThread scannerThread = new ScannerThread(ip, port, timeout, databaseHandler);
+                        Thread scanThread = new Thread(scannerThread);
                         threadList.add(scanThread);
                         scanThread.start();
 
@@ -156,8 +164,12 @@ public static void main(String[] var0) {
                                 try {
                                     nextThread.join();
                                     ++scanned;
+                                    if(scannerThread.didHit) {
+                                        ++hits;
+                                    }
                                     // progressBar.setValue(scanned);
-                                    scannedLabel.setText("Scanned: " + scanned + "/" + progressThing * 256 + " (" + Math.round((scanned / progressThing * 256) * 100) / 100 + "%)");
+                                    hitsLabel.setText("Hits: " + hits + "/" + scanned);
+                                    scannedLabel.setText("Scanned: " + scanned + "/" + progressThing * 256 + " (" + Math.round((scanned / (progressThing * 256)) * 100) / 100 + "%)");
                                 } catch (InterruptedException timeout2) {
                                     // eh
                                 }
@@ -174,6 +186,7 @@ public static void main(String[] var0) {
                 nextThreadAgain.join();
                 ++scanned;
                 // progressBar.setValue(scanned);
+                hitsLabel.setText("Hits: " + hits + "/" + scanned);
                 scannedLabel.setText("Scanned: " + scanned + "/" + progressThing * 256);
             } catch (InterruptedException timeout1) {
                 // well
@@ -192,6 +205,8 @@ class ScannerThread implements Runnable {
     private final int timeout;
     private final DatabaseHandler dbHandler;
 
+    public boolean didHit = false;
+
     public ScannerThread(String ip, int port, int timeout, DatabaseHandler dbHandler) {
         this.ip = ip;
         this.port = port;
@@ -267,6 +282,8 @@ public void run() {
             }
 
             socket.close();
+
+            didHit = true;
         } catch (IOException var8) {
             // No response/invalid response/timeout/port accidentally left open
         }