diff --git a/src/scon/game/battle.py b/src/scon/game/battle.py index bc7440c..5d881f2 100644 --- a/src/scon/game/battle.py +++ b/src/scon/game/battle.py @@ -58,7 +58,7 @@ class PvPBeaconHunt(PvPBattle): # Dreads class DreadnoughtBattle(Battle): - pass + _game_type_strings = ['ClanShip'] ### PvE Stuff: low prio. class PvEBattle(Battle): @@ -103,7 +103,7 @@ def battle_factory(logs): for line in logs.game_log.lines: if isinstance(line, game.StartingLevel): if not line.unpack(): - print('Encountered broken packet.') + print('Encountered broken packet: ', line.values) continue if not line.is_mainmenu(): # this is the beginning of a new battle. diff --git a/src/scon/logs/game.py b/src/scon/logs/game.py index ee06869..d406611 100644 --- a/src/scon/logs/game.py +++ b/src/scon/logs/game.py @@ -171,7 +171,7 @@ class StartingLevel(GameLog): __slots__ = GameLog.__slots__ # level, gametype, unknown_gametype matcher = [ - + re.compile(r"^======\sstarting\slevel\:\s'(?P[^']+)'\s(?P[^\s]+)\sclient\s(?P\d+)\s======"), re.compile(r"^======\sstarting\slevel\:\s'(?P[^']+)'\s(?P[^\s]+)\sclient\s======"), re.compile(r"^======\sstarting\slevel\:\s'(?P[^']+)'\s(?P[^\s]+)\s======"), re.compile(r"^======\sstarting\slevel\:\s'(?P[^']+)'\s+======"), diff --git a/src/scon/logs/logstream.py b/src/scon/logs/logstream.py index 5369fdd..331b887 100644 --- a/src/scon/logs/logstream.py +++ b/src/scon/logs/logstream.py @@ -34,7 +34,7 @@ """ from .base import Log import re -from logs.base import Stacktrace +from scon.logs.base import Stacktrace import logging RE_SCLOG = r'^(?P\d{2,2})\:(?P\d{2,2})\:(?P\d{2,2})\.(?P\d{3,3})\s(?P\s*[^\|\s]+\s*|\s+)\|\s(?P.*)' R_SCLOG = re.compile(RE_SCLOG) diff --git a/src/scon/qlogviewer.py b/src/scon/qlogviewer.py index 0a12f2d..8ec04c1 100644 --- a/src/scon/qlogviewer.py +++ b/src/scon/qlogviewer.py @@ -56,7 +56,7 @@ class SessionTreeView(Qt.QTreeView): for battle in battles: o = Qt.QStandardItem("%s (Level '%s', Gametype '%s')" %( battle.__class__.__name__, battle.level, battle.gametype ) ) o.setEditable(False) - info_object.appendRow(o) + item.appendRow(o) if len(battles) > 0: #session.parse_files(['combat.log', 'chat.log']) info_object.setText('%s games' % (len(battles),))