From c598b45db4bc335f3fc35e78c96e3dabee2bc058 Mon Sep 17 00:00:00 2001 From: Oliver Hartmann Date: Tue, 11 May 2021 22:20:23 +0200 Subject: [PATCH] clipboard regex --- src/data.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/data.py b/src/data.py index 5a881f6..965b6d6 100644 --- a/src/data.py +++ b/src/data.py @@ -11,17 +11,20 @@ re_log = re.compile( r'(?P\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P\S+) (\S+) (\d+)\] ' r'(?P[#@%$&]?)(?PTo|From)?\s?(?P<\S+>)? ?(?P[^:]+): (?P.*)' ) +re_clipboard = None log = logging.getLogger(__name__) logging.basicConfig(level=logging.DEBUG, format='%(levelname)-8s:: %(message)s') def compile_regex(conf: dict): - global re_trade, re_log + global re_trade, re_log, re_clipboard if 'General' in conf: if 're_log' in conf['Parser']: re_log = re.compile(conf['Parser']['re_log']) if 're_trade' in conf['Parser']: re_trade = re.compile(conf['Parser']['re_trade']) + if 're_clipboard_prefix' in conf['Parser']: + re_clipboard = re.compile(conf['Parser']['re_clipboard_prefix'] + conf['Parser']['re_trade']) class Channel(Enum): @@ -70,6 +73,7 @@ class Trade(): row=res['row'], col=res['col'], league=res['league']) + def __str__(self) -> str: return f'Trade: {self.nrItems} {self.item} for {self.amount} {self.currency} in {self.tab} ({self.row}/{self.col}) in {self.league} league'