From d11d17c557290e739cbcf1bb467653ffa05256df Mon Sep 17 00:00:00 2001 From: Oliver Hartmann Date: Sat, 13 Mar 2021 20:50:21 +0100 Subject: [PATCH] flake8 fixes --- .flake8 | 3 +++ main.py | 7 +++---- src/data.py | 2 +- src/trader.py | 11 ++++++++--- 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 .flake8 diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000..59d9efe --- /dev/null +++ b/.flake8 @@ -0,0 +1,3 @@ +[flake8] +; ignore = E501 +max-line-length = 160 \ No newline at end of file diff --git a/main.py b/main.py index db24cf0..e8cb1e3 100644 --- a/main.py +++ b/main.py @@ -3,12 +3,12 @@ from src import trader from threading import Thread from argparse import Namespace, ArgumentParser + def setup_args() -> Namespace: parser = ArgumentParser( description='Poe Trader', epilog="And that's how you trade") - parser.add_argument( - '-l', '--logfile', help='Path of the logfile that should be used', default=r'D:\Poe\logs\Client.txt') + parser.add_argument('-l', '--logfile', help='Path of the logfile that should be used', default=r'D:\Poe\logs\Client.txt') return parser.parse_args() @@ -18,5 +18,4 @@ if __name__ == "__main__": app = gui.Gui() my_thread = Thread(target=trader.read_log, args=(args.logfile, app)) my_thread.start() - # read_log(args.logfile) - app.mainloop() \ No newline at end of file + app.mainloop() diff --git a/src/data.py b/src/data.py index 4b5e5b9..2bff9c4 100644 --- a/src/data.py +++ b/src/data.py @@ -3,7 +3,7 @@ import re import datetime re_trade = re.compile( - 'Hi, I would like to buy your (?P.+) listed for (?P\d+) (?P\S+) in (?P\S+) \(stash tab "(?P.+)"; position: left (?P\d+), top (?P\d+)\)') + r'Hi, I would like to buy your (?P.+) listed for (?P\d+) (?P\S+) in (?P\S+) \(stash tab "(?P.+)"; position: left (?P\d+), top (?P\d+)\)') class Channel(Enum): diff --git a/src/trader.py b/src/trader.py index 3ac2dde..e93af3b 100644 --- a/src/trader.py +++ b/src/trader.py @@ -2,7 +2,7 @@ import time import datetime import re import logging -from .data import Message, Channel, channel_mapping +from .data import Message, channel_mapping from . import gui log = logging.getLogger(__name__) @@ -10,7 +10,7 @@ logging.basicConfig(level=logging.DEBUG) re_log = re.compile( - '(?P\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P\S+) (\S+) (\d+)\] (?P[#@%$&]?)(?PTo|From)?\s?(?P<\S+>)? ?(?P[^:]+): (?P.*)') + r'(?P\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P\S+) (\S+) (\d+)\] (?P[#@%$&]?)(?PTo|From)?\s?(?P<\S+>)? ?(?P[^:]+): (?P.*)') def parse_log(text: str) -> Message: @@ -23,7 +23,12 @@ def parse_log(text: str) -> Message: guild = result.group('guild') if guild: guild = guild.strip('<>') - return Message(result.group('message'), date, result.group('user'), channel_mapping[result.group('channel')], guild, result.group('ToFrom')) + 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: