Little bit of refactory 😄 - Each 25% progress print the drop status i…

…n logger Signed-off-by: Alessandro Maggio <[email protected]>
Seillama · Jan 29, 2021 · 9800e46 · 9800e46
1 parent 4185766
commit 9800e46
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py
@@ -254,7 +254,7 @@ def __print_report(self):
             self.streamers[streamer_index].set_less_printing(False)
             logger.info(
                 f"{self.streamers[streamer_index]}, Total Points Gained (after farming - before farming): {self.streamers[streamer_index].channel_points - self.original_streamers[streamer_index].channel_points}",
-                extra={"emoji": ":microphone:"},
+                extra={"emoji": ":robot:"},
             )
             if self.streamers[streamer_index].history != {}:
                 logger.info(

diff --git a/TwitchChannelPointsMiner/__init__.py b/TwitchChannelPointsMiner/__init__.py
@@ -1,3 +1,7 @@
 # -*- coding: utf-8 -*-
-__version__ = "2.3.5"
-from .TwitchChannelPointsMiner import TwitchChannelPointsMiner  # noqa: F401
+__version__ = "2.4.1"
+from .TwitchChannelPointsMiner import TwitchChannelPointsMiner
+
+__all__ = [
+    "TwitchChannelPointsMiner",
+]
diff --git a/TwitchChannelPointsMiner/classes/WebSocketsPool.py b/TwitchChannelPointsMiner/classes/WebSocketsPool.py
@@ -285,10 +285,9 @@ def on_message(ws, message):
 
                     elif message.topic == "user-drop-events":
                         if message.type == "drop-progress":
-                            if (
-                                message.data["current_progress_min"]
-                                >= message.data["required_progress_min"]
-                            ):
+                            current = message.data["current_progress_min"]
+                            required = message.data["required_progress_min"]
+                            if current >= required:
                                 try:
                                     drop = ws.twitch.search_drop_in_inventory(
                                         ws.streamers[streamer_index],
@@ -303,6 +302,14 @@ def on_message(ws, message):
                                     logger.error(
                                         f"Unable to find {message.data['drop_id']} in your inventory"
                                     )
+                            else:
+                                # Skip 0% and 100% ...
+                                percentage_state = int((current / required) * 100)
+                                if percentage_state != 0 and percentage_state % 25 == 0:
+                                    logger.info(
+                                        f"Drop event {percentage_state}% for {ws.streamers[streamer_index]}!",
+                                        extra={"emoji": ":package:"},
+                                    )
 
                 except Exception:
                     logger.error(

diff --git a/setup.py b/setup.py
@@ -1,14 +1,20 @@
-import os
+from os import path
+
 import setuptools
+import re
 
 
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname), encoding='utf-8').read()
+    return open(path.join(path.dirname(__file__), fname), encoding='utf-8').read()
+
 
+metadata = dict(
+    re.findall(r"""__([a-z]+)__ = "([^"]+)""", read("TwitchChannelPointsMiner/__init__.py"))
+)
 
 setuptools.setup(
     name="Twitch-Channel-Points-Miner-v2",
-    version="2.3.5",
+    version=metadata["version"],
     author="Tkd-Alex (Alessandro Maggio)",
     author_email="[email protected]",
     description="A simple script that will watch a stream for you and earn the channel points.",