oli/PoeTrade
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added from and to variable

Browse Source
This commit is contained in:
Oliver Hartmann 2021-03-13 18:14:04 +01:00
parent 2e48d9dd19
commit 34cc3db033
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/data.py
View File

@ -47,17 +47,19 @@ class Message():
date: datetime.datetime, date: datetime.datetime,
user: str, user: str,
channel: Channel, channel: Channel,
guild: str) -> None: guild: str = None,
to_from: str = None) -> None:
self.message = message self.message = message
self.date = date self.date = date
self.channel = channel self.channel = channel
if channel is Channel.WHISPER:
user = user.lstrip('From ')
self.user = user self.user = user
self.guild = guild self.guild = guild
self.to_from = to_from
def __str__(self) -> str: def __str__(self) -> str:
text = f'{self.date} - {self.channel.name}: ' text = f'{self.date} - {self.channel.name}: '
if self.to_from:
text = text + f'{self.to_from} '
if self.guild: if self.guild:
text = text + f'<{self.guild}> ' text = text + f'<{self.guild}> '
text = text + f'{self.user}: {self.message}' text = text + f'{self.user}: {self.message}'

4
src/trader.py
View File

@ -10,7 +10,7 @@ logging.basicConfig(level=logging.DEBUG)
re_log = re.compile( re_log = re.compile(
'(?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<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)') '(?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>.*)')
def parse_log(text: str) -> Message: def parse_log(text: str) -> Message:
@ -23,7 +23,7 @@ def parse_log(text: str) -> Message:
guild = result.group('guild') guild = result.group('guild')
if guild: if guild:
guild = guild.strip('<>') guild = guild.strip('<>')
return Message(result.group('message'), date, result.group('user'), channel_mapping[result.group('channel')], guild) return Message(result.group('message'), date, result.group('user'), channel_mapping[result.group('channel')], guild, result.group('ToFrom'))
def read_log(logfile: str, app: gui.Gui) -> None: def read_log(logfile: str, app: gui.Gui) -> None: