Merge pull request #2 from ThomasByr/v1

v1 release 2
ThomasByr · Nov 27, 2023 · 5a294fe · 5a294fe
2 parents 65ed23c + 5202a72
commit 5a294fe
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 <summary>The full history, or so was I told...</summary>
+versions next to titles correspond to the first version that introduced either the release or the minor
 
 ## alpha
 
@@ -52,3 +53,11 @@
 **v1.0** release (1.0.1)
 
 - config file checkers
+- tests for generators
+- generators now skip empty or blank lines in .txt files and do no longer lowercase everything
+- fixed consecutive failure logic and logging
+- changed emotes ... because
+
+**v1.1** (1.1.0)
+
+- removed `no-tor` suggestion
diff --git a/README.md b/README.md
@@ -221,6 +221,14 @@ Please read the [changelog](changelog.md) file for the full history !
 **v1.0** release (1.0.1)
 
 - config file checkers
+- tests for generators
+- generators now skip empty or blank lines in .txt files and do no longer lowercase everything
+- fixed consecutive failure logic and logging
+- changed emotes ... because
+
+**v1.1** (1.1.0)
+
+- removed `no-tor` suggestion
 
 </details>
 
@@ -229,7 +237,6 @@ Please read the [changelog](changelog.md) file for the full history !
 **TODO** (first implementation version)
 
 - [x] add a simple cli (0.1.1)
-- [ ] option to not use tor (?)
 - [x] option to change Tor ID each X requests (would need to implement a catch-up mechanism because thread jobs are unordered) (v1.0.0-dev)
 - [ ] option to use a running tor instance/service
 - [ ] choose protocol (http, https, ssh, etc.) (opened http and https in 1.0.1-rc1)
@@ -238,7 +245,7 @@ Please read the [changelog](changelog.md) file for the full history !
 **Known Bugs** (latest fix)
 
 - [ ] lagging threads are not catching up, especially when `ReadTimeout` is reached (interferes with Tor ID swap)
-- [ ] sometimes, successfull logins are not reported, or are reported twice (might be fixed with separate sessions for each thread)
+- [x] sometimes, successfull logins are not reported, or are reported twice (v1.0.1)
 
 ## 🎨 Logo and Icons
 

diff --git a/src/core/app.py b/src/core/app.py
@@ -104,15 +104,17 @@ def post_search(self, pport: int, username: str, password: str) -> bool:
         else:
             if not response or response.status_code != 200:
                 self.logger.error(
-                    "failed multiple reconnect to target [%s]:[%s] : %s ❌",
+                    "failed multiple reconnect to target [%s]:[%s] : %s (%d/%d) ❌",
                     username,
                     password,
                     last_exception,
+                    self.consecutive_fails + 1,
+                    self.max_tries,
                 )
                 with self.lock:
+                    self.consecutive_fails += 1
                     if self.consecutive_fails >= self.max_tries:
                         self.logger.critical("too many consecutive fails, exiting ... ❌")
-                    self.consecutive_fails += 1
 
         if response and self.target.search(response.text):
             self.logger.info("Login successful using [%s]:[%s] 🎉", username, password)
@@ -176,7 +178,7 @@ def run(self):
         length = len(self.bar_title(0, digits, user.count))
 
         self.logger.info("Starting App 🚀")
-        self.logger.info("Got %d users and %d passwords 🫧", user.count, passwd.count)
+        self.logger.info("Got %d users and %d passwords ⚙️", user.count, passwd.count)
 
         def on_each():
             """setup session and bar title"""

diff --git a/src/helper/fmt.py b/src/helper/fmt.py
@@ -85,7 +85,7 @@ def formatter(
 
 
 class UsefulFormatter(logging.Formatter):
-    name_width = 4
+    name_width = 10
     dt_fmt = "%Y-%m-%d %H:%M:%S"
 
     def __init__(self, *args: Any, colored_output: bool = True, **kwargs: Any) -> None:

diff --git a/src/onion/tor.py b/src/onion/tor.py
@@ -92,9 +92,10 @@ def ip(self) -> str:
                 if not response or response.status_code != 200:
                     self.logger.error(
                         "failed multiple reconnect to httpbin.org (%d/%d) ❌",
-                        self.__consecutive_fails,
+                        self.__consecutive_fails + 1,
                         self.max_tries,
                     )
+                    self.__consecutive_fails += 1
                     if self.__consecutive_fails >= self.max_tries:
                         self.logger.critical("too many consecutive fails, exiting ... ❌")
                     return None

diff --git a/src/version.py b/src/version.py
@@ -43,4 +43,4 @@
 # 'development' version, labeled 'dev'.
 
 # Example, '0.4.0-dev'
-__version__ = "1.0.1"
+__version__ = "1.0.2"