diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py index 95d9c4a..3037f7e 100644 --- a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py +++ b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py @@ -254,7 +254,7 @@ class TwitchChannelPointsMiner: 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 index 13aea3b..ba009d3 100644 --- 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 index 65f0c4e..d6fc445 100644 --- a/TwitchChannelPointsMiner/classes/WebSocketsPool.py +++ b/TwitchChannelPointsMiner/classes/WebSocketsPool.py @@ -285,10 +285,9 @@ class WebSocketsPool: 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 @@ class WebSocketsPool: 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 index 434c451..c427ed7 100644 --- 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="alex.tkd.alex@gmail.com", description="A simple script that will watch a stream for you and earn the channel points.",