fixed entered regex

.flake8

@@ -1,3 +1,3 @@
 [flake8]
 ; ignore = E501
-max-line-length = 160
+max-line-length = 180

config.yaml

@@ -4,7 +4,6 @@ General:
   after_sendkeys_key_wait: 0.001 # Amount of seconds to wait after a keypress. Default is 0.01
   poe_window_title: 'Path of Exile'
   poe_path: 'D:\\SteamLibrary\\steamapps\\common\\Path of Exile\\PathOfExileSteam.exe'
-  username: 'Rotzhase' # Used for leaving a group
 Chat:
   # Define chat messages with the following placeholders: 
   # message, date, channel, user, guild, to_from, item, amount, currency, tab, row, col, league, 
@@ -13,6 +12,10 @@ Chat:
   ty: 'Thank you and good luck.'
   sold: 'Sorry, {item} is already sold'
 Parser:
-  re_log: '(?P<date>\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P<level>\S+) (\S+) (\d+)\] (?P<channel>[#@%$&]?)(?P<ToFrom>To|From)?\s?(?P<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)'
+  re_log: '(?P<date>\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P<level>\S+) (\S+) (\d+)\] (?P<message>.*)'
+
+  re_comm: '(?P<channel>[#@%$&]?)(?P<ToFrom>To|From)?\s?(?P<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)'
+
+  re_joined: ': (?P<user>\S+) has joined the area.'
   re_trade: 'Hi, I(( would)|(''d)) like to buy your ?(?P<nrItems>\d*) (?P<item>.+?) (listed )?for (my )?(?P<amount>\d+(\.\d+)?) (?P<currency>\D+) in (?P<league>\w+)\.?( \(stash tab \"(?P<tab>.+)\"; position: left (?P<col>\d+), top (?P<row>\d+)\))?'
   re_clipboard_prefix: '^@(?P<user>\S+) ' # this regex is used as a prefix for re_trade

src/data.py

@@ -2,16 +2,19 @@ from enum import Enum
 from typing import Union
 import re
 import datetime
-import logging, coloredlogs
+import logging
+import coloredlogs
 
 re_trade = re.compile(
     r'Hi, I would like to buy your (?P<item>.+) listed for (?P<amount>\d+) (?P<currency>\S+) in (?P<league>\S+) '
     r'\(stash tab "(?P<tab>.+)"; position: left (?P<col>\d+), top (?P<row>\d+)\)'
 )
-re_log = re.compile(
+re_log = re.compile(r'(?P<date>\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P<level>\S+) (\S+) (\d+)\] (?P<message>.*)')
-    r'(?P<date>\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P<level>\S+) (\S+) (\d+)\] '
+
-    r'(?P<channel>[#@%$&]?)(?P<ToFrom>To|From)?\s?(?P<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)'
+re_comm = re.compile(r'(?P<channel>[#@%$&]?)(?P<ToFrom>To|From)?\s?(?P<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)')
-)
+
+re_joined = re.compile(r': (?P<user>\S+) has joined the area.')
+
 re_clipboard = None
 re_clipboard_prefix = None
 
@@ -21,10 +24,14 @@ logging.basicConfig(level=logging.DEBUG, format='%(levelname)-8s:: %(message)s')
 
 
 def compile_regex(conf: dict):
-    global re_trade, re_log, re_clipboard, re_clipboard_prefix
+    global re_trade, re_log, re_clipboard, re_clipboard_prefix, re_comm, re_joined
     if 'General' in conf:
         if 're_log' in conf['Parser']:
             re_log = re.compile(conf['Parser']['re_log'])
+        if 're_comm' in conf['Parser']:
+            re_comm = re.compile(conf['Parser']['re_comm'])
+        if 're_joined' in conf['Parser']:
+            re_joined = re.compile(conf['Parser']['re_joined'])
         if 're_trade' in conf['Parser']:
             re_trade = re.compile(conf['Parser']['re_trade'])
             if 're_clipboard_prefix' in conf['Parser']:
@@ -97,16 +104,29 @@ class Trade():
                 and self.league == __o.league)
 
 
-class Message():
+class Entered():
+    def __init__(self, user: str) -> None:
+        self.user = user
+
+    @classmethod
+    def from_message(cls, message: str):
+        result = re_joined.search(message)
+        if not result:
+            log.debug(f'Joined regex doesn\'t fit for text "{message}"')
+            return None
+        user = result.group('user')
+        log.debug(f'User {user} entered')
+        return cls(user)
+
+
+class Communcation():
     def __init__(self,
                  message: str,
-                 date: datetime.datetime,
                  user: str,
                  channel: Channel,
                  guild: Union[str, None] = None,
                  to_from: Union[str, None] = None) -> None:
         self.message = message
-        self.date = date
         self.channel = channel
         self.user = user
         self.guild = guild
@@ -117,24 +137,21 @@ class Message():
 
     @classmethod
     def from_text(cls, text: str):
-        result = re_log.search(text)
+        result = re_comm.search(text)
         if not result:
-            log.debug(f'Result is none for text "{text}"')
+            log.debug(f'communication regex doesn\'t fit for text "{text}"')
             return None
-        date = datetime.datetime.strptime(
-            result.group('date'), '%Y/%m/%d %H:%M:%S')
         guild = result.group('guild')
         if guild:
             guild = guild.strip('<>')
         return cls(result.group('message'),
-                   date,
                    result.group('user'),
                    channel_mapping[result.group('channel')],
                    guild,
                    result.group('ToFrom'))
 
     def __str__(self) -> str:
-        text = f'Message: {self.date} - {self.channel.name}: '
+        text = f'Message: {self.channel.name}: '
         if self.to_from:
             text = text + f'{self.to_from} '
         if self.guild:
@@ -159,3 +176,28 @@ class Message():
         else:
             # Item in a stash from another char
             return hash((self.trade.item, self.trade.league))
+
+
+class Message():
+    def __init__(self,
+                 message: str,
+                 date: datetime.datetime) -> None:
+        self.message = message
+        self.date = date
+        self.communication = Communcation.from_text(message)
+        self.entered = Entered.from_message(message)
+
+    @classmethod
+    def from_text(cls, text: str):
+        result = re_log.search(text)
+        if not result:
+            log.debug(f'Result is none for text "{text}"')
+            return None
+        date = datetime.datetime.strptime(
+            result.group('date'), '%Y/%m/%d %H:%M:%S')
+        return cls(result.group('message'),
+                   date)
+
+    def __str__(self) -> str:
+        text = f'Message: {self.date} - {self.message}: '
+        return text

src/gui.py

@@ -3,7 +3,7 @@ from tkinter import Tk
 from tkinter import Button, Label
 from .data import Message
 from src import sendkeys
-from typing import Callable
+from typing import Callable, Dict
 from src.data import log
 import sv_ttk
 
@@ -14,7 +14,7 @@ class Gui(Tk):
         sv_ttk.set_theme("dark")
         self.title("Uber Trader")
         # self.geometry("300x200+10+20")
-        self.overrideredirect(1)  # remove border
+        self.overrideredirect(True)  # remove border
         self.wm_withdraw()  # Hide window
         self.attributes('-topmost', True)  # always on top
         # style = ttk.Style()
@@ -24,22 +24,27 @@ class Gui(Tk):
         self.tab_control.bind("<ButtonPress-1>", self.start_move)
         self.tab_control.bind("<ButtonRelease-1>", self.stop_move)
         self.tab_control.bind("<B1-Motion>", self.do_move)
-        self.tabs = dict()
+        self.tabs: Dict = dict()
 
     def add_tab(self, number: int, message: Message) -> None:
+        if not message.communication:
+            return
         self.wm_deiconify()
-        if message.user not in self.tabs:
+        user = message.communication.user
-            self.tabs[message.user] = {'frame': ttk.Frame(self.tab_control)}
+        if user not in self.tabs:
-            self.tabs[message.user]['items'] = {}
+            self.tabs[user] = {'frame': ttk.Frame(self.tab_control)}
-        frame = self.tabs[message.user]['frame']
+            self.tabs[user]['items'] = {}
-        if message.trade is not None:
+        frame = self.tabs[user]['frame']
-            if message.trade.item not in self.tabs[message.user]['items']:
+        if message.communication.trade is not None:
-                row = len(self.tabs[message.user]['items'])
+            item = message.communication.trade.item
-                self.tabs[message.user]['items'][message.trade.item] = {}
+            if item not in self.tabs[user]['items']:
-                self.tabs[message.user]['items'][message.trade.item]['row'] = row
+                row = len(self.tabs[user]['items'])
-                self.tabs[message.user]['items'][message.trade.item]['message'] = message
+                self.tabs[user]['items'][item] = {}
-                ttk.Label(frame, text=message.trade.item).grid(column=0, row=row)
+                self.tabs[user]['items'][item]['row'] = row
-                Label(frame, text=f'{message.trade.amount} {message.trade.currency}').grid(column=1, row=row)
+                self.tabs[user]['items'][item]['message'] = message
+                ttk.Label(frame, text=item).grid(column=0, row=row)
+                Label(frame, text=f'{message.communication.trade.amount}'
+                      ' {message.communication.trade.currency}').grid(column=1, row=row)
                 self.add_button(tab=frame, text='Inv', callback=self.inv_callback,
                                 message=message).grid(column=2, row=row)
                 self.add_button(tab=frame, text='Trade', callback=self.trade_callback,
@@ -51,7 +56,7 @@ class Gui(Tk):
                                 callback=self.wait_callback,
                                 message=message).grid(column=5, row=row)
                 self.add_button(tab=frame, text='X', callback=self.destroy_tab, message=message).grid(column=6, row=row)
-                self.tab_control.add(frame, text=message.user)
+                self.tab_control.add(frame, text=user)
         else:
             log.warning(f'Trade in message "{str(message)}" is None')
 
@@ -89,16 +94,24 @@ class Gui(Tk):
         sendkeys.send_to_format(type='wait', message=message)
 
     def destroy_tab(self, message: Message, tab: ttk.Frame) -> None:
-        if message.user in self.tabs:
+        if message.communication is None:
-            if message.trade.item in self.tabs[message.user]['items']:
+            log.error(f'Error destroying tab: no communication in message {message.message}')
+            return
+        if message.communication.trade is None:
+            log.error(f'Error destroying tab: no trade in message {message.message}')
+            return
+        user = message.communication.user
+        item = message.communication.trade.item
+        if message.communication.user in self.tabs:
+            if message.communication.trade.item in self.tabs[message.communication.user]['items']:
                 # Delete the item
-                row = self.tabs[message.user]['items'][message.trade.item]['row']
+                row = self.tabs[message.communication.user]['items'][item]['row']
-                for widget in self.tabs[message.user]['frame'].grid_slaves(row=row):
+                for widget in self.tabs[user]['frame'].grid_slaves(row=row):
                     widget.destroy()
-                del self.tabs[message.user]['items'][message.trade.item]
+                del self.tabs[user]['items'][item]
-            if len(self.tabs[message.user]['items']) == 0:
+            if len(self.tabs[user]['items']) == 0:
                 # If no item from this user is left, then also delete the tab
-                del self.tabs[message.user]
+                del self.tabs[user]
                 tab.destroy()
         if not self.tabs:
             self.wm_withdraw()

src/pyside6/gui_pyside6.py

@@ -6,6 +6,7 @@ from src.pyside6.trade_widget import TradeCollection
 from PySide6 import QtCore
 from PySide6.QtWidgets import QApplication, QMainWindow, QTabWidget, QSizePolicy
 import qdarktheme
+from typing import Dict
 
 
 class ResizingTabWidget(QTabWidget):
@@ -17,8 +18,8 @@ class ResizingTabWidget(QTabWidget):
         self.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
         self.setGeometry(0, 0, 20, 20)
 
-        self.trade_in_collections = {}
+        self.trade_in_collections: Dict[int, TradeCollection] = {}
-        self.trade_out_collections = {}
+        self.trade_out_collections: Dict[int, TradeCollection] = {}
         self.setTabsClosable(True)
         self.tabCloseRequested.connect(self.del_tab)
 
@@ -40,14 +41,14 @@ class ResizingTabWidget(QTabWidget):
         self.main_window.updateSizes()
 
     def new_trade(self, message: Message):
-        if message.trade:
+        if message.communication.trade:
-            unique_item = message.unique_user_item()
+            unique_item = message.communication.unique_user_item()
             if unique_item in self.trade_in_collections:
                 self.trade_in_collections[unique_item].add_trade(message)
             else:
                 collection = TradeCollection(self, unique_item)
                 collection.add_trade(message)
-                self.addTab(collection, message.trade.item)
+                self.addTab(collection, message.communication.trade.item)
                 self.trade_in_collections[unique_item] = collection
 
                 self.main_window.show()
@@ -76,7 +77,7 @@ class MainWindow(QMainWindow):
         self.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint)
         self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
 
-        self.setWindowTitle("My App")
+        self.setWindowTitle("PoeTrader")
 
         self.tab_widget = ResizingTabWidget(self)
         self.tab_widget.currentChanged.connect(self.updateSizes)
@@ -94,6 +95,16 @@ class MainWindow(QMainWindow):
     def new_trade(self, message: Message):
         self.tab_widget.new_trade(message)
 
+    @QtCore.Slot()
+    def new_entered(self, message: Message):
+        for collection in self.tab_widget.trade_in_collections.values():
+            for tradeWidget in collection.trades.values():
+                if tradeWidget.message.communication.user == message.entered.user:
+                    log.debug(f'Found trade with user {message.entered.user}')
+                    tradeWidget.setHighlightStyle()
+                    return
+        log.debug(f'User {message.entered.user} trade not found')
+
 
 def start_app():
     app = QApplication(sys.argv)

src/pyside6/trade_widget.py

@@ -4,7 +4,7 @@ from PySide6.QtGui import QIcon
 from src.data import Message
 from src import sendkeys
 from src.data import log
-from typing import Callable
+from typing import Callable, Dict
 
 
 class TradeWidget(QWidget):
@@ -22,7 +22,8 @@ class TradeWidget(QWidget):
         self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
         self.main_layout.setContentsMargins(0, 0, 0, 0)
         self.setLayout(self.main_layout)
-        assert message.trade
+        self.setNormalStyle()
+        assert message.communication.trade
 
     def new_button(self, icon_filename: str, tooltip: str, callback: Callable[[], None]) -> QPushButton:
         icon = QIcon(icon_filename)
@@ -41,6 +42,13 @@ class TradeWidget(QWidget):
         self.main_layout.addWidget(label)
         return label
 
+    def setNormalStyle(self):
+        self.setStyleSheet("margin:5px; border:0px solid rgb(0, 255, 0); ")
+
+    def setHighlightStyle(self):
+        self.setStyleSheet("margin:5px; border:1px solid rgb(0, 255, 0); ")
+
+
 
 class Trade_In_Widget(TradeWidget):
 
@@ -56,11 +64,12 @@ class Trade_In_Widget(TradeWidget):
         self.close_button = self.new_button('icons/material_close.svg', 'Dismiss', self.close_callback)
 
         # self.label_item = self.new_Label(message.trade.item)
-        self.label_price = self.new_Label(f'{message.trade.amount} {message.trade.currency}')
+        assert message.communication.trade
-        self.label_user = self.new_Label(message.user)
+        self.label_price = self.new_Label(f'{message.communication.trade.amount} {message.communication.trade.currency}')
-        assert message.trade
+        self.label_user = self.new_Label(message.communication.user)
-        if message.trade.tab:
+        assert message.communication.trade
-            self.label_tab = self.new_Label(message.trade.tab)
+        if message.communication.trade.tab:
+            self.label_tab = self.new_Label(message.communication.trade.tab)
 
     def inv_callback(self):
         sendkeys.invite(message=self.message)
@@ -96,16 +105,17 @@ class Trade_Out_Widget(TradeWidget):
         self.close_button = self.new_button('icons/material_close.svg', 'Dismiss', self.close_callback)
 
         # self.label_item = self.new_Label(message.trade.item)
-        assert message.trade
+        assert message.communication.trade
-        self.label_price = self.new_Label(f'{message.trade.amount} {message.trade.currency}')
+        self.label_price = self.new_Label(f'{message.communication.trade.amount} {message.communication.trade.currency}')
-        self.label_user = self.new_Label(message.user)
+        self.label_user = self.new_Label(message.communication.user)
 
     def join_callback(self):
         sendkeys.join(message=self.message)
 
     def thank_callback(self):
         sendkeys.send_to_format(type='ty', message=self.message)
-        sendkeys.kick(message=self.message)
+        sendkeys.leave()
+        sendkeys.return_to_ho()
 
     def trade_callback(self):
         sendkeys.trade(message=self.message)
@@ -138,7 +148,7 @@ class TradeCollection(QWidget):
         self.main_layout.setContentsMargins(0, 0, 0, 0)
         self.setContentsMargins(0, 0, 0, 0)
         self.setLayout(self.main_layout)
-        self.trades = {}
+        self.trades: Dict[int. TradeWidget] = {}
 
     def childEvent(self, event: QtCore.QChildEvent) -> None:
         if event.removed() or event.added():
@@ -147,20 +157,20 @@ class TradeCollection(QWidget):
         return super().childEvent(event)
 
     def add_trade(self, message: Message) -> None:
-        assert message.trade
+        assert message.communication.trade
-        if message.unique_trade() in self.trades:
+        if message.communication.unique_trade() in self.trades:
             return
-        if message.to_from == 'From':
+        if message.communication.to_from == 'From':
             trade = Trade_In_Widget(message, self)
         else:
             trade = Trade_Out_Widget(message, self)
 
         self.main_layout.addWidget(trade)
-        self.trades[message.unique_trade()] = trade
+        self.trades[message.communication.unique_trade()] = trade
 
     def del_trade(self, message: Message):
-        assert message.trade
+        assert message.communication.trade
-        del self.trades[message.unique_trade()]
+        del self.trades[message.communication.unique_trade()]
         if not self.trades:
             self.parent.del_collection(self.unique_user_item)
             self.deleteLater()

src/sendkeys.py

@@ -1,12 +1,9 @@
 
 from pywinauto.application import Application, ProcessNotFoundError
 from pywinauto.findwindows import ElementNotFoundError
-import pydirectinput
 from src import data
 from src import config
 
-pydirectinput.PAUSE = 0.001
-
 
 def send_text(text: str) -> None:
     app = Application()
@@ -26,37 +23,6 @@ def send_text(text: str) -> None:
     win.type_keys('{ENTER}^A{DELETE}' + text + '{ENTER}', with_spaces=True, pause=config.conf['General']['after_sendkeys_key_wait'])
 
 
-def send_directInput(text: str) -> None:
-    # with pydirectinput.KeyBdInput.__dictoffset__
-    app = Application()
-    try:
-        app.connect(path=config.conf['General']['poe_path'])
-    except ProcessNotFoundError:
-        data.log.warning(f'App "{config.conf["General"]["poe_window_title"]}": "{config.conf["General"]["poe_path"]}" not found')
-        return
-    try:
-        win = app.window(title_re=config.conf['General']['poe_window_title'])
-    except ElementNotFoundError:
-        data.log.warning(f'Window Title "{config.conf["General"]["poe_window_title"]}" not found')
-        return
-    win.SetFocus()
-    win.wait(wait_for='active')
-    pydirectinput.press('return')
-    write_directInput(text)
-    pydirectinput.press('return')
-    pass
-
-
-def write_directInput(text: str):
-    for c in text:
-        if c.isupper():
-            pydirectinput.keyDown('shift')
-            pydirectinput.press(c.lower())
-            pydirectinput.keyUp('shift')
-        else:
-            pydirectinput.press(c)
-
-
 def escape_mods(text: str) -> str:
     text = text.replace('%', '{%}')
     text = text.replace('+', '{+}')
@@ -79,36 +45,36 @@ def send_to_format(type: str, message: data.Message) -> None:
         message (data.Message): Message data. Placeholders in the message type will be replaced with this data.
         conf (dict): Configution dictionary where the messages are stored.
     """
-    if message.trade:
+    if message.communication.trade:
-        text = config.conf['Chat'][type].format(message=message.message,
+        text = config.conf['Chat'][type].format(message=message.communication.message,
                                                 date=message.date,
-                                                channel=message.channel.name,
+                                                channel=message.communication.channel.name,
-                                                user=message.user,
+                                                user=message.communication.user,
-                                                guild=message.guild,
+                                                guild=message.communication.guild,
-                                                to_from=message.to_from,
+                                                to_from=message.communication.to_from,
-                                                item=message.trade.item,
+                                                item=message.communication.trade.item,
-                                                amount=message.trade.amount,
+                                                amount=message.communication.trade.amount,
-                                                currency=message.trade.currency,
+                                                currency=message.communication.trade.currency,
-                                                tab=message.trade.tab,
+                                                tab=message.communication.trade.tab,
-                                                row=message.trade.row,
+                                                row=message.communication.trade.row,
-                                                col=message.trade.col,
+                                                col=message.communication.trade.col,
-                                                league=message.trade.league)
+                                                league=message.communication.trade.league)
     else:
-        text = config.conf['Chat'][type].format(message=message.message,
+        text = config.conf['Chat'][type].format(message=message.communication.message,
                                                 date=message.date,
-                                                channel=message.channel.name,
+                                                channel=message.communication.channel.name,
-                                                user=message.user,
+                                                user=message.communication.user,
-                                                guild=message.guild,
+                                                guild=message.communication.guild,
-                                                to_from=message.to_from)
+                                                to_from=message.communication.to_from)
-    send_to(message.user, text)
+    send_to(message.communication.user, text)
 
 
 def invite(message: data.Message) -> None:
-    send_text(f'/invite {message.user}')
+    send_text(f'/invite {message.communication.user}')
 
 
 def join(message: data.Message) -> None:
-    send_text(f'/hideout {message.user}')
+    send_text(f'/hideout {message.communication.user}')
 
 
 def return_to_ho() -> None:
@@ -116,7 +82,7 @@ def return_to_ho() -> None:
 
 
 def kick(message: data.Message) -> None:
-    send_text(f'/kick {message.user}')
+    send_text(f'/kick {message.communication.user}')
 
 
 def leave() -> None:
@@ -124,4 +90,4 @@ def leave() -> None:
 
 
 def trade(message: data.Message) -> None:
-    send_text(f'/tradewith {message.user}')
+    send_text(f'/tradewith {message.communication.user}')

src/trader.py

@@ -10,10 +10,12 @@ from src.pyside6.gui_pyside6 import MainWindow
 class Log_Reader(QtCore.QObject):
     new_trade_signal = QtCore.Signal(Message)
     new_out_trade_signal = QtCore.Signal(Message)
+    new_entered = QtCore.Signal(Message)
 
     def __init__(self, window: MainWindow):
         super().__init__()
         self.new_trade_signal.connect(window.new_trade, QtCore.Qt.QueuedConnection)
+        self.new_entered.connect(window.new_entered, QtCore.Qt.QueuedConnection)
 
     def read_log(self, logfile: str) -> None:
         try:
@@ -22,8 +24,10 @@ class Log_Reader(QtCore.QObject):
                 for line in loglines:
                     message = Message.from_text(line)
                     log.debug(message)
-                    if message and message.trade:
+                    if message and message.communication and message.communication.trade:
                         self.new_trade_signal.emit(message)
+                    if message and message.entered:
+                        self.new_entered.emit(message)
         except IOError:
             log.error(f'Error opening log file {logfile}.')
 

tests/test_keyboard.py

@@ -1,15 +1,6 @@
 from src import sendkeys
 from src import config
 from src import data
-import win32api
-import win32gui
-import win32con
-from time import sleep
-
-
-def test_send_direct():
-    config.read_config(r'config.yaml')
-    sendkeys.send_directInput('Hello World')
 
 
 def test_sendkeys():
@@ -83,20 +74,3 @@ def test_ty_wo_trade():
     text = '2021/03/08 23:24:52 17931875 bb3 [INFO Client 1492] @From Sinusal: Hi, how are you doing? '
     message = data.Message.from_text(text)
     sendkeys.send_to_format('ty', message)
-
-
-def test_win31_api():
-    hwndMain = win32gui.FindWindow(None, "cmd")
-    hwndChild = win32gui.GetWindow(hwndMain, win32con.GW_CHILD)
-    while(True):
-        # [hwndChild] this is the Unique ID of the sub/child application/proccess
-        # [win32con.WM_CHAR] This sets what PostMessage Expects for input theres KeyDown and KeyUp as well
-        # [0x44] hex code for D
-        # [0]No clue, good luck!
-        # temp = win32api.PostMessage(hwndChild, win32con.WM_CHAR, 0x44, 0) returns key sent
-        temp = win32api.PostMessage(hwndChild, win32con.WM_CHAR, 0x44, 0)
-
-        # print(temp) prints the returned value of temp, into the console
-        print(temp)
-        # sleep(1) this waits 1 second before looping through again
-        sleep(1)

tests/test_log.py

@@ -54,3 +54,12 @@ def test_write_to_log_42():
     text = "2021/05/11 23:34:41 13600796 bad [INFO Client 9008] @From <CHIP> HenryHase: Hi, I would like to buy your Cortex Relic Chambers Map (T15) listed for 3.4 exalted in Ultimatum (stash tab \"$\"; position: left 3, top 9)"
     with open(log_file, 'a') as f:
         f.write(text)
+
+
+def test_write_entered():
+    config.read_config(r'config.yaml')
+    log_file = config.get_value('General.log_file')
+    assert (log_file)
+    text = r'2023/05/21 22:39:25 28761078 cffb0719 [INFO Client 13392] : Sinusal has joined the area.'
+    with open(log_file, 'a') as f:
+        f.write(text)

tests/test_messages.py

@@ -1,6 +1,6 @@
-from src import config
-from src import data
 from datetime import datetime
+
+from src import config, data
 from src.data import Channel
 
 
@@ -11,42 +11,56 @@ def test_message_from():
         'listed for 18 chaos in Ritual (stash tab "$"; position: left 22, top 5)'
     message = data.Message.from_text(text)
     assert message
-    assert message.user == 'NyhaiPuki'
+    assert message.communication
-    assert message.message == 'Hi, I would like to buy your level 21 23% Vaal Impurity of Lightning ' \
+    assert message.communication.user == 'NyhaiPuki'
+    assert message.communication.message == 'Hi, I would like to buy your level 21 23% Vaal Impurity of Lightning ' \
         'listed for 18 chaos in Ritual (stash tab "$"; position: left 22, top 5)'
     assert message.date == datetime(2021, 3, 8, 23, 24, 52)
-    assert message.channel == Channel.WHISPER
+    assert message.communication.channel == Channel.WHISPER
-    assert message.guild is None
+    assert message.communication.guild is None
-    assert message.to_from == 'From'
+    assert message.communication.to_from == 'From'
 
-    assert message.trade
+    assert message.communication.trade
-    assert message.trade.amount == 18
+    assert message.communication.trade.amount == 18
-    assert message.trade.col == 22
+    assert message.communication.trade.col == 22
-    assert message.trade.row == 5
+    assert message.communication.trade.row == 5
-    assert message.trade.currency == 'chaos'
+    assert message.communication.trade.currency == 'chaos'
-    assert message.trade.item == 'level 21 23% Vaal Impurity of Lightning'
+    assert message.communication.trade.item == 'level 21 23% Vaal Impurity of Lightning'
-    assert message.trade.league == 'Ritual'
+    assert message.communication.trade.league == 'Ritual'
 
 
 def test_message_from_float():
     conf = config.read_config(r'config.yaml')
     data.compile_regex(conf)
-    text = '2023/01/02 23:57:26 15123437 cffb0734 [INFO Client 16668] @From <SETSU?> LASTTRYPOEenjoyer: Hi, I would like to buy your Watcher\'s Eye, Prismatic Jewel listed for 2.5 divine in Sanctum (stash tab "$2"; position: left 8, top 7)'
+    text = '2023/01/02 23:57:26 15123437 cffb0734 [INFO Client 16668] @From <SETSU?> LASTTRYPOEenjoyer: ' \
+        'Hi, I would like to buy your Watcher\'s Eye, Prismatic Jewel listed for 2.5 divine in Sanctum (stash tab "$2"; position: left 8, top 7)'
     message = data.Message.from_text(text)
     assert message
-    assert message.user == 'LASTTRYPOEenjoyer'
+    assert message.communication
-    assert message.message == 'Hi, I would like to buy your Watcher\'s Eye, Prismatic Jewel listed for 2.5 divine in Sanctum (stash tab "$2"; position: left 8, top 7)'
+    assert message.communication.user == 'LASTTRYPOEenjoyer'
-    assert message.date == datetime(2021, 3, 8, 23, 24, 52)
+    assert message.communication.message == 'Hi, I would like to buy your Watcher\'s Eye, Prismatic Jewel listed for 2.5 divine' \
-    assert message.channel == Channel.WHISPER
+        ' in Sanctum (stash tab "$2"; position: left 8, top 7)'
-    assert message.guild is None
+    assert message.date == datetime(2023, 1, 2, 23, 57, 26)
-    assert message.to_from == 'From'
+    assert message.communication.channel == Channel.WHISPER
-    assert message.trade
+    assert message.communication.guild == 'SETSU?'
-    assert message.trade.amount == 18
+    assert message.communication.to_from == 'From'
-    assert message.trade.col == 22
+    assert message.communication.trade
-    assert message.trade.row == 5
+    assert message.communication.trade.amount == 2.5
-    assert message.trade.currency == 'chaos'
+    assert message.communication.trade.col == 8
-    assert message.trade.item == 'level 21 23% Vaal Impurity of Lightning'
+    assert message.communication.trade.row == 7
-    assert message.trade.league == 'Ritual'
+    assert message.communication.trade.currency == 'divine'
+    assert message.communication.trade.item == 'Watcher\'s Eye, Prismatic Jewel'
+    assert message.communication.trade.league == 'Sanctum'
+
+
+def test_entered():
+    conf = config.read_config(r'config.yaml')
+    data.compile_regex(conf)
+    text = r'2023/05/07 18:18:03 35114562 cffb0719 [INFO Client 6416] : Oathussy has joined the area.'
+    message = data.Message.from_text(text)
+    assert message
+    assert message.entered
+    assert message.entered.user == 'Oathussy'
 
 
 def test_message_to():
@@ -55,13 +69,14 @@ def test_message_to():
     text_to = '2021/01/24 23:11:23 17039703 bb2 [INFO Client 10144] @To EraseAndDelete: Thank you & good luck!'
     message = data.Message.from_text(text_to)
     assert message
-    assert message.user == 'EraseAndDelete'
+    assert message.communication
-    assert message.message == 'Thank you & good luck!'
+    assert message.communication.user == 'EraseAndDelete'
+    assert message.communication.message == 'Thank you & good luck!'
     assert message.date == datetime(2021, 1, 24, 23, 11, 23)
-    assert message.channel == Channel.WHISPER
+    assert message.communication.channel == Channel.WHISPER
-    assert message.guild is None
+    assert message.communication.guild is None
-    assert message.to_from == 'To'
+    assert message.communication.to_from == 'To'
-    assert message.trade is None
+    assert message.communication.trade is None
 
 
 def test_message_global():
@@ -70,10 +85,11 @@ def test_message_global():
     text_global = '2021/02/10 19:01:56 2720500 bb2 [INFO Client 3464] #HarvestScarab: so by the time it was finally juiced you couldnt do it'
     message = data.Message.from_text(text_global)
     assert message
-    assert message.user == 'HarvestScarab'
+    assert message.communication
-    assert message.message == 'so by the time it was finally juiced you couldnt do it'
+    assert message.communication.user == 'HarvestScarab'
+    assert message.communication.message == 'so by the time it was finally juiced you couldnt do it'
     assert message.date == datetime(2021, 2, 10, 19, 1, 56)
-    assert message.channel == Channel.GLOBAL
+    assert message.communication.channel == Channel.GLOBAL
-    assert message.guild is None
+    assert message.communication.guild is None
-    assert message.to_from is None
+    assert message.communication.to_from is None
-    assert message.trade is None
+    assert message.communication.trade is None