Append Trade object to Message
This commit is contained in:
parent
34cc3db033
commit
0c7c7eafa4
20
src/data.py
20
src/data.py
@ -55,6 +55,9 @@ class Message():
|
||||
self.user = user
|
||||
self.guild = guild
|
||||
self.to_from = to_from
|
||||
self.trade = None
|
||||
if self.channel is Channel.WHISPER:
|
||||
self.parse_trade()
|
||||
|
||||
def __str__(self) -> str:
|
||||
text = f'{self.date} - {self.channel.name}: '
|
||||
@ -65,12 +68,13 @@ class Message():
|
||||
text = text + f'{self.user}: {self.message}'
|
||||
return text
|
||||
|
||||
def parse_trade(self) -> Trade:
|
||||
def parse_trade(self) -> None:
|
||||
res = re_trade.search(self.message)
|
||||
return Trade(item=res['item'],
|
||||
amount=int(res['amount']),
|
||||
currency=res['currency'],
|
||||
tab=res['tab'],
|
||||
row=int(res['row']),
|
||||
col=int(res['col']),
|
||||
league=res['league'])
|
||||
if res:
|
||||
self.trade = Trade(item=res['item'],
|
||||
amount=int(res['amount']),
|
||||
currency=res['currency'],
|
||||
tab=res['tab'],
|
||||
row=int(res['row']),
|
||||
col=int(res['col']),
|
||||
league=res['league'])
|
||||
|
@ -1,7 +1,8 @@
|
||||
from tkinter import ttk
|
||||
from tkinter import Tk
|
||||
from tkinter import Button
|
||||
from .data import Trade
|
||||
from .data import Message
|
||||
|
||||
|
||||
class Gui(Tk):
|
||||
def __init__(self, parent=None) -> None:
|
||||
@ -17,7 +18,7 @@ class Gui(Tk):
|
||||
self.add_tab(2, None)
|
||||
self.add_tab(3, None)
|
||||
|
||||
def add_tab(self, number: int, trade: Trade) -> None:
|
||||
def add_tab(self, number: int, message: Message) -> None:
|
||||
tab = ttk.Frame(self.tab_control)
|
||||
Button(tab, text='Accept').pack()
|
||||
Button(tab, text='Decline').pack()
|
||||
|
@ -32,10 +32,8 @@ def read_log(logfile: str, app: gui.Gui) -> None:
|
||||
for line in loglines:
|
||||
message = parse_log(line)
|
||||
log.debug(message)
|
||||
if message and message.channel is Channel.WHISPER:
|
||||
log.info('TRADE')
|
||||
trade = message.parse_trade()
|
||||
app.add_tab(30, trade)
|
||||
if message.trade:
|
||||
app.add_tab(30, message)
|
||||
|
||||
|
||||
def follow(thefile: str):
|
||||
|
Loading…
x
Reference in New Issue
Block a user