From e3be181c5717d67690eb336ff460e42aad094c99 Mon Sep 17 00:00:00 2001 From: Petrarka0 Date: Wed, 20 Mar 2024 22:54:23 +0300 Subject: [PATCH 1/4] Console report enhantment Settings.logger.less now affect final report Streamer.print_history() tweak for more readability. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit before "if Settings.logger.less = True": --- alot of annoing bet information --- dd/mm hh:mm:ss - 🤖 Streamer(username=streamer, channel_id=12345678, channel_points=112.06k), Total Points Gained (after farming - before farming): 70 dd/mm hh:mm:ss - 💰 CLAIM (1 times, 50 gained), WATCH (2 times, 20 gained) after: dd/mm hh:mm:ss - 💰 streamer (112.06k points), Total Points Gained: 70 CLAIM (1 times, 50 gained) WATCH (2 times, 20 gained) --- .../TwitchChannelPointsMiner.py | 21 ++++++++++++------- .../classes/entities/Streamer.py | 4 ++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py index f937351a..ca07f07c 100644 --- a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py +++ b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py @@ -456,7 +456,7 @@ def __print_report(self): extra={"emoji": ":hourglass:"}, ) - if self.events_predictions != {}: + if not Settings.logger.less and self.events_predictions != {}: print("") for event_id in self.events_predictions: event = self.events_predictions[event_id] @@ -485,12 +485,17 @@ def __print_report(self): self.streamers[streamer_index].channel_points - self.original_streamers[streamer_index] ) + + streamer_gain = ( + f"{self.streamers[streamer_index]}, Total Points Gained: {_millify(gained)}" + if Settings.logger.less + else f"{repr(self.streamers[streamer_index])}, Total Points Gained (after farming - before farming): {_millify(gained)}" + ) + + # i think there are better solution but it's work like it supposed + streamer_history = f"\t\t\t{"\n\t\t\t".join(self.streamers[streamer_index].print_history().split("; "))}" + logger.info( - f"{repr(self.streamers[streamer_index])}, Total Points Gained (after farming - before farming): {_millify(gained)}", - extra={"emoji": ":robot:"}, + f"{streamer_gain}\n{streamer_history}", + extra={"emoji": ":moneybag:"}, ) - if self.streamers[streamer_index].history != {}: - logger.info( - f"{self.streamers[streamer_index].print_history()}", - extra={"emoji": ":moneybag:"}, - ) diff --git a/TwitchChannelPointsMiner/classes/entities/Streamer.py b/TwitchChannelPointsMiner/classes/entities/Streamer.py index 39e269a5..1cec8cde 100644 --- a/TwitchChannelPointsMiner/classes/entities/Streamer.py +++ b/TwitchChannelPointsMiner/classes/entities/Streamer.py @@ -149,9 +149,9 @@ def set_online(self): ) def print_history(self): - return ", ".join( + return "; ".join( [ - f"{key}({self.history[key]['counter']} times, {_millify(self.history[key]['amount'])} gained)" + f"{key} ({self.history[key]['counter']} times, {_millify(self.history[key]['amount'])} gained)" for key in sorted(self.history) if self.history[key]["counter"] != 0 ] From 7f9098f594d71500653b75ab282e53422e83e8c1 Mon Sep 17 00:00:00 2001 From: Petrarka0 Date: Mon, 25 Mar 2024 14:13:23 +0300 Subject: [PATCH 2/4] add highlighting streamer at final report --- TwitchChannelPointsMiner/TwitchChannelPointsMiner.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py index ca07f07c..4ac93a63 100644 --- a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py +++ b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py @@ -486,10 +486,13 @@ def __print_report(self): - self.original_streamers[streamer_index] ) + from colorama import Fore + streamer_highlight = Fore.YELLOW + streamer_gain = ( - f"{self.streamers[streamer_index]}, Total Points Gained: {_millify(gained)}" + f"{streamer_highlight}{self.streamers[streamer_index]}{Fore.RESET}, Total Points Gained: {_millify(gained)}" if Settings.logger.less - else f"{repr(self.streamers[streamer_index])}, Total Points Gained (after farming - before farming): {_millify(gained)}" + else f"{streamer_highlight}{repr(self.streamers[streamer_index])}{Fore.RESET}, Total Points Gained (after farming - before farming): {_millify(gained)}" ) # i think there are better solution but it's work like it supposed @@ -498,4 +501,4 @@ def __print_report(self): logger.info( f"{streamer_gain}\n{streamer_history}", extra={"emoji": ":moneybag:"}, - ) + ) \ No newline at end of file From 2aae6036306b1682790017387fe2ae6604b78131 Mon Sep 17 00:00:00 2001 From: Petrarka0 Date: Thu, 11 Apr 2024 21:36:12 +0300 Subject: [PATCH 3/4] SyntaxError fix --- TwitchChannelPointsMiner/TwitchChannelPointsMiner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py index 4ac93a63..8e35a881 100644 --- a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py +++ b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py @@ -496,7 +496,7 @@ def __print_report(self): ) # i think there are better solution but it's work like it supposed - streamer_history = f"\t\t\t{"\n\t\t\t".join(self.streamers[streamer_index].print_history().split("; "))}" + streamer_history = f"\t\t\t{'\n\t\t\t'.join(self.streamers[streamer_index].print_history().split('; '))}" logger.info( f"{streamer_gain}\n{streamer_history}", From 800c781724cba1bf89fea8facf4584a42f1d87b1 Mon Sep 17 00:00:00 2001 From: Petrarka0 Date: Mon, 15 Apr 2024 22:52:26 +0300 Subject: [PATCH 4/4] more clean code --- TwitchChannelPointsMiner/TwitchChannelPointsMiner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py index 8e35a881..22bf8416 100644 --- a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py +++ b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py @@ -143,7 +143,7 @@ def is_connected(): self.claim_drops_startup = claim_drops_startup self.priority = priority if isinstance(priority, list) else [priority] - self.streamers = [] + self.streamers: list[Streamer] = [] self.events_predictions = {} self.minute_watcher_thread = None self.sync_campaigns_thread = None @@ -495,8 +495,8 @@ def __print_report(self): else f"{streamer_highlight}{repr(self.streamers[streamer_index])}{Fore.RESET}, Total Points Gained (after farming - before farming): {_millify(gained)}" ) - # i think there are better solution but it's work like it supposed - streamer_history = f"\t\t\t{'\n\t\t\t'.join(self.streamers[streamer_index].print_history().split('; '))}" + indent = ' ' * 25 + streamer_history = '\n'.join(f"{indent}{history}" for history in self.streamers[streamer_index].print_history().split('; ')) logger.info( f"{streamer_gain}\n{streamer_history}",