flake8 fixes
This commit is contained in:
parent
0c7c7eafa4
commit
d11d17c557
7
main.py
7
main.py
@ -3,12 +3,12 @@ from src import trader
|
|||||||
from threading import Thread
|
from threading import Thread
|
||||||
from argparse import Namespace, ArgumentParser
|
from argparse import Namespace, ArgumentParser
|
||||||
|
|
||||||
|
|
||||||
def setup_args() -> Namespace:
|
def setup_args() -> Namespace:
|
||||||
parser = ArgumentParser(
|
parser = ArgumentParser(
|
||||||
description='Poe Trader', epilog="And that's how you trade")
|
description='Poe Trader', epilog="And that's how you trade")
|
||||||
|
|
||||||
parser.add_argument(
|
parser.add_argument('-l', '--logfile', help='Path of the logfile that should be used', default=r'D:\Poe\logs\Client.txt')
|
||||||
'-l', '--logfile', help='Path of the logfile that should be used', default=r'D:\Poe\logs\Client.txt')
|
|
||||||
|
|
||||||
return parser.parse_args()
|
return parser.parse_args()
|
||||||
|
|
||||||
@ -18,5 +18,4 @@ if __name__ == "__main__":
|
|||||||
app = gui.Gui()
|
app = gui.Gui()
|
||||||
my_thread = Thread(target=trader.read_log, args=(args.logfile, app))
|
my_thread = Thread(target=trader.read_log, args=(args.logfile, app))
|
||||||
my_thread.start()
|
my_thread.start()
|
||||||
# read_log(args.logfile)
|
app.mainloop()
|
||||||
app.mainloop()
|
|
||||||
|
@ -3,7 +3,7 @@ import re
|
|||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
re_trade = re.compile(
|
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):
|
class Channel(Enum):
|
||||||
|
@ -2,7 +2,7 @@ import time
|
|||||||
import datetime
|
import datetime
|
||||||
import re
|
import re
|
||||||
import logging
|
import logging
|
||||||
from .data import Message, Channel, channel_mapping
|
from .data import Message, channel_mapping
|
||||||
from . import gui
|
from . import gui
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@ -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<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:
|
def parse_log(text: str) -> Message:
|
||||||
@ -23,7 +23,12 @@ 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, 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:
|
def read_log(logfile: str, app: gui.Gui) -> None:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user