Fixed UI crash
Build / Build source distribution (push) Failing after 9s
Build / Execute unit tests (push) Failing after 7s
Build / Upload Release Asset (push) Has been skipped
Build / upload_pypi (push) Has been skipped

This commit is contained in:
2026-10-10 20:39:02 -06:00
parent 887667af07
commit 13b1dcdd97
5 changed files with 173 additions and 216 deletions
+2 -1
View File
@@ -4,7 +4,8 @@ from src.version import version
install_requires = [ install_requires = [
"requests>=2.26", "requests>=2.26",
"PySide6>=6.2", "PySide6==6.7.3",
"shiboken6==6.7.3",
"toml>=0.10.2", "toml>=0.10.2",
"pillow>=8.4", "pillow>=8.4",
# On Linux the app ships a pure-Python Protocol18 decoder and captures with # On Linux the app ships a pure-Python Protocol18 decoder and captures with
+15
View File
@@ -19,6 +19,7 @@ class Pipeline:
self.decoder = PhotonDecoder() self.decoder = PhotonDecoder()
self.world = World() self.world = World()
self._lock = threading.RLock() self._lock = threading.RLock()
self._warned_unknown = set()
def on_udp(self, payload: bytes): def on_udp(self, payload: bytes):
logger.debug("received UDP payload: %d bytes", len(payload)) logger.debug("received UDP payload: %d bytes", len(payload))
@@ -40,6 +41,7 @@ class Pipeline:
def _events_from_message(self, message: PhotonMessage) -> List[dict]: def _events_from_message(self, message: PhotonMessage) -> List[dict]:
game_message = into_game_message(message) game_message = into_game_message(message)
if game_message is None: if game_message is None:
self._warn_unknown_game_message(message)
return [] return []
discovery.log( discovery.log(
'game_message', 'game_message',
@@ -50,3 +52,16 @@ class Pipeline:
discovery.log('app_event', event=event) discovery.log('app_event', event=event)
logger.debug("emitting app event: %s", event) logger.debug("emitting app event: %s", event)
return events return events
def _warn_unknown_game_message(self, message: PhotonMessage):
if message.kind == 'Event':
key = ('Event', message.code, message.params.get(252))
elif message.kind in ('Request', 'Response'):
key = (message.kind, message.code, message.params.get(253))
else:
return
if key in self._warned_unknown:
return
self._warned_unknown.add(key)
logger.warning("ignoring unknown Photon game message: kind=%s code=%s opcode=%s params=%s",
key[0], key[1], key[2], message.params)
+6 -6
View File
@@ -82,23 +82,23 @@ def run():
logger.debug("python: %s (%s)", sys.executable, sys.version) logger.debug("python: %s (%s)", sys.executable, sys.version)
logger.debug("platform: %s", platform_utils.system()) logger.debug("platform: %s", platform_utils.system())
initialization_result = initialize()
logger.debug("backend initialization result: %s", initialization_result)
conf = config() conf = config()
window_config = conf['window'] window_config = conf['window']
WIDTH = window_config['width'] WIDTH = window_config['width']
HEIGHT = window_config['height'] HEIGHT = window_config['height']
app = QApplication(app_argv)
QtCore.qInstallMessageHandler(_qt_message_handler)
_install_heartbeat(app)
perms_ok = True perms_ok = True
if platform_utils.is_linux(): if platform_utils.is_linux():
perms_ok = capture_permissions_ok() perms_ok = capture_permissions_ok()
logger.debug("capture permissions probe: %s", perms_ok) logger.debug("capture permissions probe: %s", perms_ok)
app = QApplication(app_argv) initialization_result = initialize()
QtCore.qInstallMessageHandler(_qt_message_handler) logger.debug("backend initialization result: %s", initialization_result)
_install_heartbeat(app)
app.setStyleSheet(style) app.setStyleSheet(style)
+118 -61
View File
@@ -9,7 +9,6 @@ from PySide6.QtWidgets import QFrame # type: ignore
from PySide6.QtWidgets import QGridLayout # type: ignore from PySide6.QtWidgets import QGridLayout # type: ignore
from PySide6.QtWidgets import QHBoxLayout # type: ignore from PySide6.QtWidgets import QHBoxLayout # type: ignore
from PySide6.QtWidgets import QLabel # type: ignore from PySide6.QtWidgets import QLabel # type: ignore
from PySide6.QtWidgets import QListView # type: ignore
from PySide6.QtWidgets import QPushButton # type: ignore from PySide6.QtWidgets import QPushButton # type: ignore
from PySide6.QtWidgets import QScrollArea # type: ignore from PySide6.QtWidgets import QScrollArea # type: ignore
from PySide6.QtWidgets import QVBoxLayout # type: ignore from PySide6.QtWidgets import QVBoxLayout # type: ignore
@@ -139,7 +138,7 @@ class StatCard(QFrame):
self.setLayout(self.layout) self.setLayout(self.layout)
def update_value(self, value): def update_value(self, value):
self.value.setText(str(value)) _set_text(self.value, str(value))
class HeaderBar(QWidget): class HeaderBar(QWidget):
@@ -158,9 +157,11 @@ class HeaderBar(QWidget):
def update_status(self): def update_status(self):
if engine.is_ready(): if engine.is_ready():
self.status.setText('Tracking live Albion Online traffic') _set_text(self.status, 'Tracking live Albion Online traffic')
else: else:
self.status.setText('Waiting for zone change to identify your character') _set_text(
self.status,
'Waiting for zone change to identify your character')
class ItemsPanel(QFrame): class ItemsPanel(QFrame):
@@ -181,20 +182,25 @@ class ItemsPanel(QFrame):
self.list.update(items) self.list.update(items)
class PlainStatsListView(QListView): class PlainStatsListView(QLabel):
def __init__(self): def __init__(self):
QListView.__init__(self) QLabel.__init__(self)
self.model = QtGui.QStandardItemModel(self) self._last_text = None
self.setModel(self.model) self.setObjectName('MutedText')
self.setAlignment(Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft)
self.setWordWrap(True)
def update(self, items): def update(self, items):
self.model.clear() if not items:
for item in items: text = 'No entries yet.'
row = QtGui.QStandardItem( else:
f'{item.name} {item.value} ({item.percentage}%)') text = '\n'.join(
row.setFlags(row.flags() & ~Qt.ItemIsSelectable) f'{item.name} {item.value} ({item.percentage}%)'
row.setForeground(QtGui.QBrush(QtGui.QColor('#d8dbe2'))) for item in items)
self.model.appendRow(row) if text == self._last_text:
return
self._last_text = text
self.setText(text)
class SettingsPanel(QWidget): class SettingsPanel(QWidget):
@@ -244,6 +250,8 @@ class MainWidget(QWidget):
self.clipboard = clipboard self.clipboard = clipboard
self.current_page = Page.Overview self.current_page = Page.Overview
self.current_scope = StatsType.ZONE self.current_scope = StatsType.ZONE
self._layout_key = None
self._last_snapshot = None
self.root_layout = QHBoxLayout() self.root_layout = QHBoxLayout()
self.root_layout.setContentsMargins(0, 0, 0, 0) self.root_layout.setContentsMargins(0, 0, 0, 0)
@@ -314,7 +322,7 @@ class MainWidget(QWidget):
self.refresh() self.refresh()
timer = QTimer(self) timer = QTimer(self)
timer.timeout.connect(self.refresh) timer.timeout.connect(self.refresh)
timer.start(500) timer.start(1000)
def set_page(self, page): def set_page(self, page):
self.current_page = page self.current_page = page
@@ -330,6 +338,12 @@ class MainWidget(QWidget):
silver = self.silver_stats() silver = self.silver_stats()
items = self.item_stats() items = self.item_stats()
snapshot = self._snapshot(
players, total_healing, silver, items, fame_stat, elapsed)
if snapshot == self._last_snapshot:
return
self._last_snapshot = snapshot
self.header.update_status() self.header.update_status()
self.elapsed_card.update_value(self._format_time(elapsed)) self.elapsed_card.update_value(self._format_time(elapsed))
self.fame_card.update_value(fame_stat.fame) self.fame_card.update_value(fame_stat.fame)
@@ -337,7 +351,22 @@ class MainWidget(QWidget):
self.ready_card.update_value('Ready' if engine.is_ready() else 'Not ready') self.ready_card.update_value('Ready' if engine.is_ready() else 'Not ready')
self.items_panel.update(items) self.items_panel.update(items)
self._set_page_copy(players, total_healing, silver, items) self._ensure_page_layout()
self._update_page_data(players, total_healing, silver, items)
def _snapshot(self, players, total_healing, silver, items, fame_stat, elapsed):
return (
self.current_page,
self.current_scope,
engine.is_ready(),
self._format_time(elapsed),
str(fame_stat.fame),
str(fame_stat.fame_per_hour),
_list_signature(players),
_list_signature(total_healing),
_list_signature(silver),
_list_signature(items),
)
def primary_stats(self): def primary_stats(self):
stat_kind = { stat_kind = {
@@ -379,71 +408,82 @@ class MainWidget(QWidget):
} }
return getters[self.current_scope]() return getters[self.current_scope]()
def _set_page_copy(self, players, total_healing, silver, items): def _ensure_page_layout(self):
self.primary_list.hide() layout_key = (self.current_page, self.current_scope)
self.plain_list.hide() if layout_key == self._layout_key:
self.primary_label.hide() return
self.total_healing_label.hide() self._layout_key = layout_key
self.total_healing_list.hide()
self.placeholder.hide() _set_visible(self.primary_list, False)
self.settings_panel.hide() _set_visible(self.plain_list, False)
_set_visible(self.primary_label, False)
_set_visible(self.total_healing_label, False)
_set_visible(self.total_healing_list, False)
_set_visible(self.placeholder, False)
_set_visible(self.settings_panel, False)
if self.current_page == Page.Overview: if self.current_page == Page.Overview:
self.page_title.setText('Overview') _set_text(self.page_title, 'Overview')
self.page_description.setText( _set_text(self.page_description,
'A quick session summary for the selected scope. Use the left menu to inspect damage, healing, economy, and loot in more detail.') 'A quick session summary for the selected scope. Use the left menu to inspect damage, healing, economy, and loot in more detail.')
self.primary_label.setText('Top Damage Dealers') _set_text(self.primary_label, 'Top Damage Dealers')
self.primary_label.show() _set_visible(self.primary_label, True)
self.primary_list.show() _set_visible(self.primary_list, True)
self.primary_list.update(players)
return return
if self.current_page == Page.Damage: if self.current_page == Page.Damage:
self.page_title.setText('Damage Done') _set_text(self.page_title, 'Damage Done')
self.page_description.setText( _set_text(self.page_description,
'Damage attributed to each visible tracked player during the selected scope. DPS is based on combat time.') 'Damage attributed to each visible tracked player during the selected scope. DPS is based on combat time.')
self.primary_label.setText('Damage by Player') _set_text(self.primary_label, 'Damage by Player')
self.primary_label.show() _set_visible(self.primary_label, True)
self.primary_list.show() _set_visible(self.primary_list, True)
self.primary_list.update(players)
return return
if self.current_page == Page.Healing: if self.current_page == Page.Healing:
self.page_title.setText('Healing Done') _set_text(self.page_title, 'Healing Done')
self.page_description.setText( _set_text(self.page_description,
'Combat healing counts healing during fights. Total healing includes self-healing and post-fight recovery.') 'Combat healing counts healing during fights. Total healing includes self-healing and post-fight recovery.')
self.primary_label.setText('Combat Healing') _set_text(self.primary_label, 'Combat Healing')
self.primary_label.show() _set_visible(self.primary_label, True)
self.primary_list.show() _set_visible(self.primary_list, True)
self.primary_list.update(players) _set_visible(self.total_healing_label, True)
self.total_healing_label.show() _set_visible(self.total_healing_list, True)
self.total_healing_list.show()
self.total_healing_list.update(total_healing)
return return
if self.current_page == Page.Economy: if self.current_page == Page.Economy:
self.page_title.setText('Economy') _set_text(self.page_title, 'Economy')
self.page_description.setText( _set_text(self.page_description,
'Silver tracking is active with conservative packet filters. Looted Silver and Other Silver are separated for validation against your next capture.') 'Silver tracking is active with conservative packet filters. Looted Silver and Other Silver are separated for validation against your next capture.')
self.primary_label.setText('Silver Gained') _set_text(self.primary_label, 'Silver Gained')
self.primary_label.show() _set_visible(self.primary_label, True)
self.plain_list.show() _set_visible(self.plain_list, True)
self.plain_list.update(silver)
return return
if self.current_page == Page.Items: if self.current_page == Page.Items:
self.page_title.setText('Items Collected') _set_text(self.page_title, 'Items Collected')
self.page_description.setText( _set_text(self.page_description,
'Collected item quantities from item pickup packets. The right panel shows selected-scope item totals on every page.') 'Collected item quantities from item pickup packets. The right panel shows selected-scope item totals on every page.')
self.primary_label.setText('Items by Quantity') _set_text(self.primary_label, 'Items by Quantity')
self.primary_label.show() _set_visible(self.primary_label, True)
self.plain_list.show() _set_visible(self.plain_list, True)
self.plain_list.update(items)
return return
self.page_title.setText('Settings') _set_text(self.page_title, 'Settings')
self.page_description.setText('Reset scopes, view app information, and configure dashboard behavior.') _set_text(self.page_description,
self.settings_panel.show() 'Reset scopes, view app information, and configure dashboard behavior.')
_set_visible(self.settings_panel, True)
def _update_page_data(self, players, total_healing, silver, items):
if self.current_page in (Page.Overview, Page.Damage):
self.primary_list.update(players)
elif self.current_page == Page.Healing:
self.primary_list.update(players)
self.total_healing_list.update(total_healing)
elif self.current_page == Page.Economy:
self.plain_list.update(silver)
elif self.current_page == Page.Items:
self.plain_list.update(items)
def _format_time(self, seconds): def _format_time(self, seconds):
seconds = int(seconds or 0) seconds = int(seconds or 0)
@@ -453,3 +493,20 @@ class MainWidget(QWidget):
if hours: if hours:
return f'{hours}h {minutes}m {remainder}s' return f'{hours}h {minutes}m {remainder}s'
return f'{minutes}m {remainder}s' return f'{minutes}m {remainder}s'
def _set_text(widget, text):
if widget.text() != text:
widget.setText(text)
def _set_visible(widget, visible):
if widget.isVisible() != visible:
widget.setVisible(visible)
def _list_signature(items):
return tuple(
(item.name, str(item.value), str(item.value_per_second),
str(item.percentage), item.combat_state)
for item in items)
+32 -148
View File
@@ -1,163 +1,47 @@
import collections
import functools
import re
from typing import List from typing import List
from PySide6 import QtCore # type: ignore
from PySide6 import QtGui # type: ignore
from PySide6.QtCore import Qt # type: ignore from PySide6.QtCore import Qt # type: ignore
from PySide6.QtGui import QStandardItem # type: ignore
from PySide6.QtGui import QStandardItemModel # type: ignore
from PySide6.QtWidgets import QApplication # type: ignore
from PySide6.QtWidgets import QComboBox # type: ignore
from PySide6.QtWidgets import QHBoxLayout # type: ignore
from PySide6.QtWidgets import QLabel # type: ignore from PySide6.QtWidgets import QLabel # type: ignore
from PySide6.QtWidgets import QListView # type: ignore
from PySide6.QtWidgets import QMessageBox # type: ignore
from PySide6.QtWidgets import QProgressBar # type: ignore
from PySide6.QtWidgets import QPushButton # type: ignore
from PySide6.QtWidgets import QVBoxLayout # type: ignore
from .....stats.list_item import PlayerListItem from .....stats.list_item import PlayerListItem
from .....utils import assets
from .....utils import names
from .....utils import weapon
Style = collections.namedtuple('Style', ['bg', 'fg'])
enchant_re = re.compile(r"(.*)@(\d+)")
def map_name(name): class ListItemView(QLabel):
match = enchant_re.match(name)
if match:
return names.map_name(match[1])
return names.map_name(name)
def player_style(items):
weapon_type = weapon.get_weapon_type(items)
if weapon_type == weapon.WeaponType.Arcane:
return Style(bg='#f032e6', fg='#ffffff')
elif weapon_type == weapon.WeaponType.Axe:
return Style(bg='#800000', fg='#7fffff')
elif weapon_type == weapon.WeaponType.Bow:
return Style(bg='#469990', fg='#ED9247')
elif weapon_type == weapon.WeaponType.Crossbow:
return Style(bg='#000075', fg='#ffff8a')
elif weapon_type == weapon.WeaponType.Curse:
return Style(bg='#911eb4', fg='#6ee14b')
elif weapon_type == weapon.WeaponType.Dagger:
return Style(bg='#4d5f20', fg='#ffffff')
elif weapon_type == weapon.WeaponType.Fire:
return Style(bg='#e6194B', fg='#4763ED')
elif weapon_type == weapon.WeaponType.Frost:
return Style(bg='#4363d8', fg='#eeeeee')
elif weapon_type == weapon.WeaponType.Hammer:
return Style(bg='#9A6324', fg='#2FEAED')
elif weapon_type == weapon.WeaponType.Holy:
return Style(bg='#42d4f4', fg='#bd2b0b')
elif weapon_type == weapon.WeaponType.Mace:
return Style(bg='#808000', fg='#2FEAED')
elif weapon_type == weapon.WeaponType.Nature:
return Style(bg='#3cb44b', fg='#EDC647')
elif weapon_type == weapon.WeaponType.Quarterstaff:
return Style(bg='#f58231', fg='#0a7dce')
elif weapon_type == weapon.WeaponType.Spear:
return Style(bg='#a9a9a9', fg='#18ED54')
elif weapon_type == weapon.WeaponType.Sword:
return Style(bg='#b59d00', fg='#4a62ff')
else:
return Style(bg='#42413c', fg='#bdbec3')
class ListItemView(QListView):
class Item(QtGui.QStandardItem):
def __init__(self, player, parent):
QtGui.QStandardItem .__init__(self)
self.parent = parent
self.player = player
self.update(player)
self.setFlags(self.flags() & ~Qt.ItemIsSelectable)
self.setTextAlignment(
QtCore.Qt.AlignmentFlag.AlignHCenter | QtCore.Qt.AlignmentFlag.AlignVCenter)
def update(self, player):
self.player = player
self.setText("{} {} ({}, {}%)".format(
self.player.name, self.player.value, self.player.value_per_second, self.player.percentage
))
self.refresh()
def refresh(self):
value = round(self.player.value / self.player.best_value, 2)
QRectF = QtCore.QRectF(self.parent.rect())
gradient = QtGui.QLinearGradient(
QRectF.topLeft(), QRectF.topRight())
gradient.setColorAt(value-0.001 if value > 0 else 0,
QtGui.QColor(player_style(self.player.items).bg))
gradient.setColorAt(value, QtGui.QColor('#000000'))
gradient.setColorAt(value+0.001 if value <
1 else 1, QtGui.QColor('#000000'))
brush = QtGui.QBrush(gradient)
self.setBackground(brush)
brush_fg = QtGui.QBrush(QtGui.QColor(
player_style(self.player.items).fg))
self.setForeground(brush_fg)
self.setToolTip('\n'.join(
[f'{k}: {map_name(v)}' for (k, v) in self.player.items.items() if v]))
class SortProxyModel(QtCore.QSortFilterProxyModel):
def lessThan(self, left, right):
l = self.sourceModel().item(left.row())
r = self.sourceModel().item(right.row())
return l.player.percentage < r.player.percentage
class ItemModel(QStandardItemModel):
def __init__(self, view):
QStandardItemModel .__init__(self, view)
def __init__(self): def __init__(self):
QListView .__init__(self) QLabel.__init__(self)
self.setIconSize(QtCore.QSize(20, 20)) self._last_signature = None
self.model = self.ItemModel(self) self._players: List[PlayerListItem] = []
self.proxy = self.SortProxyModel() self.setAlignment(Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft)
self.proxy.setSourceModel(self.model) self.setWordWrap(True)
self.setText('No entries yet.')
self.setModel(self.proxy)
def update(self, players: List[PlayerListItem]): def update(self, players: List[PlayerListItem]):
if not players: sorted_players = sorted(players, key=lambda p: p.value, reverse=True)
self.model.clear() signature = tuple(_player_signature(p) for p in sorted_players)
if signature == self._last_signature:
return return
self._last_signature = signature
self._players = sorted_players
visible_names = [] if not sorted_players:
for player in players: self.setText('No entries yet.')
items = (self.model.item(i) for i in range(self.model.rowCount())) return
found = next( self.setText('\n'.join(_player_line(p) for p in sorted_players))
(i for i in items if i.player.name == player.name), None)
if found:
found.update(player)
else:
self.model.appendRow(self.Item(player, self))
visible_names.append(player.name)
for i in range(self.model.rowCount()):
item = self.model.item(i)
if hasattr(item, 'player') and hasattr(item.player, 'name') and item.player.name not in visible_names:
self.model.removeRow(i)
self.proxy.sort(0, QtCore.Qt.DescendingOrder)
def get_player_list_items(self) -> List[PlayerListItem]: def get_player_list_items(self) -> List[PlayerListItem]:
return sorted( return list(self._players)
[self.model.item(i).player for i in range(self.model.rowCount())],
key=lambda i: i.value,
reverse=True) def _player_signature(player: PlayerListItem):
return (
player.name,
str(player.value),
str(player.value_per_second),
str(player.percentage),
player.combat_state,
)
def _player_line(player: PlayerListItem):
return "{} {} ({}, {}%)".format(
player.name, player.value, player.value_per_second, player.percentage)