Refactor logging messages and enhance configuration options

TwitchChannelPointsMiner/TwitchChannelPointsMiner.py

@@ -161,7 +161,7 @@ class TwitchChannelPointsMiner:
         current_version, github_version = check_versions()
 
         logger.info(
-            f"Twitch Channel Points Miner v2-{current_version} (fork by 0x8fv)"
+            f"Twitch Channel Points Miner v2 | v{current_version} (fork by 0x8fv)"
         )
         logger.info("https://github.com/0x8fv/Twitch-Channel-Points-Miner-v2")
 
@@ -227,7 +227,7 @@ class TwitchChannelPointsMiner:
             logger.error("You can't start multiple sessions of this instance!")
         else:
             logger.info(
-                f"Start session: '{self.session_id}'", extra={"emoji": ":bomb:"}
+                f"Start session: '{self.session_id}'", extra={"emoji": ":green_circle:"}
             )
             self.running = True
             self.start_datetime = datetime.now()
@@ -263,7 +263,7 @@ class TwitchChannelPointsMiner:
 
             logger.info(
                 f"Loading data for {len(streamers_name)} streamers. Please wait...",
-                extra={"emoji": ":nerd_face:"},
+                extra={"emoji": ":hourglass_flowing_sand:"},
             )
             for username in streamers_name:
                 if username in streamers_name:

TwitchChannelPointsMiner/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "2.0.3"
+__version__ = "2.0.3.1"
 from .TwitchChannelPointsMiner import TwitchChannelPointsMiner
 
 __all__ = [

TwitchChannelPointsMiner/classes/Twitch.py

@@ -775,7 +775,7 @@ class Twitch(object):
             )
 
     def claim_bonus(self, streamer, claim_id):
-        if Settings.logger.less is False:
+        if Settings.logger.less is False and Settings.logger.show_claimed_bonus_msg:
             logger.info(
                 f"{streamer} {Color256Palette.green if Settings.logger.smart else ''}Claimed Bonus{Fore.RESET}!",
                 extra={"emoji": ":gift:", "event": Events.BONUS_CLAIM},

TwitchChannelPointsMiner/classes/entities/Drop.py

@@ -92,7 +92,7 @@ class Drop(object):
     def __str__(self):
         return (
             f"{self.name} ({self.benefit}) {self.current_minutes_watched}/{self.minutes_required} ({self.percentage_progress}%)"
-            if Settings.logger.less
+            if Settings.logger.less or Settings.logger.smart
             else self.__repr__()
         )
 

TwitchChannelPointsMiner/logger.py

@@ -91,7 +91,8 @@ class LoggerSettings:
         "pushover",
         "gotify",
         "username",
-        "smart"
+        "smart",
+        "show_claimed_bonus_msg"
     ]
 
     def __init__(
@@ -115,6 +116,7 @@ class LoggerSettings:
         gotify: Gotify or None = None,
         username: str or None = None,
         smart: bool = False,
+        show_claimed_bonus_msg: bool = True
     ):
         self.save = save
         self.less = less
@@ -135,6 +137,7 @@ class LoggerSettings:
         self.gotify = gotify
         self.username = username
         self.smart = smart
+        self.show_claimed_bonus_msg = show_claimed_bonus_msg
 
 
 class FileFormatter(logging.Formatter):

main.py

@@ -42,16 +42,17 @@ def load_or_create_config(file_path):
         "disable_ssl_cert_verification": False,
         "save_logs": False,
         "show_username_in_console": False,
+        "show_claimed_bonus_msg": True,
         "streamers": [],
         "bet": {
-            "strategy": "SMART",
-            "percentage": 5,
-            "percentage_gap": 20,
-            "max_points": 50000,
-            "stealth_mode": True,
-            "delay_mode": "FROM_END",
-            "delay": 6,
-            "minimum_points": 20000,
+            "strategy": None,
+            "percentage": None,
+            "percentage_gap": None,
+            "max_points": None,
+            "stealth_mode": None,
+            "delay_mode": None,
+            "delay": None,
+            "minimum_points": None,
         }
     }
 
@@ -103,7 +104,8 @@ def main():
             emoji=config.get("emojis", True),
             smart=config.get("smart_logging", True),
             show_seconds=config.get("show_seconds", False),
-            console_username=config.get("show_username_in_console", False)
+            console_username=config.get("show_username_in_console", False),
+            show_claimed_bonus_msg=config.get("show_claimed_bonus_msg", True)
         )
 
         streamer_settings = StreamerSettings(
@@ -118,12 +120,7 @@ def main():
                 stealth_mode=bet_settings.get("stealth_mode"),
                 delay_mode=newDelayMode,
                 delay=bet_settings.get("delay"),
-                minimum_points=bet_settings.get("minimum_points"),
-                filter_condition=FilterCondition(
-                    by=OutcomeKeys.TOTAL_USERS,
-                    where=Condition.LTE,
-                    value=800
-                )
+                minimum_points=bet_settings.get("minimum_points")
             )
         )