From 965eb3be4813e35cfc87af458648627d0acf70e3 Mon Sep 17 00:00:00 2001
From: Oliver Hartmann <oliver.hartmann@freiewildbahn.de>
Date: Sat, 20 Mar 2021 21:31:16 +0100
Subject: [PATCH] Refactor logging

---
 main.py         | 9 +++++++--
 src/data.py     | 7 +++++--
 src/sendkeys.py | 2 +-
 src/trader.py   | 1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 72f2b73..737f960 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,9 @@
 from src import gui
 from src import trader
 from src import config
-from src import data
+from src import sendkeys
+from src.data import compile_regex
+from src.data import log
 from threading import Thread
 from argparse import Namespace, ArgumentParser
 
@@ -17,9 +19,12 @@ def setup_args() -> Namespace:
 
 if __name__ == "__main__":
     args = setup_args()
+    log.debug(f'Read config from "{args.configfile}"')
     conf = config.read_config(args.configfile)
-    data.compile_regex(conf)
+    log.debug('Compiling regex')
+    compile_regex(conf)
     app = gui.Gui()
     my_thread = Thread(target=trader.read_log, args=(conf['General']['log_file'], app))
+    log.debug(f'Starting reader thread for "{conf["General"]["log_file"]}"')
     my_thread.start()
     app.mainloop()
diff --git a/src/data.py b/src/data.py
index 9de50c8..46ff7a3 100644
--- a/src/data.py
+++ b/src/data.py
@@ -12,7 +12,7 @@ re_log = re.compile(
     r'(?P<channel>[#@%$&]?)(?P<ToFrom>To|From)?\s?(?P<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)'
 )
 log = logging.getLogger(__name__)
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.DEBUG, format='%(levelname)-8s:: %(message)s')
 
 
 def compile_regex(conf: dict):
@@ -58,6 +58,9 @@ class Trade():
         self.col = col
         self.league = league
 
+    def __str__(self) -> str:
+        return f'Trade: {self.item} for {self.amount} {self.currency} in {self.tab} ({self.row}/{self.col}) in {self.league} league'
+
 
 class Message():
     def __init__(self,
@@ -96,7 +99,7 @@ class Message():
                    result.group('ToFrom'))
 
     def __str__(self) -> str:
-        text = f'{self.date} - {self.channel.name}: '
+        text = f'Message: {self.date} - {self.channel.name}: '
         if self.to_from:
             text = text + f'{self.to_from} '
         if self.guild:
diff --git a/src/sendkeys.py b/src/sendkeys.py
index 5f10748..da9e948 100644
--- a/src/sendkeys.py
+++ b/src/sendkeys.py
@@ -10,7 +10,7 @@ def send_text(text: str) -> None:
     try:
         app.connect(title=config.conf['General']['poe_window_title'])
     except ElementNotFoundError:
-        data.log.warning(f'Title {config.conf["General"]["poe_window_title"]} not found')
+        data.log.warning(f'Window Title "{config.conf["General"]["poe_window_title"]}" not found')
         return
     win = app.window(title_re=config.conf['General']['poe_window_title'])
     text = escape_mods(text)
diff --git a/src/trader.py b/src/trader.py
index 6e2cd92..321fd2a 100644
--- a/src/trader.py
+++ b/src/trader.py
@@ -11,6 +11,7 @@ def read_log(logfile: str, app: gui.Gui) -> None:
         message = Message.from_text(line)
         log.debug(message)
         if message and message.trade and message.to_from == 'From':
+            log.debug(message.trade)
             app.add_tab(30, message)