From e72a7ccfa623f37dbcd5d09c0ff80ba0bd621430 Mon Sep 17 00:00:00 2001 From: Klemek Date: Tue, 16 Mar 2021 16:11:40 +0100 Subject: [PATCH] improved querying --- src/logs/channel_logs.py | 2 +- src/logs/guild_logs.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/logs/channel_logs.py b/src/logs/channel_logs.py index 6b0e352..91ce4df 100644 --- a/src/logs/channel_logs.py +++ b/src/logs/channel_logs.py @@ -4,7 +4,7 @@ import discord from . import MessageLog from utils import FakeMessage -CHUNK_SIZE = 1000 +CHUNK_SIZE = 2000 FORMAT = 3 diff --git a/src/logs/guild_logs.py b/src/logs/guild_logs.py index 795c12f..9905e96 100644 --- a/src/logs/guild_logs.py +++ b/src/logs/guild_logs.py @@ -172,16 +172,24 @@ class GuildLogs: await asyncio.sleep(0.5) - total_chan = sum([worker.done for worker in workers]) + remaining = [ + worker.channel.name for worker in workers if not worker.done + ] + total_chan = max_chan - len(remaining) queried_msg = sum([worker.queried_msg for worker in workers]) total_msg = sum([worker.total_msg for worker in workers]) if total_chan == max_chan: done = True + remaining_msg = "" + + if len(remaining) <= 5: + remaining_msg = "\nRemaining: " + ", ".join(remaining) + await code_message( progress, - f"Reading new history...\n{total_msg:,} messages in {total_chan:,}/{max_chan:,} channels ({round(queried_msg/deltas(t0)):,}m/s)\n{warning_msg}", + f"Reading new history...\n{total_msg:,} messages in {total_chan:,}/{max_chan:,} channels ({round(queried_msg/deltas(t0)):,}m/s)\n{warning_msg}{remaining_msg}", ) logging.info( f"log {self.guild.id} > queried in {delta(t0):,}ms -> {queried_msg / deltas(t0):,.3f} m/s"