From e7daaed35b75030bec09dc9aeb5842b879161d31 Mon Sep 17 00:00:00 2001
From: klemek <klemek@outlook.fr>
Date: Mon, 11 Jan 2021 18:17:54 +0100
Subject: [PATCH] scanner logs

---
 src/scanners/full_scanner.py     |  2 --
 src/scanners/presence_scanner.py |  2 --
 src/scanners/scanner.py          | 10 +++++++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/scanners/full_scanner.py b/src/scanners/full_scanner.py
index 1df8977..f0fd196 100644
--- a/src/scanners/full_scanner.py
+++ b/src/scanners/full_scanner.py
@@ -36,11 +36,9 @@ class FullScanner(Scanner):
         self.compo = Composition()
         self.pres = Presence()
         self.member_specific = len(self.members) > 0
-        self.total_msg = 0
         return True
 
     def compute_message(self, channel: ChannelLogs, message: MessageLog):
-        self.total_msg += 1
         FrequencyScanner.analyse_message(message, self.freq, self.raw_members)
         CompositionScanner.analyse_message(message, self.compo, self.raw_members)
         PresenceScanner.analyse_message(channel, message, self.pres, self.raw_members)
diff --git a/src/scanners/presence_scanner.py b/src/scanners/presence_scanner.py
index 8915c61..66e52a7 100644
--- a/src/scanners/presence_scanner.py
+++ b/src/scanners/presence_scanner.py
@@ -30,12 +30,10 @@ class PresenceScanner(Scanner):
 
     async def init(self, message: discord.Message, *args: str) -> bool:
         self.pres = Presence()
-        self.total_msg = 0
         self.member_specific = len(self.members) > 0
         return True
 
     def compute_message(self, channel: ChannelLogs, message: MessageLog):
-        self.total_msg += 1
         return PresenceScanner.analyse_message(
             channel, message, self.pres, self.raw_members
         )
diff --git a/src/scanners/scanner.py b/src/scanners/scanner.py
index 70e0d46..c7ba64e 100644
--- a/src/scanners/scanner.py
+++ b/src/scanners/scanner.py
@@ -1,8 +1,10 @@
 from abc import ABC, abstractmethod
 from typing import List
+from datetime import datetime
+import logging
 import discord
 
-from utils import no_duplicate, get_intro
+from utils import no_duplicate, get_intro, delta, deltas
 from logs import GuildLogs, ChannelLogs, MessageLog
 
 
@@ -89,7 +91,9 @@ class Scanner(ABC):
                 )
             else:
                 self.msg_count = 0
+                self.total_msg = 0
                 self.chan_count = 0
+                t0 = datetime.now()
                 for channel in self.channels:
                     channel_logs = logs.channels[channel.id]
                     count = sum(
@@ -98,10 +102,13 @@ class Scanner(ABC):
                             for message_log in channel_logs.messages
                         ]
                     )
+                    self.total_msg += len(channel_logs.messages)
                     self.msg_count += count
                     self.chan_count += 1 if count > 0 else 0
+                logging.info(f"scan {guild.id} > scanned in {delta(t0):,}ms")
                 await progress.edit(content="```Computing results...```")
                 # Display results
+                t0 = datetime.now()
                 results = self.get_results(
                     get_intro(
                         self.intro_context,
@@ -112,6 +119,7 @@ class Scanner(ABC):
                         self.chan_count,
                     )
                 )
+                logging.info(f"scan {guild.id} > results in {delta(t0):,}ms")
                 response = ""
                 for r in results:
                     if len(response + "\n" + r) > 2000: