flake8 fixes

This commit is contained in:
Oliver Hartmann 2021-03-13 20:50:21 +01:00
parent 0c7c7eafa4
commit d11d17c557
4 changed files with 15 additions and 8 deletions

3
.flake8 Normal file
View File

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

View File

@ -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()
app.mainloop()

View File

@ -3,7 +3,7 @@ import re
import datetime
re_trade = re.compile(
'Hi, I would like to buy your (?P<item>.+) listed for (?P<amount>\d+) (?P<currency>\S+) in (?P<league>\S+) \(stash tab "(?P<tab>.+)"; position: left (?P<col>\d+), top (?P<row>\d+)\)')
r'Hi, I would like to buy your (?P<item>.+) listed for (?P<amount>\d+) (?P<currency>\S+) in (?P<league>\S+) \(stash tab "(?P<tab>.+)"; position: left (?P<col>\d+), top (?P<row>\d+)\)')
class Channel(Enum):

View File

@ -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<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>.*)')
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<channel>[#@%$&]?)(?P<ToFrom>To|From)?\s?(?P<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)')
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: