- teams += self.FORMATTER_REPLAY_TEAM2.format(
- players=players,
- )
- else: # just row on
- teams += players
-
- if len(self.teams) == 2 and i == 1: # add the 'vs'
- teams += (
- "| "
- "VS | "
- )
-
- # prepare the package to 'fit in' with its s
- if len(self.teams) == 2:
- teams = " | {}
".format(teams)
-
- self.replayInfo = self.FORMATTER_REPLAY_INFORMATION.format(
- uid=self.uid, teams=teams,
- )
-
- if self.isSelected():
- self.parent.replayInfos.clear()
- self.resize()
- self.parent.replayInfos.setHtml(self.replayInfo)
-
- def generatePlayerHTML(self, i, player):
- if i == 2 and len(self.teams) == 2:
- alignment = "right"
- else:
- alignment = "left"
-
- if "login" not in player["player"]:
- player["player"]["login"] = "No data"
-
- playerRating = int(
- round((player["beforeMean"] - player["beforeDeviation"] * 3) / 100)
- * 100,
- )
- playerLabel = self.FORMATTER_REPLAY_PLAYER_LABEL.format(
- player_name=player["player"]["login"],
- player_rating=playerRating,
- alignment=alignment,
- )
-
- iconPath = os.path.join(
- util.COMMON_DIR,
- "replays/{}.png".format(
- self.retrieveIconFaction(player, self.mod),
- ),
- )
- iconUrl = QtCore.QUrl.fromLocalFile(iconPath).url()
-
- playerIcon = self.FORMATTER_REPLAY_PLAYER_ICON.format(
- faction_icon_uri=iconUrl,
+ scoreboard = Scoreboard(
+ self.mod, self.winner, self.spoiled,
+ self.duration, self.teamWin, self.uid, self.teams,
)
-
- if self.spoiled and not self.mod == "ladder1v1":
- playerScore = self.FORMATTER_REPLAY_PLAYER_SCORE.format(
- player_score=player["score"],
- )
- else: # no score for ladder
- playerScore = self.FORMATTER_REPLAY_PLAYER_SCORE.format(
- player_score=" ",
- )
-
- return alignment, playerIcon, playerLabel, playerScore
-
- @staticmethod
- def retrieveIconFaction(player, mod):
- if "faction" in player:
- if player["faction"] == 1:
- faction = "UEF"
- elif player["faction"] == 2:
- faction = "Aeon"
- elif player["faction"] == 3:
- faction = "Cybran"
- elif player["faction"] == 4:
- faction = "Seraphim"
- elif player["faction"] == 5:
- if mod == "nomads":
- faction = "Nomads"
- else:
- faction = "Random"
- elif player["faction"] == 6:
- if mod == "nomads":
- faction = "Random"
- else:
- faction = "Broken"
- else:
- faction = "Broken"
- else:
- faction = "Missing"
- return faction
-
- def resize(self):
- if self.isSelected():
- if self.extraInfoWidth == 0 or self.extraInfoHeight == 0:
- if len(self.teams) == 1: # ladder, FFA
- self.extraInfoWidth = 275
- # + 1 -> second title
- self.extraInfoHeight = 75 + (self.numberplayers + 1) * 25
- elif len(self.teams) == 2: # Team vs Team
- self.extraInfoWidth = 500
- self.extraInfoHeight = 75 + self.biggestTeam * 22
- else: # FAF
- self.extraInfoWidth = 275
- self.extraInfoHeight = (
- 75 + (self.numberplayers + len(self.teams)) * 25
- )
-
- self.parent.replayInfos.setMinimumWidth(self.extraInfoWidth)
- self.parent.replayInfos.setMaximumWidth(600)
-
- self.parent.replayInfos.setMinimumHeight(self.extraInfoHeight)
- self.parent.replayInfos.setMaximumHeight(self.extraInfoHeight)
+ scoreboard.setup()
+ return scoreboard
def pressed(self, item):
menu = QtWidgets.QMenu(self.parent)
From 7674f4dd7f15e48f507c7dd1afbc3160a30bf416 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Wed, 17 Jul 2024 02:13:26 +0300
Subject: [PATCH 39/73] Fix replay tree widget's mouse clicks
---
src/replays/_replayswidget.py | 9 ++++++---
src/replays/replayitem.py | 5 +++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/replays/_replayswidget.py b/src/replays/_replayswidget.py
index 4f1d540e7..fc9533858 100644
--- a/src/replays/_replayswidget.py
+++ b/src/replays/_replayswidget.py
@@ -9,6 +9,7 @@
from PyQt6.QtNetwork import QNetworkAccessManager
from PyQt6.QtNetwork import QNetworkReply
from PyQt6.QtNetwork import QNetworkRequest
+from PyQt6.QtWidgets import QTreeWidgetItem
import client
import fa
@@ -902,10 +903,12 @@ def add_scoreboard(self, item: ReplayItem) -> None:
self._w.replayScoreLayout.addWidget(scoreboard)
self.adjust_scoreboard_size(scoreboard.width(), scoreboard.height())
- def online_tree_clicked(self, item: ReplayItem) -> None:
+ def online_tree_clicked(self, item: ReplayItem | QTreeWidgetItem) -> None:
+ if not isinstance(item, ReplayItem):
+ return
+
if QtWidgets.QApplication.mouseButtons() == QtCore.Qt.MouseButton.RightButton:
- if isinstance(item.parent, ReplaysWidget): # FIXME - hack
- item.pressed(item)
+ item.pressed()
else:
self.selectedReplay = item
self.add_scoreboard(item)
diff --git a/src/replays/replayitem.py b/src/replays/replayitem.py
index 055a268a8..69261ae40 100644
--- a/src/replays/replayitem.py
+++ b/src/replays/replayitem.py
@@ -17,6 +17,7 @@
from PyQt6.QtCore import QSize
from PyQt6.QtCore import Qt
from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtGui import QAction
from PyQt6.QtGui import QIcon
from PyQt6.QtGui import QPainter
from PyQt6.QtGui import QPen
@@ -774,9 +775,9 @@ def generate_scoreboard(self) -> Scoreboard:
scoreboard.setup()
return scoreboard
- def pressed(self, item):
+ def pressed(self) -> None:
menu = QtWidgets.QMenu(self.parent)
- actionDownload = QtWidgets.QAction("Download replay", menu)
+ actionDownload = QAction("Download replay", menu)
actionDownload.triggered.connect(self.downloadReplay)
menu.addAction(actionDownload)
menu.popup(QtGui.QCursor.pos())
From 23f6a01ee585135c41f9f03323d586f1f4cbd542 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Thu, 18 Jul 2024 21:03:28 +0300
Subject: [PATCH 40/73] Create Rating named tuple
and move all the "mean - 3 * devaition" calculations into 1 place
---
src/model/player.py | 4 +++-
src/model/rating.py | 9 +++++++++
src/playercard/playerinfodialog.py | 3 ++-
src/replays/replayitem.py | 25 +++++++++++++++++++++----
4 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/model/player.py b/src/model/player.py
index 407edc29d..db76163f8 100644
--- a/src/model/player.py
+++ b/src/model/player.py
@@ -1,6 +1,7 @@
from PyQt6.QtCore import pyqtSignal
from model.modelitem import ModelItem
+from model.rating import Rating
from model.rating import RatingType
from model.transaction import transactional
@@ -99,7 +100,8 @@ def rating_estimate(self, rating_type=RatingType.GLOBAL.value):
try:
mean = self.ratings[rating_type]["rating"][0]
deviation = self.ratings[rating_type]["rating"][1]
- return int(max(0, (mean - 3 * deviation)))
+ rating = Rating(mean, deviation)
+ return int(max(0, rating.displayed()))
except (KeyError, IndexError):
return 0
diff --git a/src/model/rating.py b/src/model/rating.py
index 83fea2913..254df8b2c 100644
--- a/src/model/rating.py
+++ b/src/model/rating.py
@@ -1,6 +1,7 @@
# TODO: fetch this from API
from enum import Enum
+from typing import NamedTuple
# copied from the server code according to which
# this will need be fixed when the database
@@ -39,3 +40,11 @@ def fromRatingType(ratingTypeName):
if ratingTypeName.replace("_", "") == matchmakerQueue.value:
return matchmakerQueue.value
return MatchmakerQueueType.LADDER.value
+
+
+class Rating(NamedTuple):
+ mean: float
+ deviation: float
+
+ def displayed(self) -> float:
+ return self.mean - 3 * self.deviation
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index 8aa4b37b6..5e1a5805e 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -36,6 +36,7 @@
from api.stats_api import PlayerEventApiAccessor
from downloadManager import AvatarDownloader
from downloadManager import DownloadRequest
+from model.rating import Rating
from playercard.statistics import StatsCharts
from src.playercard.leagueformatter import LegueFormatter
@@ -335,7 +336,7 @@ def get_plot_series(self, ratings: list[LeaderboardRatingJournal]) -> LineSeries
score_time = QDateTime.fromString(entry.player_stats.score_time, Qt.DateFormat.ISODate)
series.append(
score_time.toSecsSinceEpoch(),
- entry.mean_after - 3 * entry.deviation_after,
+ Rating(entry.mean_after, entry.deviation_after).displayed(),
)
return series
diff --git a/src/replays/replayitem.py b/src/replays/replayitem.py
index 69261ae40..346076cb3 100644
--- a/src/replays/replayitem.py
+++ b/src/replays/replayitem.py
@@ -36,6 +36,7 @@
from downloadManager import DownloadRequest
from fa import maps
from games.moditem import mods
+from model.rating import Rating
from util.qt import qpainter
from util.qt_list_model import QtListModel
@@ -77,16 +78,32 @@ def rating_before(self) -> int:
# at any time and 'ratingChanges' can be absent if game result is
# undefined
if self.rating_stats is not None:
- return round(self.rating_stats["meanBefore"] - self.rating_stats["deviationBefore"] * 3)
+ rating = Rating(
+ self.rating_stats["meanBefore"],
+ self.rating_stats["deviationBefore"],
+ )
+ return round(rating.displayed())
elif self.player.get("beforeMean") and self.player.get("beforeDeviation"):
- return round(self.player["beforeMean"] - self.player["beforeDeviation"] * 3)
+ rating = Rating(
+ self.player["beforeMean"],
+ self.player["beforeDeviation"],
+ )
+ return round(rating.displayed())
return 0
def rating_after(self) -> int:
if self.rating_stats is not None:
- return round(self.rating_stats["meanAfter"] - self.rating_stats["deviationAfter"] * 3)
+ rating = Rating(
+ self.rating_stats["meanAfter"],
+ self.rating_stats["deviationAfter"],
+ )
+ return round(rating.displayed())
elif self.player.get("afterMean") and self.player.get("afterDeviation"):
- return round(self.player["afterMean"] - self.player["afterDeviation"] * 3)
+ rating = Rating(
+ self.player["afterMean"],
+ self.player["afterDeviation"],
+ )
+ return round(rating.displayed())
return 0
def rating(self) -> int | None:
From f8cd6785e19855d14c7afaefd27859e6c8eade89 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Fri, 19 Jul 2024 04:57:29 +0300
Subject: [PATCH 41/73] Move common style item delegates' methods into
superclass
---
src/chat/chatter_model.py | 18 +++----------
src/games/gameitem.py | 12 +++------
src/qt/itemviews/tableitemdelegte.py | 9 ++-----
src/replays/replayitem.py | 40 +++++++++++-----------------
src/util/qtstyleditemdelegate.py | 24 +++++++++++++++++
5 files changed, 49 insertions(+), 54 deletions(-)
create mode 100644 src/util/qtstyleditemdelegate.py
diff --git a/src/chat/chatter_model.py b/src/chat/chatter_model.py
index 36b69e5a5..62a37f364 100644
--- a/src/chat/chatter_model.py
+++ b/src/chat/chatter_model.py
@@ -21,6 +21,7 @@
from model.game import GameState
from model.rating import RatingType
from util.qt_list_model import QtListModel
+from util.qtstyleditemdelegate import QtStyledItemDelegate
class ChatterModel(QtListModel):
@@ -335,9 +336,9 @@ def nick_tooltip(self, data):
return self.country_tooltip(data)
-class ChatterItemDelegate(QtWidgets.QStyledItemDelegate):
+class ChatterItemDelegate(QtStyledItemDelegate):
def __init__(self, layout, formatter):
- QtWidgets.QStyledItemDelegate.__init__(self)
+ QtStyledItemDelegate.__init__(self)
self.layout = layout
self._formatter = formatter
@@ -376,13 +377,6 @@ def paint(self, painter, option, index):
painter.restore()
- def _draw_clear_option(self, painter, option):
- option.icon = QtGui.QIcon()
- option.text = ""
- option.widget.style().drawControl(
- QtWidgets.QStyle.ControlElement.CE_ItemViewItem, option, painter, option.widget,
- )
-
def _handle_highlight(
self,
painter: QtGui.QPainter,
@@ -395,7 +389,7 @@ def _draw_nick(self, painter: QtGui.QPainter, data: ChatterModelItem) -> None:
text = self._formatter.chatter_name(data)
color = QColor(self._formatter.chatter_color(data))
clip = QRect(self.layout.sizes[ChatterLayoutElements.NICK])
- text = self._get_elided_text(painter, text, clip.width())
+ text = self._get_elided_text(painter, text, width=clip.width())
painter.save()
pen = painter.pen()
@@ -406,10 +400,6 @@ def _draw_nick(self, painter: QtGui.QPainter, data: ChatterModelItem) -> None:
painter.restore()
- def _get_elided_text(self, painter: QtGui.QPainter, text: str, width: int) -> str:
- metrics = painter.fontMetrics()
- return metrics.elidedText(text, Qt.TextElideMode.ElideRight, width)
-
def _draw_status(self, painter, data):
status = self._formatter.chatter_status(data)
icon = util.THEME.icon("chat/status/{}.png".format(status))
diff --git a/src/games/gameitem.py b/src/games/gameitem.py
index 0d89a848b..549d113f7 100644
--- a/src/games/gameitem.py
+++ b/src/games/gameitem.py
@@ -8,6 +8,7 @@
import util
from fa import maps
+from util.qtstyleditemdelegate import QtStyledItemDelegate
class GameView(QtCore.QObject):
@@ -38,7 +39,7 @@ def _game_double_clicked(self, idx):
self.game_double_clicked.emit(idx.data().game)
-class GameItemDelegate(QtWidgets.QStyledItemDelegate):
+class GameItemDelegate(QtStyledItemDelegate):
ICON_RECT = 100
ICON_CLIP_TOP_LEFT = 3
ICON_CLIP_BOTTOM_RIGHT = -7
@@ -54,7 +55,7 @@ class GameItemDelegate(QtWidgets.QStyledItemDelegate):
PADDING = 10
def __init__(self, formatter):
- QtWidgets.QStyledItemDelegate.__init__(self)
+ QtStyledItemDelegate.__init__(self)
self._formatter = formatter
self.tooltip_filter = GameTooltipFilter(self._formatter)
@@ -73,13 +74,6 @@ def paint(self, painter, option, index):
painter.restore()
- def _draw_clear_option(self, painter, option):
- option.icon = QtGui.QIcon()
- option.text = ""
- option.widget.style().drawControl(
- QtWidgets.QStyle.ControlElement.CE_ItemViewItem, option, painter, option.widget,
- )
-
def _draw_icon_shadow(self, painter, option):
painter.fillRect(
option.rect.left() + self.ICON_SHADOW_OFFSET,
diff --git a/src/qt/itemviews/tableitemdelegte.py b/src/qt/itemviews/tableitemdelegte.py
index b5c7ded05..ec1140f78 100644
--- a/src/qt/itemviews/tableitemdelegte.py
+++ b/src/qt/itemviews/tableitemdelegte.py
@@ -2,14 +2,14 @@
from PyQt6.QtCore import Qt
from PyQt6.QtGui import QPainter
from PyQt6.QtWidgets import QStyle
-from PyQt6.QtWidgets import QStyledItemDelegate
from PyQt6.QtWidgets import QStyleOptionViewItem
from PyQt6.QtWidgets import QTableView
from util.qt import qpainter
+from util.qtstyleditemdelegate import QtStyledItemDelegate
-class TableItemDelegate(QStyledItemDelegate):
+class TableItemDelegate(QtStyledItemDelegate):
"""
Highlights the entire row on mouse hover when table's
SelectionBehavior is set to SelectRows
@@ -42,11 +42,6 @@ def _customize_style_option(
self.initStyleOption(opt, index)
return opt
- def _draw_clear_option(self, painter: QPainter, option: QStyleOptionViewItem) -> None:
- option.text = ""
- control_element = QStyle.ControlElement.CE_ItemViewItem
- option.widget.style().drawControl(control_element, option, painter, option.widget)
-
def _set_pen(self, painter: QPainter, option: QStyleOptionViewItem) -> None:
if option.state & QStyle.StateFlag.State_Selected:
painter.setPen(Qt.GlobalColor.white)
diff --git a/src/replays/replayitem.py b/src/replays/replayitem.py
index 346076cb3..ecdf7ca0c 100644
--- a/src/replays/replayitem.py
+++ b/src/replays/replayitem.py
@@ -25,7 +25,6 @@
from PyQt6.QtWidgets import QLabel
from PyQt6.QtWidgets import QLayout
from PyQt6.QtWidgets import QListView
-from PyQt6.QtWidgets import QStyle
from PyQt6.QtWidgets import QStyledItemDelegate
from PyQt6.QtWidgets import QStyleOptionViewItem
from PyQt6.QtWidgets import QVBoxLayout
@@ -39,6 +38,7 @@
from model.rating import Rating
from util.qt import qpainter
from util.qt_list_model import QtListModel
+from util.qtstyleditemdelegate import QtStyledItemDelegate
class GameResult(Enum):
@@ -164,9 +164,9 @@ def add_player(self, player: dict) -> None:
self._add_item(player, player["player"]["id"])
-class ScoreboardItemDelegate(QStyledItemDelegate):
+class ScoreboardItemDelegate(QtStyledItemDelegate):
def __init__(self) -> None:
- QStyledItemDelegate.__init__(self)
+ QtStyledItemDelegate.__init__(self)
self._row_height = 22
def row_height(self) -> int:
@@ -208,24 +208,25 @@ def _draw_icon(
return icon_rect
def _draw_nick_and_rating(
- self,
- painter: QPainter,
- rect: QRect,
- player_data: ScoreboardModelItem,
- alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
+ self,
+ painter: QPainter,
+ rect: QRect,
+ player_data: ScoreboardModelItem,
+ alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
) -> QRect:
rating = player_data.rating()
rating_str = f"{rating}" if rating is not None else "???"
- text = self._get_elided_text(painter, f"{player_data.login()} ({rating_str})", rect.width())
- painter.drawText(rect, alignment, text)
+ text = f"{player_data.login()} ({rating_str})"
+ elided = self._get_elided_text(painter, text, width=rect.width())
+ painter.drawText(rect, alignment, elided)
return rect
def _draw_rating_change(
- self,
- painter: QPainter,
- rect: QRect,
- player_data: ScoreboardModelItem,
- alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
+ self,
+ painter: QPainter,
+ rect: QRect,
+ player_data: ScoreboardModelItem,
+ alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
) -> QRect:
change = player_data.rating_change()
rating_change_rect = QRect(rect)
@@ -242,11 +243,6 @@ def _draw_rating_change(
painter.drawText(rating_change_rect, Qt.AlignmentFlag.AlignCenter, f"{change:+}")
return rating_change_rect
- def _draw_clear_option(self, painter: QPainter, option: QStyleOptionViewItem) -> None:
- option.text = ""
- control_element = QStyle.ControlElement.CE_ItemViewItem
- option.widget.style().drawControl(control_element, option, painter, option.widget)
-
def _shrink_rect_along(
self,
rect: QRect,
@@ -263,10 +259,6 @@ def _shrink_rect_along(
adjustments[index] = adjustment * direction
return rect.adjusted(*adjustments)
- def _get_elided_text(self, painter: QPainter, text: str, width: int) -> str:
- metrics = painter.fontMetrics()
- return metrics.elidedText(text, Qt.TextElideMode.ElideRight, width)
-
def paint(self, painter: QPainter, option: QStyleOptionViewItem, index: QModelIndex) -> None:
player_data: ScoreboardModelItem = index.data()
team_model: ScoreboardModel = index.model()
diff --git a/src/util/qtstyleditemdelegate.py b/src/util/qtstyleditemdelegate.py
new file mode 100644
index 000000000..924a587a3
--- /dev/null
+++ b/src/util/qtstyleditemdelegate.py
@@ -0,0 +1,24 @@
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QIcon
+from PyQt6.QtGui import QPainter
+from PyQt6.QtWidgets import QStyle
+from PyQt6.QtWidgets import QStyledItemDelegate
+from PyQt6.QtWidgets import QStyleOptionViewItem
+
+
+class QtStyledItemDelegate(QStyledItemDelegate):
+ def _get_elided_text(
+ self,
+ painter: QPainter,
+ text: str,
+ mode: Qt.TextElideMode = Qt.TextElideMode.ElideRight,
+ width: int = 0,
+ ) -> str:
+ metrics = painter.fontMetrics()
+ return metrics.elidedText(text, mode, width)
+
+ def _draw_clear_option(self, painter: QPainter, option: QStyleOptionViewItem) -> None:
+ option.icon = QIcon()
+ option.text = ""
+ control_element = QStyle.ControlElement.CE_ItemViewItem
+ option.widget.style().drawControl(control_element, option, painter, option.widget)
From c1cb73c525bcec7e6391637e66e604ae6711fe6b Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 20 Jul 2024 09:45:40 +0300
Subject: [PATCH 42/73] Move some qt related things into dedicated folder
---
src/chat/channel_widget.py | 2 +-
src/chat/chatter_model.py | 8 ++++----
src/coop/_coopwidget.py | 2 +-
src/coop/cooptableitemdelegate.py | 2 +-
src/downloadManager/__init__.py | 2 +-
src/fa/game_updater/patcher.py | 2 +-
src/games/gameitem.py | 6 +++---
src/games/gamemodel.py | 2 +-
.../itemviews/styleditemdelegate.py} | 2 +-
src/qt/itemviews/tableitemdelegte.py | 6 +++---
.../qt_list_model.py => qt/models/qtlistmodel.py} | 0
src/{util/qt.py => qt/utils.py} | 0
src/replays/replayitem.py | 10 +++++-----
src/stats/itemviews/leaderboarditemdelegate.py | 2 +-
14 files changed, 23 insertions(+), 23 deletions(-)
rename src/{util/qtstyleditemdelegate.py => qt/itemviews/styleditemdelegate.py} (94%)
rename src/{util/qt_list_model.py => qt/models/qtlistmodel.py} (100%)
rename src/{util/qt.py => qt/utils.py} (100%)
diff --git a/src/chat/channel_widget.py b/src/chat/channel_widget.py
index a4a0af1fc..b67cea2e7 100644
--- a/src/chat/channel_widget.py
+++ b/src/chat/channel_widget.py
@@ -8,7 +8,7 @@
from PyQt6.QtGui import QTextCursor
from PyQt6.QtGui import QTextDocument
-from util.qt import monkeypatch_method
+from qt.utils import monkeypatch_method
logger = logging.getLogger(__name__)
diff --git a/src/chat/chatter_model.py b/src/chat/chatter_model.py
index 62a37f364..031505443 100644
--- a/src/chat/chatter_model.py
+++ b/src/chat/chatter_model.py
@@ -20,8 +20,8 @@
from fa import maps
from model.game import GameState
from model.rating import RatingType
-from util.qt_list_model import QtListModel
-from util.qtstyleditemdelegate import QtStyledItemDelegate
+from qt.itemviews.styleditemdelegate import StyledItemDelegate
+from qt.models.qtlistmodel import QtListModel
class ChatterModel(QtListModel):
@@ -336,9 +336,9 @@ def nick_tooltip(self, data):
return self.country_tooltip(data)
-class ChatterItemDelegate(QtStyledItemDelegate):
+class ChatterItemDelegate(StyledItemDelegate):
def __init__(self, layout, formatter):
- QtStyledItemDelegate.__init__(self)
+ StyledItemDelegate.__init__(self)
self.layout = layout
self._formatter = formatter
diff --git a/src/coop/_coopwidget.py b/src/coop/_coopwidget.py
index 01ea1a5ba..8b06f07de 100644
--- a/src/coop/_coopwidget.py
+++ b/src/coop/_coopwidget.py
@@ -27,8 +27,8 @@
from games.gamemodel import GameModel
from games.hostgamewidget import GameLauncher
from model.game import Game
+from qt.utils import qopen
from ui.busy_widget import BusyWidget
-from util.qt import qopen
if TYPE_CHECKING:
from client._clientwindow import ClientWindow
diff --git a/src/coop/cooptableitemdelegate.py b/src/coop/cooptableitemdelegate.py
index 60afc71d3..04b8c2191 100644
--- a/src/coop/cooptableitemdelegate.py
+++ b/src/coop/cooptableitemdelegate.py
@@ -5,7 +5,7 @@
from PyQt6.QtWidgets import QStyleOptionViewItem
from qt.itemviews.tableitemdelegte import TableItemDelegate
-from util.qt import qpainter
+from qt.utils import qpainter
class CoopLeaderboardItemDelegate(TableItemDelegate):
diff --git a/src/downloadManager/__init__.py b/src/downloadManager/__init__.py
index b62c1bee2..7e3387e53 100644
--- a/src/downloadManager/__init__.py
+++ b/src/downloadManager/__init__.py
@@ -19,8 +19,8 @@
from PyQt6.QtNetwork import QNetworkRequest
from config import Settings
+from qt.utils import qopen
from util import AVATARS_CACHE_DIR
-from util.qt import qopen
logger = logging.getLogger(__name__)
diff --git a/src/fa/game_updater/patcher.py b/src/fa/game_updater/patcher.py
index 028c52d02..18e7ba221 100644
--- a/src/fa/game_updater/patcher.py
+++ b/src/fa/game_updater/patcher.py
@@ -2,7 +2,7 @@
from PyQt6.QtCore import QFile
-from util.qt import qopen
+from qt.utils import qopen
logger = logging.getLogger(__name__)
diff --git a/src/games/gameitem.py b/src/games/gameitem.py
index 549d113f7..d32527bf1 100644
--- a/src/games/gameitem.py
+++ b/src/games/gameitem.py
@@ -8,7 +8,7 @@
import util
from fa import maps
-from util.qtstyleditemdelegate import QtStyledItemDelegate
+from qt.itemviews.styleditemdelegate import StyledItemDelegate
class GameView(QtCore.QObject):
@@ -39,7 +39,7 @@ def _game_double_clicked(self, idx):
self.game_double_clicked.emit(idx.data().game)
-class GameItemDelegate(QtStyledItemDelegate):
+class GameItemDelegate(StyledItemDelegate):
ICON_RECT = 100
ICON_CLIP_TOP_LEFT = 3
ICON_CLIP_BOTTOM_RIGHT = -7
@@ -55,7 +55,7 @@ class GameItemDelegate(QtStyledItemDelegate):
PADDING = 10
def __init__(self, formatter):
- QtStyledItemDelegate.__init__(self)
+ StyledItemDelegate.__init__(self)
self._formatter = formatter
self.tooltip_filter = GameTooltipFilter(self._formatter)
diff --git a/src/games/gamemodel.py b/src/games/gamemodel.py
index 69c07471c..eefe78f8b 100644
--- a/src/games/gamemodel.py
+++ b/src/games/gamemodel.py
@@ -5,7 +5,7 @@
from games.moditem import mod_invisible
from model.game import GameState
-from util.qt_list_model import QtListModel
+from qt.models.qtlistmodel import QtListModel
from .gamemodelitem import GameModelItem
diff --git a/src/util/qtstyleditemdelegate.py b/src/qt/itemviews/styleditemdelegate.py
similarity index 94%
rename from src/util/qtstyleditemdelegate.py
rename to src/qt/itemviews/styleditemdelegate.py
index 924a587a3..f0498d262 100644
--- a/src/util/qtstyleditemdelegate.py
+++ b/src/qt/itemviews/styleditemdelegate.py
@@ -6,7 +6,7 @@
from PyQt6.QtWidgets import QStyleOptionViewItem
-class QtStyledItemDelegate(QStyledItemDelegate):
+class StyledItemDelegate(QStyledItemDelegate):
def _get_elided_text(
self,
painter: QPainter,
diff --git a/src/qt/itemviews/tableitemdelegte.py b/src/qt/itemviews/tableitemdelegte.py
index ec1140f78..7ca184bcb 100644
--- a/src/qt/itemviews/tableitemdelegte.py
+++ b/src/qt/itemviews/tableitemdelegte.py
@@ -5,11 +5,11 @@
from PyQt6.QtWidgets import QStyleOptionViewItem
from PyQt6.QtWidgets import QTableView
-from util.qt import qpainter
-from util.qtstyleditemdelegate import QtStyledItemDelegate
+from qt.itemviews.styleditemdelegate import StyledItemDelegate
+from qt.utils import qpainter
-class TableItemDelegate(QtStyledItemDelegate):
+class TableItemDelegate(StyledItemDelegate):
"""
Highlights the entire row on mouse hover when table's
SelectionBehavior is set to SelectRows
diff --git a/src/util/qt_list_model.py b/src/qt/models/qtlistmodel.py
similarity index 100%
rename from src/util/qt_list_model.py
rename to src/qt/models/qtlistmodel.py
diff --git a/src/util/qt.py b/src/qt/utils.py
similarity index 100%
rename from src/util/qt.py
rename to src/qt/utils.py
diff --git a/src/replays/replayitem.py b/src/replays/replayitem.py
index ecdf7ca0c..379c0c233 100644
--- a/src/replays/replayitem.py
+++ b/src/replays/replayitem.py
@@ -36,9 +36,9 @@
from fa import maps
from games.moditem import mods
from model.rating import Rating
-from util.qt import qpainter
-from util.qt_list_model import QtListModel
-from util.qtstyleditemdelegate import QtStyledItemDelegate
+from qt.itemviews.styleditemdelegate import StyledItemDelegate
+from qt.models.qtlistmodel import QtListModel
+from qt.utils import qpainter
class GameResult(Enum):
@@ -164,9 +164,9 @@ def add_player(self, player: dict) -> None:
self._add_item(player, player["player"]["id"])
-class ScoreboardItemDelegate(QtStyledItemDelegate):
+class ScoreboardItemDelegate(StyledItemDelegate):
def __init__(self) -> None:
- QtStyledItemDelegate.__init__(self)
+ StyledItemDelegate.__init__(self)
self._row_height = 22
def row_height(self) -> int:
diff --git a/src/stats/itemviews/leaderboarditemdelegate.py b/src/stats/itemviews/leaderboarditemdelegate.py
index 3142963ed..244476558 100644
--- a/src/stats/itemviews/leaderboarditemdelegate.py
+++ b/src/stats/itemviews/leaderboarditemdelegate.py
@@ -5,7 +5,7 @@
from PyQt6.QtWidgets import QStyleOptionViewItem
from qt.itemviews.tableitemdelegte import TableItemDelegate
-from util.qt import qpainter
+from qt.utils import qpainter
class LeaderboardItemDelegate(TableItemDelegate):
From d20e5073dc12d94b42b281077ce6458dde2fe8ea Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sun, 21 Jul 2024 21:02:47 +0300
Subject: [PATCH 43/73] Take replay scoreboard and its friends away from
replayitem file
---
src/replays/models.py | 129 +++++++
src/replays/replayitem.py | 464 +-------------------------
src/replays/scoreboard.py | 222 ++++++++++++
src/replays/scoreboarditemdelegate.py | 132 ++++++++
4 files changed, 484 insertions(+), 463 deletions(-)
create mode 100644 src/replays/scoreboard.py
create mode 100644 src/replays/scoreboarditemdelegate.py
diff --git a/src/replays/models.py b/src/replays/models.py
index 21700a128..6ab949989 100644
--- a/src/replays/models.py
+++ b/src/replays/models.py
@@ -1,5 +1,18 @@
+from __future__ import annotations
+
+from typing import Any
+from typing import Callable
+
+from PyQt6.QtCore import QObject
+from PyQt6.QtCore import Qt
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtGui import QIcon
+
+import util
+from model.rating import Rating
from pydantic import BaseModel
from pydantic import Field
+from qt.models.qtlistmodel import QtListModel
# FIXME - this is what the widget uses so far, we should define this
@@ -13,3 +26,119 @@ class MetadataModel(BaseModel):
teams: dict[str, list[str]]
title: str
game_time: float = Field(0.0)
+
+
+class ScoreboardModelItem(QObject):
+ updated = pyqtSignal()
+
+ def __init__(self, player: dict, mod: str | None) -> None:
+ QObject.__init__(self)
+ self.player = player
+ self.mod = mod or ""
+
+ if len(self.player["ratingChanges"]) > 0:
+ self.rating_stats = self.player["ratingChanges"][0]
+ else:
+ self.rating_stats = None
+
+ @classmethod
+ def builder(cls, mod: str | None) -> Callable[[dict], ScoreboardModelItem]:
+ def build(data: dict) -> ScoreboardModelItem:
+ return cls(data, mod)
+ return build
+
+ def score(self) -> int:
+ return self.player["score"]
+
+ def login(self) -> str:
+ return self.player["player"]["login"]
+
+ def rating_before(self) -> int:
+ # gamePlayerStats' fields 'before*' and 'after*' can be removed
+ # at any time and 'ratingChanges' can be absent if game result is
+ # undefined
+ if self.rating_stats is not None:
+ rating = Rating(
+ self.rating_stats["meanBefore"],
+ self.rating_stats["deviationBefore"],
+ )
+ return round(rating.displayed())
+ elif self.player.get("beforeMean") and self.player.get("beforeDeviation"):
+ rating = Rating(
+ self.player["beforeMean"],
+ self.player["beforeDeviation"],
+ )
+ return round(rating.displayed())
+ return 0
+
+ def rating_after(self) -> int:
+ if self.rating_stats is not None:
+ rating = Rating(
+ self.rating_stats["meanAfter"],
+ self.rating_stats["deviationAfter"],
+ )
+ return round(rating.displayed())
+ elif self.player.get("afterMean") and self.player.get("afterDeviation"):
+ rating = Rating(
+ self.player["afterMean"],
+ self.player["afterDeviation"],
+ )
+ return round(rating.displayed())
+ return 0
+
+ def rating(self) -> int | None:
+ if self.rating_stats is None and "beforeMean" not in self.player:
+ return None
+ return self.rating_before()
+
+ def rating_change(self) -> int:
+ if self.rating_stats is None:
+ return 0
+ return self.rating_after() - self.rating_before()
+
+ def faction_name(self) -> str:
+ if "faction" in self.player:
+ if self.player["faction"] == 1:
+ faction = "UEF"
+ elif self.player["faction"] == 2:
+ faction = "Aeon"
+ elif self.player["faction"] == 3:
+ faction = "Cybran"
+ elif self.player["faction"] == 4:
+ faction = "Seraphim"
+ elif self.player["faction"] == 5:
+ if self.mod == "nomads":
+ faction = "Nomads"
+ else:
+ faction = "Random"
+ elif self.player["faction"] == 6:
+ if self.mod == "nomads":
+ faction = "Random"
+ else:
+ faction = "broken"
+ else:
+ faction = "broken"
+ else:
+ faction = "Missing"
+ return faction
+
+ def icon(self) -> QIcon:
+ return util.THEME.icon(f"replays/{self.faction_name()}.png")
+
+
+class ScoreboardModel(QtListModel):
+ def __init__(
+ self,
+ spoiled: bool,
+ alignment: Qt.AlignmentFlag,
+ item_builder: Callable[[Any], QObject],
+ ) -> None:
+ QtListModel.__init__(self, item_builder)
+ self.spoiled = spoiled
+ self.alignment = alignment
+
+ def get_alignment(self) -> Qt.AlignmentFlag:
+ return self.alignment
+
+ def add_player(self, player: dict) -> None:
+ self._add_item(player, player["player"]["id"])
diff --git a/src/replays/replayitem.py b/src/replays/replayitem.py
index 379c0c233..e9460fc60 100644
--- a/src/replays/replayitem.py
+++ b/src/replays/replayitem.py
@@ -3,480 +3,18 @@
import time
from datetime import datetime
from datetime import timezone
-from enum import Enum
-from typing import Any
-from typing import Callable
-from typing import Iterable
from PyQt6 import QtCore
from PyQt6 import QtGui
from PyQt6 import QtWidgets
-from PyQt6.QtCore import QModelIndex
-from PyQt6.QtCore import QObject
-from PyQt6.QtCore import QRect
-from PyQt6.QtCore import QSize
-from PyQt6.QtCore import Qt
-from PyQt6.QtCore import pyqtSignal
from PyQt6.QtGui import QAction
-from PyQt6.QtGui import QIcon
-from PyQt6.QtGui import QPainter
-from PyQt6.QtGui import QPen
-from PyQt6.QtWidgets import QHBoxLayout
-from PyQt6.QtWidgets import QLabel
-from PyQt6.QtWidgets import QLayout
-from PyQt6.QtWidgets import QListView
-from PyQt6.QtWidgets import QStyledItemDelegate
-from PyQt6.QtWidgets import QStyleOptionViewItem
-from PyQt6.QtWidgets import QVBoxLayout
-from PyQt6.QtWidgets import QWidget
import util
from config import Settings
from downloadManager import DownloadRequest
from fa import maps
from games.moditem import mods
-from model.rating import Rating
-from qt.itemviews.styleditemdelegate import StyledItemDelegate
-from qt.models.qtlistmodel import QtListModel
-from qt.utils import qpainter
-
-
-class GameResult(Enum):
- WIN = "Win"
- LOSE = "Lose"
- PLAYING = "Playing"
- UNKNOWN = "???"
-
-
-class ScoreboardModelItem(QObject):
- updated = pyqtSignal()
-
- def __init__(self, player: dict, mod: str | None) -> None:
- QObject.__init__(self)
- self.player = player
- self.mod = mod or ""
-
- if len(self.player["ratingChanges"]) > 0:
- self.rating_stats = self.player["ratingChanges"][0]
- else:
- self.rating_stats = None
-
- @classmethod
- def builder(cls, mod: str | None) -> Callable[[dict], ScoreboardModelItem]:
- def build(data: dict) -> ScoreboardModelItem:
- return cls(data, mod)
- return build
-
- def score(self) -> int:
- return self.player["score"]
-
- def login(self) -> str:
- return self.player["player"]["login"]
-
- def rating_before(self) -> int:
- # gamePlayerStats' fields 'before*' and 'after*' can be removed
- # at any time and 'ratingChanges' can be absent if game result is
- # undefined
- if self.rating_stats is not None:
- rating = Rating(
- self.rating_stats["meanBefore"],
- self.rating_stats["deviationBefore"],
- )
- return round(rating.displayed())
- elif self.player.get("beforeMean") and self.player.get("beforeDeviation"):
- rating = Rating(
- self.player["beforeMean"],
- self.player["beforeDeviation"],
- )
- return round(rating.displayed())
- return 0
-
- def rating_after(self) -> int:
- if self.rating_stats is not None:
- rating = Rating(
- self.rating_stats["meanAfter"],
- self.rating_stats["deviationAfter"],
- )
- return round(rating.displayed())
- elif self.player.get("afterMean") and self.player.get("afterDeviation"):
- rating = Rating(
- self.player["afterMean"],
- self.player["afterDeviation"],
- )
- return round(rating.displayed())
- return 0
-
- def rating(self) -> int | None:
- if self.rating_stats is None and "beforeMean" not in self.player:
- return None
- return self.rating_before()
-
- def rating_change(self) -> int:
- if self.rating_stats is None:
- return 0
- return self.rating_after() - self.rating_before()
-
- def faction_name(self) -> str:
- if "faction" in self.player:
- if self.player["faction"] == 1:
- faction = "UEF"
- elif self.player["faction"] == 2:
- faction = "Aeon"
- elif self.player["faction"] == 3:
- faction = "Cybran"
- elif self.player["faction"] == 4:
- faction = "Seraphim"
- elif self.player["faction"] == 5:
- if self.mod == "nomads":
- faction = "Nomads"
- else:
- faction = "Random"
- elif self.player["faction"] == 6:
- if self.mod == "nomads":
- faction = "Random"
- else:
- faction = "broken"
- else:
- faction = "broken"
- else:
- faction = "Missing"
- return faction
-
- def icon(self) -> QIcon:
- return util.THEME.icon(f"replays/{self.faction_name()}.png")
-
-
-class ScoreboardModel(QtListModel):
- def __init__(
- self,
- spoiled: bool,
- alignment: Qt.AlignmentFlag,
- item_builder: Callable[[Any], QObject],
- ) -> None:
- QtListModel.__init__(self, item_builder)
- self.spoiled = spoiled
- self.alignment = alignment
-
- def get_alignment(self) -> Qt.AlignmentFlag:
- return self.alignment
-
- def add_player(self, player: dict) -> None:
- self._add_item(player, player["player"]["id"])
-
-
-class ScoreboardItemDelegate(StyledItemDelegate):
- def __init__(self) -> None:
- StyledItemDelegate.__init__(self)
- self._row_height = 22
-
- def row_height(self) -> int:
- return self._row_height
-
- def sizeHint(self, option, index) -> QSize:
- size = QStyledItemDelegate.sizeHint(self, option, index)
- return QSize(size.width(), self._row_height)
-
- def _draw_score(
- self,
- painter: QPainter,
- rect: QRect,
- player_data: ScoreboardModelItem,
- alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
- ) -> QRect:
- score = f"{player_data.score()}"
- score_rect = QRect(rect)
- score_rect.setWidth(20)
- if alignment == Qt.AlignmentFlag.AlignRight:
- score_rect.moveLeft(rect.width() - score_rect.width())
- painter.drawText(score_rect, Qt.AlignmentFlag.AlignCenter, score)
- return score_rect
-
- def _draw_icon(
- self,
- painter: QPainter,
- rect: QRect,
- player_data: ScoreboardModelItem,
- alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
- ) -> QRect:
- icon = player_data.icon()
- icon_rect = QRect(rect)
- icon_rect.setWidth(40)
- icon_rect.setHeight(20)
- if alignment == Qt.AlignmentFlag.AlignRight:
- icon_rect.moveLeft(rect.width() - icon_rect.width())
- icon.paint(painter, icon_rect)
- return icon_rect
-
- def _draw_nick_and_rating(
- self,
- painter: QPainter,
- rect: QRect,
- player_data: ScoreboardModelItem,
- alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
- ) -> QRect:
- rating = player_data.rating()
- rating_str = f"{rating}" if rating is not None else "???"
- text = f"{player_data.login()} ({rating_str})"
- elided = self._get_elided_text(painter, text, width=rect.width())
- painter.drawText(rect, alignment, elided)
- return rect
-
- def _draw_rating_change(
- self,
- painter: QPainter,
- rect: QRect,
- player_data: ScoreboardModelItem,
- alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
- ) -> QRect:
- change = player_data.rating_change()
- rating_change_rect = QRect(rect)
- rating_change_rect.setWidth(30)
- if alignment == Qt.AlignmentFlag.AlignRight:
- rating_change_rect.moveLeft(rect.width() - rating_change_rect.width())
- color = painter.pen().color()
- if change > 0:
- color = Qt.GlobalColor.green
- elif change < 0:
- color = Qt.GlobalColor.red
- with qpainter(painter):
- painter.setPen(QPen(color))
- painter.drawText(rating_change_rect, Qt.AlignmentFlag.AlignCenter, f"{change:+}")
- return rating_change_rect
-
- def _shrink_rect_along(
- self,
- rect: QRect,
- adjustment: int,
- alignment: Qt.AlignmentFlag,
- ) -> QRect:
- """
- Returns a new rect shrinked from left or right side
- by given adjustment
- """
- direction = 1 if alignment == Qt.AlignmentFlag.AlignLeft else -1
- index = 0 if alignment == Qt.AlignmentFlag.AlignLeft else 2
- adjustments = [0, 0, 0, 0]
- adjustments[index] = adjustment * direction
- return rect.adjusted(*adjustments)
-
- def paint(self, painter: QPainter, option: QStyleOptionViewItem, index: QModelIndex) -> None:
- player_data: ScoreboardModelItem = index.data()
- team_model: ScoreboardModel = index.model()
- team_alignment = team_model.get_alignment()
- rect = QRect(option.rect)
-
- with qpainter(painter):
- self._draw_clear_option(painter, option)
-
- if team_model.spoiled:
- score_rect = self._draw_score(painter, rect, player_data, team_alignment)
- rect = self._shrink_rect_along(rect, score_rect.width(), team_alignment)
-
- diff_rect = self._draw_rating_change(painter, rect, player_data, team_alignment)
- rect = self._shrink_rect_along(rect, diff_rect.width(), team_alignment)
-
- icon_rect = self._draw_icon(painter, rect, player_data, team_alignment)
- rect = self._shrink_rect_along(rect, icon_rect.width() + 3, team_alignment)
-
- self._draw_nick_and_rating(painter, rect, player_data, team_alignment)
-
-
-class Scoreboard(QWidget):
- GAME_RESULT_RESERVED_HEIGHT = 30
- TITLE_RESERVED_HEIGHT = 30
-
- def __init__(
- self,
- mod: str | None,
- winner: dict | None,
- spoiled: bool,
- duration: str | None,
- teamwin: dict | None,
- uid: str,
- teams: dict,
- ) -> None:
- super().__init__()
- self.winner = winner
- self.spoiled = spoiled
- self.duration = duration or ""
- self.teamwin = teamwin
- self.uid = uid
- self.teams = teams
- self.num_teams = len(self.teams)
- self.biggest_team = max(len(team) for team in self.teams.values()) if self.teams else 0
-
- self.main_layout = QVBoxLayout()
- if self.num_teams == 2:
- self.teams_layout = QHBoxLayout()
- else:
- self.teams_layout = QVBoxLayout()
- self.setLayout(self.main_layout)
- self.mod = mod
- self._height = 0
- self._team_heights = []
-
- def create_teamlist_view(self) -> QListView:
- team_view = QListView()
- team_view.setObjectName("replayScoreTeamList")
- return team_view
-
- def _create_team_result_label(self, text: str) -> QLabel:
- result_label = QLabel(text)
- result_label.setObjectName("replayGameResult")
- result_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
-
- font = result_label.font()
- font.setPointSize(font.pointSize() + 4)
- result_label.setFont(font)
-
- return result_label
-
- def add_result_label(self, text: str, layout: QLayout) -> None:
- result_label = self._create_team_result_label(text)
- layout.addWidget(result_label)
-
- def teamview_rows(self, view: QListView) -> int:
- model: ScoreboardModel = view.model()
- if self.num_teams == 2:
- return self.biggest_team
- return model.rowCount(QModelIndex())
-
- def teamview_height(self, view: QListView) -> int:
- row_count = self.teamview_rows(view)
- delegate: ScoreboardItemDelegate = view.itemDelegate()
- return row_count * delegate.row_height()
-
- def adjust_teamview_height(self, view: QListView, height: int) -> None:
- view.setMinimumHeight(height)
- view.setMaximumHeight(height)
-
- def add_team_score(
- self,
- alignment: Qt.AlignmentFlag,
- team_result: GameResult,
- players: Iterable[dict],
- ) -> None:
- team_layout = QVBoxLayout()
- self.add_result_label(team_result.value, team_layout)
-
- model = ScoreboardModel(self.spoiled, alignment, ScoreboardModelItem.builder(self.mod))
- for player in players:
- model.add_player(player)
-
- team_view = self.create_teamlist_view()
- team_view.setModel(model)
- team_view.setItemDelegate(ScoreboardItemDelegate())
- team_layout.addWidget(team_view)
-
- view_height = self.teamview_height(team_view)
- self.adjust_teamview_height(team_view, view_height)
- self._team_heights.append(self.GAME_RESULT_RESERVED_HEIGHT + view_height)
-
- self.teams_layout.addLayout(team_layout)
-
- def add_team_score_if_needed(
- self,
- alignment: Qt.AlignmentFlag,
- team_result: GameResult,
- players: Iterable[dict],
- ) -> None:
- if len(list(players)) == 0:
- return
- self.add_team_score(alignment, team_result, players)
-
- def height(self) -> int:
- # there must be a way to dissect all of the layouts and widgets
- # with all of their paddings, spacings, margins etc. to determine
- # scoreboard's precise height, but this works good enough
- magic = 40
- if len(self.teams) == 2:
- return self._height + max(self._team_heights) + magic
- return sum((self._height, *self._team_heights, magic))
-
- def width(self) -> int:
- if len(self.teams) == 2:
- return 560 if self.spoiled else 500
- return 335 if self.spoiled else 275
-
- def one_team_layout(self) -> None:
- team = list(self.teams.values())[0]
- alignment = Qt.AlignmentFlag.AlignLeft
- if self.spoiled:
- winners, losers = [], []
- for player in team:
- if self.winner is not None and player["score"] == self.winner["score"]:
- winners.append(player)
- else:
- losers.append(player)
- self.add_team_score_if_needed(alignment, self.game_result(is_winner=True), winners)
- self.add_team_score_if_needed(alignment, self.game_result(is_winner=False), losers)
- else:
- self.add_team_score_if_needed(alignment, self.game_result(is_winner=False), team)
- self.main_layout.addLayout(self.teams_layout)
-
- def default_layout(self) -> None:
- alignment = Qt.AlignmentFlag.AlignLeft
- for team in self.teams:
- game_result = self.game_result(is_winner=(team == self.teamwin))
- self.add_team_score(alignment, game_result, self.teams[team])
- self.main_layout.addLayout(self.teams_layout)
-
- def game_result(self, *, is_winner: bool) -> GameResult:
- if not self.spoiled:
- return GameResult.UNKNOWN
- if "playing" in self.duration:
- return GameResult.PLAYING
- return (GameResult.LOSE, GameResult.WIN)[is_winner]
-
- def two_teams_layout(self) -> None:
- for index, team_num in enumerate(self.teams):
- alignment = (Qt.AlignmentFlag.AlignLeft, Qt.AlignmentFlag.AlignRight)[index]
- is_winner = team_num == self.teamwin
- game_result = self.game_result(is_winner=is_winner)
- self.add_team_score(alignment, game_result, self.teams[team_num])
- if index == 0:
- self.add_vs_label()
- self.main_layout.addLayout(self.teams_layout)
-
- def create_title_label(self) -> QLabel:
- title_label = QLabel(f"Replay UID: {self.uid}")
- title_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
- title_label.setTextInteractionFlags(Qt.TextInteractionFlag.TextSelectableByMouse)
-
- title_font = title_label.font()
- title_font.setPointSize(title_font.pointSize() + 4)
- title_font.setBold(True)
- title_label.setFont(title_font)
-
- return title_label
-
- def add_title_label(self) -> None:
- self.main_layout.addWidget(self.create_title_label())
- self._height += self.TITLE_RESERVED_HEIGHT
-
- def create_vs_label(self) -> QLabel:
- vs_label = QLabel("VS")
- vs_label.setObjectName("VSLabel")
- vs_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
-
- font = vs_label.font()
- font.setPointSize(font.pointSize() + 13)
- vs_label.setFont(font)
-
- return vs_label
-
- def add_vs_label(self) -> None:
- self.teams_layout.addWidget(self.create_vs_label())
-
- def setup(self) -> None:
- self.add_title_label()
-
- if self.num_teams == 1:
- self.one_team_layout()
- elif self.num_teams == 2:
- self.two_teams_layout()
- else:
- self.default_layout()
+from replays.scoreboard import Scoreboard
class ReplayItemDelegate(QtWidgets.QStyledItemDelegate):
diff --git a/src/replays/scoreboard.py b/src/replays/scoreboard.py
new file mode 100644
index 000000000..5e03513ca
--- /dev/null
+++ b/src/replays/scoreboard.py
@@ -0,0 +1,222 @@
+from __future__ import annotations
+
+from enum import Enum
+from typing import Iterable
+
+from PyQt6.QtCore import QModelIndex
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QHBoxLayout
+from PyQt6.QtWidgets import QLabel
+from PyQt6.QtWidgets import QLayout
+from PyQt6.QtWidgets import QListView
+from PyQt6.QtWidgets import QVBoxLayout
+from PyQt6.QtWidgets import QWidget
+
+from replays.models import ScoreboardModel
+from replays.models import ScoreboardModelItem
+from replays.scoreboarditemdelegate import ScoreboardItemDelegate
+
+
+class GameResult(Enum):
+ WIN = "Win"
+ LOSE = "Lose"
+ PLAYING = "Playing"
+ UNKNOWN = "???"
+
+
+class Scoreboard(QWidget):
+ GAME_RESULT_RESERVED_HEIGHT = 30
+ TITLE_RESERVED_HEIGHT = 30
+
+ def __init__(
+ self,
+ mod: str | None,
+ winner: dict | None,
+ spoiled: bool,
+ duration: str | None,
+ teamwin: dict | None,
+ uid: str,
+ teams: dict,
+ ) -> None:
+ super().__init__()
+ self.winner = winner
+ self.spoiled = spoiled
+ self.duration = duration or ""
+ self.teamwin = teamwin
+ self.uid = uid
+ self.teams = teams
+ self.num_teams = len(self.teams)
+ self.biggest_team = max(len(team) for team in self.teams.values()) if self.teams else 0
+
+ self.main_layout = QVBoxLayout()
+ if self.num_teams == 2:
+ self.teams_layout = QHBoxLayout()
+ else:
+ self.teams_layout = QVBoxLayout()
+ self.setLayout(self.main_layout)
+ self.mod = mod
+ self._height = 0
+ self._team_heights = []
+
+ def create_teamlist_view(self) -> QListView:
+ team_view = QListView()
+ team_view.setObjectName("replayScoreTeamList")
+ return team_view
+
+ def _create_team_result_label(self, text: str) -> QLabel:
+ result_label = QLabel(text)
+ result_label.setObjectName("replayGameResult")
+ result_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+
+ font = result_label.font()
+ font.setPointSize(font.pointSize() + 4)
+ result_label.setFont(font)
+
+ return result_label
+
+ def add_result_label(self, text: str, layout: QLayout) -> None:
+ result_label = self._create_team_result_label(text)
+ layout.addWidget(result_label)
+
+ def teamview_rows(self, view: QListView) -> int:
+ model: ScoreboardModel = view.model()
+ if self.num_teams == 2:
+ return self.biggest_team
+ return model.rowCount(QModelIndex())
+
+ def teamview_height(self, view: QListView) -> int:
+ row_count = self.teamview_rows(view)
+ delegate: ScoreboardItemDelegate = view.itemDelegate()
+ return row_count * delegate.row_height()
+
+ def adjust_teamview_height(self, view: QListView, height: int) -> None:
+ view.setMinimumHeight(height)
+ view.setMaximumHeight(height)
+
+ def add_team_score(
+ self,
+ alignment: Qt.AlignmentFlag,
+ team_result: GameResult,
+ players: Iterable[dict],
+ ) -> None:
+ team_layout = QVBoxLayout()
+ self.add_result_label(team_result.value, team_layout)
+
+ model = ScoreboardModel(self.spoiled, alignment, ScoreboardModelItem.builder(self.mod))
+ for player in players:
+ model.add_player(player)
+
+ team_view = self.create_teamlist_view()
+ team_view.setModel(model)
+ team_view.setItemDelegate(ScoreboardItemDelegate())
+ team_layout.addWidget(team_view)
+
+ view_height = self.teamview_height(team_view)
+ self.adjust_teamview_height(team_view, view_height)
+ self._team_heights.append(self.GAME_RESULT_RESERVED_HEIGHT + view_height)
+
+ self.teams_layout.addLayout(team_layout)
+
+ def add_team_score_if_needed(
+ self,
+ alignment: Qt.AlignmentFlag,
+ team_result: GameResult,
+ players: Iterable[dict],
+ ) -> None:
+ if len(list(players)) == 0:
+ return
+ self.add_team_score(alignment, team_result, players)
+
+ def height(self) -> int:
+ # there must be a way to dissect all of the layouts and widgets
+ # with all of their paddings, spacings, margins etc. to determine
+ # scoreboard's precise height, but this works good enough
+ magic = 40
+ if len(self.teams) == 2:
+ return self._height + max(self._team_heights) + magic
+ return sum((self._height, *self._team_heights, magic))
+
+ def width(self) -> int:
+ if len(self.teams) == 2:
+ return 560 if self.spoiled else 500
+ return 335 if self.spoiled else 275
+
+ def one_team_layout(self) -> None:
+ team = list(self.teams.values())[0]
+ alignment = Qt.AlignmentFlag.AlignLeft
+ if self.spoiled:
+ winners, losers = [], []
+ for player in team:
+ if self.winner is not None and player["score"] == self.winner["score"]:
+ winners.append(player)
+ else:
+ losers.append(player)
+ self.add_team_score_if_needed(alignment, self.game_result(is_winner=True), winners)
+ self.add_team_score_if_needed(alignment, self.game_result(is_winner=False), losers)
+ else:
+ self.add_team_score_if_needed(alignment, self.game_result(is_winner=False), team)
+ self.main_layout.addLayout(self.teams_layout)
+
+ def default_layout(self) -> None:
+ alignment = Qt.AlignmentFlag.AlignLeft
+ for team in self.teams:
+ game_result = self.game_result(is_winner=(team == self.teamwin))
+ self.add_team_score(alignment, game_result, self.teams[team])
+ self.main_layout.addLayout(self.teams_layout)
+
+ def game_result(self, *, is_winner: bool) -> GameResult:
+ if not self.spoiled:
+ return GameResult.UNKNOWN
+ if "playing" in self.duration:
+ return GameResult.PLAYING
+ return (GameResult.LOSE, GameResult.WIN)[is_winner]
+
+ def two_teams_layout(self) -> None:
+ for index, team_num in enumerate(self.teams):
+ alignment = (Qt.AlignmentFlag.AlignLeft, Qt.AlignmentFlag.AlignRight)[index]
+ is_winner = team_num == self.teamwin
+ game_result = self.game_result(is_winner=is_winner)
+ self.add_team_score(alignment, game_result, self.teams[team_num])
+ if index == 0:
+ self.add_vs_label()
+ self.main_layout.addLayout(self.teams_layout)
+
+ def create_title_label(self) -> QLabel:
+ title_label = QLabel(f"Replay UID: {self.uid}")
+ title_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ title_label.setTextInteractionFlags(Qt.TextInteractionFlag.TextSelectableByMouse)
+
+ title_font = title_label.font()
+ title_font.setPointSize(title_font.pointSize() + 4)
+ title_font.setBold(True)
+ title_label.setFont(title_font)
+
+ return title_label
+
+ def add_title_label(self) -> None:
+ self.main_layout.addWidget(self.create_title_label())
+ self._height += self.TITLE_RESERVED_HEIGHT
+
+ def create_vs_label(self) -> QLabel:
+ vs_label = QLabel("VS")
+ vs_label.setObjectName("VSLabel")
+ vs_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+
+ font = vs_label.font()
+ font.setPointSize(font.pointSize() + 13)
+ vs_label.setFont(font)
+
+ return vs_label
+
+ def add_vs_label(self) -> None:
+ self.teams_layout.addWidget(self.create_vs_label())
+
+ def setup(self) -> None:
+ self.add_title_label()
+
+ if self.num_teams == 1:
+ self.one_team_layout()
+ elif self.num_teams == 2:
+ self.two_teams_layout()
+ else:
+ self.default_layout()
diff --git a/src/replays/scoreboarditemdelegate.py b/src/replays/scoreboarditemdelegate.py
new file mode 100644
index 000000000..8b7633542
--- /dev/null
+++ b/src/replays/scoreboarditemdelegate.py
@@ -0,0 +1,132 @@
+from __future__ import annotations
+
+from PyQt6.QtCore import QModelIndex
+from PyQt6.QtCore import QRect
+from PyQt6.QtCore import QSize
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QPainter
+from PyQt6.QtGui import QPen
+from PyQt6.QtWidgets import QStyledItemDelegate
+from PyQt6.QtWidgets import QStyleOptionViewItem
+
+from qt.itemviews.styleditemdelegate import StyledItemDelegate
+from qt.utils import qpainter
+from replays.models import ScoreboardModel
+from replays.models import ScoreboardModelItem
+
+
+class ScoreboardItemDelegate(StyledItemDelegate):
+ def __init__(self) -> None:
+ StyledItemDelegate.__init__(self)
+ self._row_height = 22
+
+ def row_height(self) -> int:
+ return self._row_height
+
+ def sizeHint(self, option, index) -> QSize:
+ size = QStyledItemDelegate.sizeHint(self, option, index)
+ return QSize(size.width(), self._row_height)
+
+ def _draw_score(
+ self,
+ painter: QPainter,
+ rect: QRect,
+ player_data: ScoreboardModelItem,
+ alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
+ ) -> QRect:
+ score = f"{player_data.score()}"
+ score_rect = QRect(rect)
+ score_rect.setWidth(20)
+ if alignment == Qt.AlignmentFlag.AlignRight:
+ score_rect.moveLeft(rect.width() - score_rect.width())
+ painter.drawText(score_rect, Qt.AlignmentFlag.AlignCenter, score)
+ return score_rect
+
+ def _draw_icon(
+ self,
+ painter: QPainter,
+ rect: QRect,
+ player_data: ScoreboardModelItem,
+ alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
+ ) -> QRect:
+ icon = player_data.icon()
+ icon_rect = QRect(rect)
+ icon_rect.setWidth(40)
+ icon_rect.setHeight(20)
+ if alignment == Qt.AlignmentFlag.AlignRight:
+ icon_rect.moveLeft(rect.width() - icon_rect.width())
+ icon.paint(painter, icon_rect)
+ return icon_rect
+
+ def _draw_nick_and_rating(
+ self,
+ painter: QPainter,
+ rect: QRect,
+ player_data: ScoreboardModelItem,
+ alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
+ ) -> QRect:
+ rating = player_data.rating()
+ rating_str = f"{rating}" if rating is not None else "???"
+ text = f"{player_data.login()} ({rating_str})"
+ elided = self._get_elided_text(painter, text, width=rect.width())
+ painter.drawText(rect, alignment, elided)
+ return rect
+
+ def _draw_rating_change(
+ self,
+ painter: QPainter,
+ rect: QRect,
+ player_data: ScoreboardModelItem,
+ alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft,
+ ) -> QRect:
+ change = player_data.rating_change()
+ rating_change_rect = QRect(rect)
+ rating_change_rect.setWidth(30)
+ if alignment == Qt.AlignmentFlag.AlignRight:
+ rating_change_rect.moveLeft(rect.width() - rating_change_rect.width())
+ color = painter.pen().color()
+ if change > 0:
+ color = Qt.GlobalColor.green
+ elif change < 0:
+ color = Qt.GlobalColor.red
+ with qpainter(painter):
+ painter.setPen(QPen(color))
+ painter.drawText(rating_change_rect, Qt.AlignmentFlag.AlignCenter, f"{change:+}")
+ return rating_change_rect
+
+ def _shrink_rect_along(
+ self,
+ rect: QRect,
+ adjustment: int,
+ alignment: Qt.AlignmentFlag,
+ ) -> QRect:
+ """
+ Returns a new rect shrinked from left or right side
+ by given adjustment
+ """
+ direction = 1 if alignment == Qt.AlignmentFlag.AlignLeft else -1
+ index = 0 if alignment == Qt.AlignmentFlag.AlignLeft else 2
+ adjustments = [0, 0, 0, 0]
+ adjustments[index] = adjustment * direction
+ return rect.adjusted(*adjustments)
+
+ def paint(self, painter: QPainter, option: QStyleOptionViewItem, index: QModelIndex) -> None:
+ player_data: ScoreboardModelItem = index.data()
+ team_model: ScoreboardModel = index.model()
+ team_alignment = team_model.get_alignment()
+ rect = QRect(option.rect)
+
+ with qpainter(painter):
+ self._draw_clear_option(painter, option)
+
+ if team_model.spoiled:
+ score_rect = self._draw_score(painter, rect, player_data, team_alignment)
+ rect = self._shrink_rect_along(rect, score_rect.width(), team_alignment)
+
+ diff_rect = self._draw_rating_change(painter, rect, player_data, team_alignment)
+ rect = self._shrink_rect_along(rect, diff_rect.width(), team_alignment)
+
+ icon_rect = self._draw_icon(painter, rect, player_data, team_alignment)
+ rect = self._shrink_rect_along(rect, icon_rect.width() + 3, team_alignment)
+
+ self._draw_nick_and_rating(painter, rect, player_data, team_alignment)
From dac1695f85bde2b0dc6b3349882ce69044fe0e25 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sun, 21 Jul 2024 21:07:37 +0300
Subject: [PATCH 44/73] replayitem: Remove html formatters not used anymore
---
src/replays/replayitem.py | 41 ++-------------------------------------
1 file changed, 2 insertions(+), 39 deletions(-)
diff --git a/src/replays/replayitem.py b/src/replays/replayitem.py
index e9460fc60..c5dd16c0e 100644
--- a/src/replays/replayitem.py
+++ b/src/replays/replayitem.py
@@ -89,44 +89,7 @@ def sizeHint(self, option, index, *args, **kwargs):
class ReplayItem(QtWidgets.QTreeWidgetItem):
- # list element
- FORMATTER_REPLAY = str(
- util.THEME.readfile(
- "replays/formatters/replay.qthtml",
- ),
- )
- # replay-info elements
- FORMATTER_REPLAY_INFORMATION = (
- "Replay UID : {uid}
"
- )
- FORMATTER_REPLAY_TEAM_SPOILED = (
- "| "
- "{title} |
{players}"
- )
- FORMATTER_REPLAY_FFA_SPOILED = (
- "| "
- "Win |
{winner}| Lose |
{players}"
- )
- FORMATTER_REPLAY_TEAM2_SPOILED = (
- " | "
- )
- FORMATTER_REPLAY_TEAM2 = " | "
- FORMATTER_REPLAY_PLAYER_SCORE = (
- "{player_score} | "
- )
- FORMATTER_REPLAY_PLAYER_ICON = (
- " "
- " | "
- )
- FORMATTER_REPLAY_PLAYER_LABEL = (
- "{player_name} "
- "({player_rating}) | "
- )
+ REPLAY_TREE_ITEM_FORMATTER = str(util.THEME.readfile("replays/formatters/replay.qthtml"))
def __init__(self, uid, parent, *args, **kwargs):
QtWidgets.QTreeWidgetItem.__init__(self, *args, **kwargs)
@@ -240,7 +203,7 @@ def update(self, replay, client):
else:
self.moddisplayname = self.mod
- self.viewtext = self.FORMATTER_REPLAY.format(
+ self.viewtext = self.REPLAY_TREE_ITEM_FORMATTER.format(
time=self.startHour, name=self.name, map=self.mapdisplayname,
duration=self.duration, mod=self.moddisplayname,
)
From ba450227345b800b5d3d43dcdb5b8b22869d9fed Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sun, 21 Jul 2024 21:07:37 +0300
Subject: [PATCH 45/73] replayitem: Delete some obsolete instance vars
---
src/replays/replayitem.py | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/replays/replayitem.py b/src/replays/replayitem.py
index c5dd16c0e..9d18ec109 100644
--- a/src/replays/replayitem.py
+++ b/src/replays/replayitem.py
@@ -98,12 +98,9 @@ def __init__(self, uid, parent, *args, **kwargs):
self.parent = parent
self.height = 70
self.viewtext = None
- self.viewtextPlayer = None
self.mapname = None
self.mapdisplayname = None
self.client = None
- self.title = None
- self.host = None
self.startDate = None
self.duration = None
@@ -114,20 +111,16 @@ def __init__(self, uid, parent, *args, **kwargs):
self.url = "{}/{}".format(Settings.get('replay_vault/host'), self.uid)
self.teams = {}
- self.access = None
self.mod = None
self.moddisplayname = None
self.options = []
self.players = []
self.numberplayers = 0
- self.biggestTeam = 0
self.winner = None
self.teamWin = None
self.setHidden(True)
- self.extraInfoWidth = 0 # panel with more information
- self.extraInfoHeight = 0 # panel with more information
self._map_dl_request = DownloadRequest()
self._map_dl_request.done.connect(self._on_map_preview_downloaded)
From bde2d4a5e522b2efeb308646c2b0a222713d8d26 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:06:10 +0300
Subject: [PATCH 46/73] Remove UserRelations from User class
this fixes circular dependency me -> relations -> me
although it sound logical that User has relations
there is only one user, whose relations are known
and managable -- the client user (me)
so it is also logical for User class to not have
those relations
and maybe UserRelations should be the class, from
which we should get 'me', not the other way around
---
src/chat/chatter_menu.py | 37 ++++++++++++++++-----
src/client/_clientwindow.py | 15 ++++-----
src/client/gameannouncer.py | 9 +++--
src/client/user.py | 2 --
src/coop/_coopwidget.py | 5 +--
src/games/_gameswidget.py | 26 ++++++++++-----
src/games/gamemodel.py | 29 +++++++++++-----
src/games/gamemodelitem.py | 32 ++++++++++++++----
src/games/hostgamewidget.py | 21 ++++++++++--
src/notifications/__init__.py | 9 ++---
src/replays/_replayswidget.py | 4 +--
src/stats/itemviews/leaderboardtablemenu.py | 15 ++++++---
12 files changed, 140 insertions(+), 64 deletions(-)
diff --git a/src/chat/chatter_menu.py b/src/chat/chatter_menu.py
index 3df9c7670..47429e35b 100644
--- a/src/chat/chatter_menu.py
+++ b/src/chat/chatter_menu.py
@@ -6,6 +6,8 @@
from PyQt6.QtWidgets import QApplication
from PyQt6.QtWidgets import QMenu
+from model.chat.channelchatter import ChannelChatter
+from model.chat.chatter import Chatter
from model.game import GameState
from model.player import Player
from playercard.playerinfodialog import PlayerInfoDialog
@@ -107,25 +109,37 @@ def player_actions(self, player, game, is_me):
yield ChatterMenuItems.VIEW_IN_LEADERBOARDS
yield ChatterMenuItems.VIEW_REPLAYS
- def friend_actions(self, player, chatter, cc, is_me):
+ def friend_actions(
+ self,
+ player: Player | None,
+ chatter: Chatter,
+ cc: ChannelChatter,
+ is_me: bool,
+ ) -> Generator[ChatterMenuItems, None, None]:
if is_me:
return
id_ = -1 if player is None else player.id
name = chatter.name
- if self._me.relations.model.is_friend(id_, name):
+ if self._client_window.user_relations.model.is_friend(id_, name):
yield ChatterMenuItems.REMOVE_FRIEND
- elif self._me.relations.model.is_foe(id_, name):
+ elif self._client_window.user_relations.model.is_foe(id_, name):
yield ChatterMenuItems.REMOVE_FOE
else:
yield ChatterMenuItems.ADD_FRIEND
yield ChatterMenuItems.ADD_FOE
- def ignore_actions(self, player, chatter, cc, is_me):
+ def ignore_actions(
+ self,
+ player: Player,
+ chatter: Chatter,
+ cc: ChannelChatter,
+ is_me: bool,
+ ) -> Generator[ChatterMenuItems, None, None]:
if is_me:
return
id_ = -1 if player is None else player.id
name = chatter.name
- if self._me.relations.model.is_chatterbox(id_, name):
+ if self._client_window.user_relations.model.is_chatterbox(id_, name):
yield ChatterMenuItems.REMOVE_CHATTERBOX
else:
if not cc.is_mod() and not chatter.is_base_channel_mod():
@@ -213,8 +227,8 @@ def _handle_action(self, chatter, player, game, kind):
def _copy_username(self, chatter):
QApplication.clipboard().setText(chatter.name)
- def _handle_friends(self, chatter, player, kind):
- ctl = self._me.relations.controller
+ def _handle_friends(self, chatter: Chatter, player: Player, kind: ChatterMenuItems) -> None:
+ ctl = self._client_window.user_relations.controller
ctl = ctl.faf if player is not None else ctl.irc
uid = player.id if player is not None else chatter.name
@@ -228,8 +242,13 @@ def _handle_friends(self, chatter, player, kind):
elif kind == Items.REMOVE_FOE:
ctl.foes.remove(uid)
- def _handle_chatterboxes(self, chatter, player, kind):
- ctl = self._me.relations.controller
+ def _handle_chatterboxes(
+ self,
+ chatter: Chatter,
+ player: Player | None,
+ kind: ChatterMenuItems,
+ ) -> None:
+ ctl = self._client_window.user_relations.controller
ctl = ctl.faf if player is not None else ctl.irc
uid = player.id if player is not None else chatter.name
diff --git a/src/client/_clientwindow.py b/src/client/_clientwindow.py
index 2c6245892..b01ce9d2f 100644
--- a/src/client/_clientwindow.py
+++ b/src/client/_clientwindow.py
@@ -232,7 +232,6 @@ def __init__(self, *args, **kwargs):
self.user_relations = UserRelations(
relation_model, relation_controller, relation_trackers,
)
- self.me.relations = self.user_relations
self.map_preview_downloader = MapSmallPreviewDownloader(util.MAP_PREVIEW_SMALL_DIR)
self.avatar_downloader = AvatarDownloader()
@@ -241,7 +240,10 @@ def __init__(self, *args, **kwargs):
self.map_generator = MapGeneratorManager()
# Qt model for displaying active games.
- self.game_model = GameModel(self.me, self.map_preview_downloader, self.gameset)
+ self.game_model = GameModel(
+ self.user_relations, self.me,
+ self.map_preview_downloader, self.gameset,
+ )
self.gameset.added.connect(self.fill_in_session_info)
@@ -367,9 +369,7 @@ def __init__(self, *args, **kwargs):
self.me, self.user_relations.model, util.THEME,
)
- self.game_announcer = GameAnnouncer(
- self.gameset, self.me, self.player_colors,
- )
+ self.game_announcer = GameAnnouncer(self.gameset, self.user_relations, self.player_colors)
self.power = 0 # current user power
self.id = 0
@@ -784,10 +784,7 @@ def setup(self):
# build main window with the now active client
self.news = NewsWidget(self)
- self.coop = CoopWidget(
- self, self.game_model, self.me,
- self.gameview_builder, self.game_launcher,
- )
+ self.coop = CoopWidget(self, self.game_model, self.gameview_builder, self.game_launcher)
self.games = GamesWidget(
self, self.game_model, self.me,
self.gameview_builder, self.game_launcher,
diff --git a/src/client/gameannouncer.py b/src/client/gameannouncer.py
index 5c84f7d85..5215183da 100644
--- a/src/client/gameannouncer.py
+++ b/src/client/gameannouncer.py
@@ -2,8 +2,11 @@
from PyQt6.QtCore import QTimer
from PyQt6.QtCore import pyqtSignal
+from client.playercolors import PlayerColors
+from client.user import UserRelations
from fa import maps
from model.game import GameState
+from model.gameset import Gameset
class GameAnnouncer(QObject):
@@ -11,10 +14,10 @@ class GameAnnouncer(QObject):
ANNOUNCE_DELAY_SECS = 35
- def __init__(self, gameset, me, colors):
+ def __init__(self, gameset: Gameset, relations: UserRelations, colors: PlayerColors) -> None:
QObject.__init__(self)
self._gameset = gameset
- self._me = me
+ self.user_relations = relations
self._colors = colors
self._gameset.newLobby.connect(self._announce_hosting)
@@ -27,7 +30,7 @@ def __init__(self, gameset, me, colors):
def _is_friend_host(self, game):
return (
game.host_player is not None
- and self._me.relations.model.is_friend(game.host_player.id)
+ and self.user_relations.model.is_friend(game.host_player.id)
)
def _announce_hosting(self, game):
diff --git a/src/client/user.py b/src/client/user.py
index ca0221061..29a3b1ae0 100644
--- a/src/client/user.py
+++ b/src/client/user.py
@@ -25,8 +25,6 @@ def __init__(self, playerset):
self._players.added.connect(self._on_player_change)
self._players.removed.connect(self._on_player_change)
- self.relations = None # FIXME - circular me -> rels -> me dep
-
@property
def player(self):
return self._player
diff --git a/src/coop/_coopwidget.py b/src/coop/_coopwidget.py
index 8b06f07de..fe47bc4bc 100644
--- a/src/coop/_coopwidget.py
+++ b/src/coop/_coopwidget.py
@@ -16,7 +16,6 @@
from api.coop_api import CoopResultApiAccessor
from api.models.CoopResult import CoopResult
from api.models.CoopScenario import CoopScenario
-from client.user import User
from coop.coopmapitem import CoopMapItem
from coop.coopmapitem import CoopMapItemDelegate
from coop.coopmodel import CoopGameFilterModel
@@ -43,7 +42,6 @@ def __init__(
self,
client: ClientWindow,
game_model: GameModel,
- me: User,
gameview_builder: GameViewBuilder,
game_launcher: GameLauncher,
) -> None:
@@ -53,8 +51,7 @@ def __init__(
self.setupUi(self)
self.client = client # type - ClientWindow
- self._me = me
- self._game_model = CoopGameFilterModel(self._me, game_model)
+ self._game_model = CoopGameFilterModel(self.client.user_relations, game_model)
self._game_launcher = game_launcher
self._gameview_builder = gameview_builder
diff --git a/src/games/_gameswidget.py b/src/games/_gameswidget.py
index 9d1a2b057..1e85e724c 100644
--- a/src/games/_gameswidget.py
+++ b/src/games/_gameswidget.py
@@ -1,4 +1,7 @@
+from __future__ import annotations
+
import logging
+from typing import TYPE_CHECKING
from PyQt6 import QtWidgets
from PyQt6.QtCore import Qt
@@ -10,13 +13,20 @@
import fa
import util
from api.featured_mod_api import FeaturedModApiConnector
+from client.user import User
from config import Settings
from games.automatchframe import MatchmakerQueue
+from games.gameitem import GameViewBuilder
from games.gamemodel import CustomGameFilterModel
+from games.gamemodel import GameModel
+from games.hostgamewidget import GameLauncher
from games.moditem import ModItem
from games.moditem import mod_invisible
from model.chat.channel import PARTY_CHANNEL_SUFFIX
+if TYPE_CHECKING:
+ from client._clientwindow import ClientWindow
+
logger = logging.getLogger(__name__)
FormClass, BaseClass = util.THEME.loadUiType("games/games.ui")
@@ -81,20 +91,20 @@ class GamesWidget(FormClass, BaseClass):
party_updated = pyqtSignal()
def __init__(
- self,
- client,
- game_model,
- me,
- gameview_builder,
- game_launcher,
- ):
+ self,
+ client: ClientWindow,
+ game_model: GameModel,
+ me: User,
+ gameview_builder: GameViewBuilder,
+ game_launcher: GameLauncher,
+ ) -> None:
BaseClass.__init__(self, client)
self.setupUi(self)
self._me = me
self.client = client # type - ClientWindow
self.mods = {}
- self._game_model = CustomGameFilterModel(self._me, game_model)
+ self._game_model = CustomGameFilterModel(self.client.user_relations, game_model)
self._game_launcher = game_launcher
self.apiConnector = FeaturedModApiConnector()
diff --git a/src/games/gamemodel.py b/src/games/gamemodel.py
index eefe78f8b..1c6d74dfa 100644
--- a/src/games/gamemodel.py
+++ b/src/games/gamemodel.py
@@ -3,16 +3,27 @@
from PyQt6.QtCore import QSortFilterProxyModel
from PyQt6.QtCore import Qt
+from client.user import User
+from client.user import UserRelations
+from downloadManager import MapPreviewDownloader
from games.moditem import mod_invisible
+from model.game import Game
from model.game import GameState
+from model.gameset import Gameset
from qt.models.qtlistmodel import QtListModel
from .gamemodelitem import GameModelItem
class GameModel(QtListModel):
- def __init__(self, me, preview_dler, gameset=None):
- builder = GameModelItem.builder(me, preview_dler)
+ def __init__(
+ self,
+ relations: UserRelations,
+ me: User,
+ preview_dler: MapPreviewDownloader,
+ gameset: Gameset | None = None,
+ ) -> None:
+ builder = GameModelItem.builder(relations, me, preview_dler)
QtListModel.__init__(self, builder)
self._gameset = gameset
@@ -40,10 +51,10 @@ class SortType(Enum):
HOSTNAME = 3
AGE = 4
- def __init__(self, me, model):
+ def __init__(self, relations: UserRelations, model: GameModel) -> None:
QSortFilterProxyModel.__init__(self)
self._sort_type = self.SortType.AGE
- self._me = me
+ self.user_relations = relations
self.setSourceModel(model)
self.sort(0)
@@ -60,12 +71,12 @@ def lessThan(self, leftIndex, rightIndex):
return False
return False
- def _lt_friend(self, left, right):
+ def _lt_friend(self, left: Game, right: Game) -> bool:
hostl = -1 if left.host_player is None else left.host_player.id
hostr = -1 if right.host_player is None else right.host_player.id
return (
- self._me.relations.model.is_friend(hostl)
- and not self._me.relations.model.is_friend(hostr)
+ self.user_relations.model.is_friend(hostl)
+ and not self.user_relations.model.is_friend(hostr)
)
def _lt_type(self, left, right):
@@ -108,8 +119,8 @@ def filter_accepts_game(self, game):
class CustomGameFilterModel(GameSortModel):
- def __init__(self, me, model):
- GameSortModel.__init__(self, me, model)
+ def __init__(self, relations: UserRelations, model: GameModel) -> None:
+ GameSortModel.__init__(self, relations, model)
self._hide_private_games = False
def filter_accepts_game(self, game):
diff --git a/src/games/gamemodelitem.py b/src/games/gamemodelitem.py
index 5eab67fa3..1975d8c49 100644
--- a/src/games/gamemodelitem.py
+++ b/src/games/gamemodelitem.py
@@ -1,8 +1,16 @@
+from __future__ import annotations
+
+from typing import Callable
+
from PyQt6.QtCore import QObject
from PyQt6.QtCore import pyqtSignal
+from client.user import User
+from client.user import UserRelations
from downloadManager import DownloadRequest
+from downloadManager import MapPreviewDownloader
from fa import maps
+from model.game import Game
class GameModelItem(QObject):
@@ -12,24 +20,34 @@ class GameModelItem(QObject):
"""
updated = pyqtSignal(object)
- def __init__(self, game, me, preview_dler):
+ def __init__(
+ self,
+ game: Game,
+ relations: UserRelations,
+ me: User,
+ preview_dler: MapPreviewDownloader,
+ ) -> None:
QObject.__init__(self)
self.game = game
self.game.updated.connect(self._game_updated)
+ self.user_relations = relations
+ self.user_relations.trackers.players.updated.connect(self._host_relation_changed)
self._me = me
- self._me.relations.trackers.players.updated.connect(
- self._host_relation_changed,
- )
self._me.clan_changed.connect(self._host_relation_changed)
self._preview_dler = preview_dler
self._preview_dl_request = DownloadRequest()
self._preview_dl_request.done.connect(self._at_preview_downloaded)
@classmethod
- def builder(cls, me, preview_dler):
- def build(game):
- return cls(game, me, preview_dler)
+ def builder(
+ cls,
+ relations: UserRelations,
+ me: User,
+ preview_dler: MapPreviewDownloader,
+ ) -> Callable[[Game], GameModelItem]:
+ def build(game: Game) -> GameModelItem:
+ return cls(game, relations, me, preview_dler)
return build
def _game_updated(self):
diff --git a/src/games/hostgamewidget.py b/src/games/hostgamewidget.py
index 3b36fa850..107eefc72 100644
--- a/src/games/hostgamewidget.py
+++ b/src/games/hostgamewidget.py
@@ -1,16 +1,27 @@
+from __future__ import annotations
+
import logging
+from typing import TYPE_CHECKING
from PyQt6 import QtCore
import fa.check
import util
import vaults.modvault.utils
+from client.user import User
+from downloadManager import MapPreviewDownloader
from fa import maps
+from games.gameitem import GameViewBuilder
from games.gamemodel import GameModel
from games.mapgenoptionsdialog import MapGenDialog
from model.game import Game
from model.game import GameState
from model.game import GameVisibility
+from model.playerset import Playerset
+
+if TYPE_CHECKING:
+ from client._clientwindow import ClientWindow
+
logger = logging.getLogger(__name__)
@@ -263,8 +274,14 @@ def on_map_generated(self, mapname: str) -> None:
self.set_map(mapname)
-def build_launcher(playerset, me, client, view_builder, map_preview_dler):
- model = GameModel(me, map_preview_dler)
+def build_launcher(
+ playerset: Playerset,
+ me: User,
+ client: ClientWindow,
+ view_builder: GameViewBuilder,
+ map_preview_dler: MapPreviewDownloader,
+) -> GameLauncher:
+ model = GameModel(client.user_relations, me, map_preview_dler)
widget = HostGameWidget(client, view_builder, model)
launcher = GameLauncher(playerset, me, client, widget)
return launcher
diff --git a/src/notifications/__init__.py b/src/notifications/__init__.py
index f5a4b74db..590b936cc 100644
--- a/src/notifications/__init__.py
+++ b/src/notifications/__init__.py
@@ -7,6 +7,7 @@
import util
from config import Settings
from fa import maps
+from model.player import Player
from notifications.ns_dialog import NotificationDialog
from notifications.ns_settings import IngameNotification
from notifications.ns_settings import NsSettingsDialog
@@ -42,7 +43,7 @@ def __init__(self, client, gameset, playerset, me):
self.user = util.THEME.icon("client/user.png", pix=True)
- def _newPlayer(self, player):
+ def _newPlayer(self, player: Player) -> None:
if (
self.isDisabled()
or not self.settings.popupEnabled(self.USER_ONLINE)
@@ -55,7 +56,7 @@ def _newPlayer(self, player):
notify_mode = self.settings.getCustomSetting(self.USER_ONLINE, 'mode')
if (
notify_mode != 'all'
- and not self.me.relations.model.is_friend(player.id)
+ and not self.client.user_relations.model.is_friend(player.id)
):
return
@@ -69,7 +70,7 @@ def _newLobby(self, game):
host = game.host_player
notify_mode = self.settings.getCustomSetting(self.NEW_GAME, 'mode')
if notify_mode != 'all':
- if host is None or not self.me.relations.model.is_friend(host):
+ if host is None or not self.client.user_relations.model.is_friend(host):
return
self.events.append((self.NEW_GAME, game.copy()))
@@ -98,7 +99,7 @@ def partyInvite(self, message):
notify_mode = self.settings.getCustomSetting(self.PARTY_INVITE, 'mode')
if (
notify_mode != 'all'
- and not self.me.relations.model.is_friend(message["sender"])
+ and not self.client.user_relations.model.is_friend(message["sender"])
):
return
self.events.append((self.PARTY_INVITE, message))
diff --git a/src/replays/_replayswidget.py b/src/replays/_replayswidget.py
index fc9533858..953ae93e2 100644
--- a/src/replays/_replayswidget.py
+++ b/src/replays/_replayswidget.py
@@ -121,9 +121,9 @@ def _set_misc_formatting(self, game):
def _is_me(self, name):
return client.instance.login == name
- def _is_friend(self, name):
+ def _is_friend(self, name: str) -> bool:
playerid = client.instance.players.getID(name)
- return client.instance.me.relations.model.is_friend(playerid)
+ return client.instance.user_relations.model.is_friend(playerid)
def _is_online(self, name):
return name in client.instance.players
diff --git a/src/stats/itemviews/leaderboardtablemenu.py b/src/stats/itemviews/leaderboardtablemenu.py
index 10da8876b..94755d997 100644
--- a/src/stats/itemviews/leaderboardtablemenu.py
+++ b/src/stats/itemviews/leaderboardtablemenu.py
@@ -50,13 +50,18 @@ def player_actions(self) -> Generator[LeaderboardTableMenuItems, None, None]:
yield LeaderboardTableMenuItems.SHOW_USER_INFO
yield LeaderboardTableMenuItems.VIEW_REPLAYS
- def friendActions(self, name, uid, is_me):
+ def friendActions(
+ self,
+ name: str,
+ uid: int,
+ is_me: bool,
+ ) -> Generator[LeaderboardTableMenuItems, None, None]:
if is_me:
return
- if self.client.me.relations.model.is_friend(uid, name):
+ if self.client.user_relations.model.is_friend(uid, name):
yield LeaderboardTableMenuItems.REMOVE_FRIEND
- elif self.client.me.relations.model.is_foe(uid, name):
+ elif self.client.user_relations.model.is_foe(uid, name):
yield LeaderboardTableMenuItems.REMOVE_FOE
else:
yield LeaderboardTableMenuItems.ADD_FRIEND
@@ -106,8 +111,8 @@ def viewAliases(self, name):
def viewReplays(self, name):
self.client.view_replays(name, self.leaderboardName)
- def handleFriends(self, uid, kind):
- ctl = self.client.me.relations.controller.faf
+ def handleFriends(self, uid: int, kind: LeaderboardTableMenuItems) -> None:
+ ctl = self.client.user_relations.controller.faf
Items = LeaderboardTableMenuItems
if kind == Items.ADD_FRIEND:
From a7197c7e9a8cdc0bb5f0120bd0597a35263d64b9 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Tue, 23 Jul 2024 23:37:05 +0300
Subject: [PATCH 47/73] Merge LeaderboardTableMenu and ChatterMenu into
superclass
---
src/chat/chatter_menu.py | 290 +++---------------
src/chat/chatter_model.py | 5 +-
src/client/_clientwindow.py | 5 +
src/contextmenu/playercontextmenu.py | 308 ++++++++++++++++++++
src/stats/itemviews/leaderboardtablemenu.py | 129 --------
src/stats/itemviews/leaderboardtableview.py | 5 +-
6 files changed, 355 insertions(+), 387 deletions(-)
create mode 100644 src/contextmenu/playercontextmenu.py
delete mode 100644 src/stats/itemviews/leaderboardtablemenu.py
diff --git a/src/chat/chatter_menu.py b/src/chat/chatter_menu.py
index 47429e35b..5645ea671 100644
--- a/src/chat/chatter_menu.py
+++ b/src/chat/chatter_menu.py
@@ -1,266 +1,52 @@
-import logging
-from collections.abc import Generator
-from enum import Enum
-
-from PyQt6.QtGui import QAction
-from PyQt6.QtWidgets import QApplication
-from PyQt6.QtWidgets import QMenu
+from __future__ import annotations
-from model.chat.channelchatter import ChannelChatter
-from model.chat.chatter import Chatter
-from model.game import GameState
-from model.player import Player
-from playercard.playerinfodialog import PlayerInfoDialog
+import logging
+from typing import TYPE_CHECKING
+from typing import Callable
-logger = logging.getLogger(__name__)
+from PyQt6.QtWidgets import QWidget
+from chat._avatarWidget import AvatarWidget
+from client.aliasviewer import AliasWindow
+from client.user import User
+from contextmenu.playercontextmenu import PlayerContextMenu
+from fa.game_runner import GameRunner
+from power import PowerTools
-class ChatterMenuItems(Enum):
- SELECT_AVATAR = "Select avatar"
- SEND_ORCS = "Send the Orcs"
- CLOSE_GAME = "Close Game"
- KICK_PLAYER = "Close FAF Client"
- VIEW_ALIASES = "View aliases"
- VIEW_IN_LEADERBOARDS = "View in Leaderboards"
- JOIN_GAME = "Join hosted Game"
- VIEW_LIVEREPLAY = "View live replay"
- VIEW_REPLAYS = "View Replays in Vault"
- ADD_FRIEND = "Add friend"
- ADD_FOE = "Add foe"
- REMOVE_FRIEND = "Remove friend"
- REMOVE_FOE = "Remove foe"
- ADD_CHATTERBOX = "Ignore"
- REMOVE_CHATTERBOX = "Unignore"
- COPY_USERNAME = "Copy username"
- INVITE_TO_PARTY = "Invite to party"
- KICK_FROM_PARTY = "Kick from party"
- SHOW_USER_INFO = "Show user info"
+if TYPE_CHECKING:
+ from client._clientwindow import ClientWindow
+logger = logging.getLogger(__name__)
-class ChatterMenu:
- def __init__(
- self, me, power_tools, parent_widget, avatar_widget_builder,
- alias_viewer, client_window, game_runner,
- ):
- self._me = me
- self._power_tools = power_tools
- self._parent_widget = parent_widget
- self._avatar_widget_builder = avatar_widget_builder
- self._alias_viewer = alias_viewer
- self._client_window = client_window
- self._game_runner = game_runner
+class ChatterMenu(PlayerContextMenu):
+ # FIXME: ChatterMenu is built in ChattersView's built method
+ # by passing both necessary and unnecessary kwargs to the method below
+ # (notice **kwargs). But the ChattersView itself is built in this way
+ # and the its 'parent's' class and so on. As a result it is hard to
+ # extract any of them from the chain of 'builds' without modifying
+ # lots of chat-related files.
+ # It's better to avoid passing the whole bunch of dependencies arguments
+ # into a single build and wonder which of them are needed for this
+ # particular class and which are for its dependencies.
+ # Many of those build methods (if not all) were created just for the
+ # purpose of passing additional unexpected arguments, so that __init__
+ # doesn't complain about them. (see 9b14d4e7)
+ # Maybe it's fine in some cases, but chat's build chain is very convoluted
+ # and hard to grasp
@classmethod
def build(
- cls, me, power_tools, parent_widget, avatar_widget_builder,
- alias_viewer, client_window, game_runner, **kwargs,
+ cls,
+ me: User,
+ power_tools: PowerTools,
+ parent_widget: QWidget,
+ avatar_widget_builder: Callable[..., AvatarWidget],
+ alias_viewer: AliasWindow,
+ client_window: ClientWindow,
+ game_runner: GameRunner,
+ **kwargs,
):
return cls(
me, power_tools, parent_widget, avatar_widget_builder,
alias_viewer, client_window, game_runner,
)
-
- def actions(self, cc):
- chatter = cc.chatter
- player = chatter.player
- game = None if player is None else player.currentGame
-
- if player is None or self._me.player is None:
- is_me = False
- else:
- is_me = player.id == self._me.player.id
-
- yield list(self.user_actions(player))
- yield list(self.me_actions(is_me))
- yield list(self.power_actions(self._power_tools.power))
- yield list(self.chatter_actions())
- yield list(self.player_actions(player, game, is_me))
- yield list(self.friend_actions(player, chatter, cc, is_me))
- yield list(self.ignore_actions(player, chatter, cc, is_me))
- yield list(self.party_actions(player, is_me))
-
- def user_actions(self, player: Player | None) -> Generator[ChatterMenuItems, None, None]:
- if player is not None:
- yield ChatterMenuItems.SHOW_USER_INFO
-
- def chatter_actions(self):
- yield ChatterMenuItems.COPY_USERNAME
- yield ChatterMenuItems.VIEW_ALIASES
-
- def me_actions(self, is_me):
- if is_me:
- yield ChatterMenuItems.SELECT_AVATAR
-
- def power_actions(self, power):
- if power == 2:
- yield ChatterMenuItems.SEND_ORCS
- yield ChatterMenuItems.CLOSE_GAME
- yield ChatterMenuItems.KICK_PLAYER
-
- def player_actions(self, player, game, is_me):
- if game is not None and not is_me:
- if game.state == GameState.OPEN:
- yield ChatterMenuItems.JOIN_GAME
- elif game.state == GameState.PLAYING:
- yield ChatterMenuItems.VIEW_LIVEREPLAY
-
- if player is not None:
- if player.ladder_estimate != 0:
- yield ChatterMenuItems.VIEW_IN_LEADERBOARDS
- yield ChatterMenuItems.VIEW_REPLAYS
-
- def friend_actions(
- self,
- player: Player | None,
- chatter: Chatter,
- cc: ChannelChatter,
- is_me: bool,
- ) -> Generator[ChatterMenuItems, None, None]:
- if is_me:
- return
- id_ = -1 if player is None else player.id
- name = chatter.name
- if self._client_window.user_relations.model.is_friend(id_, name):
- yield ChatterMenuItems.REMOVE_FRIEND
- elif self._client_window.user_relations.model.is_foe(id_, name):
- yield ChatterMenuItems.REMOVE_FOE
- else:
- yield ChatterMenuItems.ADD_FRIEND
- yield ChatterMenuItems.ADD_FOE
-
- def ignore_actions(
- self,
- player: Player,
- chatter: Chatter,
- cc: ChannelChatter,
- is_me: bool,
- ) -> Generator[ChatterMenuItems, None, None]:
- if is_me:
- return
- id_ = -1 if player is None else player.id
- name = chatter.name
- if self._client_window.user_relations.model.is_chatterbox(id_, name):
- yield ChatterMenuItems.REMOVE_CHATTERBOX
- else:
- if not cc.is_mod() and not chatter.is_base_channel_mod():
- yield ChatterMenuItems.ADD_CHATTERBOX
-
- def party_actions(self, player, is_me):
- if is_me:
- return
- if player is None:
- return
- else:
- if player.id in self._client_window.games.party.memberIds:
- if (
- self._me.player.id
- == self._client_window.games.party.owner_id
- ):
- yield ChatterMenuItems.KICK_FROM_PARTY
- elif player.currentGame is not None:
- return
- else:
- yield ChatterMenuItems.INVITE_TO_PARTY
-
- def get_context_menu(self, data, point):
- return self.menu(data.cc)
-
- def menu(self, cc):
- menu = QMenu(self._parent_widget)
-
- def add_entry(item):
- action = QAction(item.value, menu)
- action.triggered.connect(self.handler(cc, item))
- menu.addAction(action)
-
- first = True
- for category in self.actions(cc):
- if not category:
- continue
- if not first:
- menu.addSeparator()
- for item in category:
- add_entry(item)
- first = False
- return menu
-
- def handler(self, cc, kind):
- chatter = cc.chatter
- player = chatter.player
- game = None if player is None else player.currentGame
- return lambda: self._handle_action(chatter, player, game, kind)
-
- def _handle_action(self, chatter, player, game, kind):
- Items = ChatterMenuItems
- if kind == Items.COPY_USERNAME:
- self._copy_username(chatter)
- elif kind == Items.SEND_ORCS:
- self._power_tools.actions.send_the_orcs(chatter.name)
- elif kind == Items.CLOSE_GAME:
- self._power_tools.view.close_game_dialog.show(chatter.name)
- elif kind == Items.KICK_PLAYER:
- self._power_tools.view.kick_dialog(chatter.name)
- elif kind == Items.SELECT_AVATAR:
- self._avatar_widget_builder().show()
- elif kind in [
- Items.ADD_FRIEND, Items.ADD_FOE, Items.REMOVE_FRIEND,
- Items.REMOVE_FOE,
- ]:
- self._handle_friends(chatter, player, kind)
- elif kind in [Items.ADD_CHATTERBOX, Items.REMOVE_CHATTERBOX]:
- self._handle_chatterboxes(chatter, player, kind)
- elif kind == Items.VIEW_ALIASES:
- self._view_aliases(chatter)
- elif kind == Items.SHOW_USER_INFO:
- self._show_user_info(player)
- elif kind == Items.VIEW_REPLAYS:
- self._client_window.view_replays(player.login)
- elif kind == Items.VIEW_IN_LEADERBOARDS:
- self._client_window.view_in_leaderboards(player)
- elif kind in [Items.JOIN_GAME, Items.VIEW_LIVEREPLAY]:
- self._game_runner.run_game_with_url(game, player.id)
- elif kind == Items.INVITE_TO_PARTY:
- self._client_window.invite_to_party(player.id)
- elif kind == Items.KICK_FROM_PARTY:
- self._client_window.games.kickPlayerFromParty(player.id)
-
- def _copy_username(self, chatter):
- QApplication.clipboard().setText(chatter.name)
-
- def _handle_friends(self, chatter: Chatter, player: Player, kind: ChatterMenuItems) -> None:
- ctl = self._client_window.user_relations.controller
- ctl = ctl.faf if player is not None else ctl.irc
- uid = player.id if player is not None else chatter.name
-
- Items = ChatterMenuItems
- if kind == Items.ADD_FRIEND:
- ctl.friends.add(uid)
- elif kind == Items.REMOVE_FRIEND:
- ctl.friends.remove(uid)
- if kind == Items.ADD_FOE:
- ctl.foes.add(uid)
- elif kind == Items.REMOVE_FOE:
- ctl.foes.remove(uid)
-
- def _handle_chatterboxes(
- self,
- chatter: Chatter,
- player: Player | None,
- kind: ChatterMenuItems,
- ) -> None:
- ctl = self._client_window.user_relations.controller
- ctl = ctl.faf if player is not None else ctl.irc
- uid = player.id if player is not None else chatter.name
-
- Items = ChatterMenuItems
- if kind == Items.ADD_CHATTERBOX:
- ctl.chatterboxes.add(uid)
- elif kind == Items.REMOVE_CHATTERBOX:
- ctl.chatterboxes.remove(uid)
-
- def _view_aliases(self, chatter):
- self._alias_viewer.view_aliases(chatter.name)
-
- def _show_user_info(self, player: Player) -> None:
- dialog = PlayerInfoDialog(self._client_window, str(player.id))
- dialog.run()
diff --git a/src/chat/chatter_model.py b/src/chat/chatter_model.py
index 031505443..2f436af75 100644
--- a/src/chat/chatter_model.py
+++ b/src/chat/chatter_model.py
@@ -591,12 +591,13 @@ def _handle_tooltip(self, widget: QtWidgets.QWidget, event: QtGui.QMouseEvent) -
QtWidgets.QToolTip.showText(event.globalPos(), tooltip_text, widget)
return True
- def _handle_context_menu(self, widget, event):
+ def _handle_context_menu(self, widget: QtWidgets.QWidget, event: QtGui.QMouseEvent) -> bool:
data, elem = self._get_data_and_elem(widget, event)
if data is None:
return False
- menu = self._menu_handler.get_context_menu(data, elem)
+ player_id = data.player.id if data.player is not None else -1
+ menu = self._menu_handler.get_context_menu(data.chatter.name, player_id)
menu.popup(QtGui.QCursor.pos())
return True
diff --git a/src/client/_clientwindow.py b/src/client/_clientwindow.py
index b01ce9d2f..14dd63e0a 100644
--- a/src/client/_clientwindow.py
+++ b/src/client/_clientwindow.py
@@ -42,6 +42,7 @@
from client.user import UserRelations
from client.user import UserRelationTrackers
from connectivity.ConnectivityDialog import ConnectivityDialog
+from contextmenu.playercontextmenu import PlayerContextMenu
from coop import CoopWidget
from downloadManager import AvatarDownloader
from downloadManager import MapSmallPreviewDownloader
@@ -704,6 +705,10 @@ def setup(self):
avatar_dler=self.avatar_downloader,
theme=util.THEME,
)
+ self.player_ctx_menu = PlayerContextMenu(
+ self.me, self.power_tools, self, self._avatar_widget_builder,
+ self._alias_viewer, self, self._game_runner,
+ )
chat_connection = IrcConnection.build(settings=config.Settings)
line_metadata_builder = ChatLineMetadataBuilder.build(
diff --git a/src/contextmenu/playercontextmenu.py b/src/contextmenu/playercontextmenu.py
new file mode 100644
index 000000000..4d7a1ee75
--- /dev/null
+++ b/src/contextmenu/playercontextmenu.py
@@ -0,0 +1,308 @@
+from __future__ import annotations
+
+import logging
+from collections.abc import Generator
+from enum import Enum
+from typing import TYPE_CHECKING
+from typing import Callable
+
+from PyQt6.QtGui import QAction
+from PyQt6.QtWidgets import QApplication
+from PyQt6.QtWidgets import QMenu
+from PyQt6.QtWidgets import QWidget
+
+from chat._avatarWidget import AvatarWidget
+from client.aliasviewer import AliasWindow
+from client.user import User
+from fa.game_runner import GameRunner
+from model.game import GameState
+from model.player import Player
+from playercard.playerinfodialog import PlayerInfoDialog
+from power import PowerTools
+
+if TYPE_CHECKING:
+ from client._clientwindow import ClientWindow
+
+logger = logging.getLogger(__name__)
+
+
+class PlayerMenuItem(Enum):
+ SELECT_AVATAR = "Select avatar"
+ SEND_ORCS = "Send the Orcs"
+ CLOSE_GAME = "Close Game"
+ KICK_PLAYER = "Close FAF Client"
+ VIEW_ALIASES = "View aliases"
+ VIEW_IN_LEADERBOARDS = "View in Leaderboards"
+ JOIN_GAME = "Join hosted Game"
+ VIEW_LIVEREPLAY = "View live replay"
+ VIEW_REPLAYS = "View Replays in Vault"
+ ADD_FRIEND = "Add friend"
+ ADD_FOE = "Add foe"
+ REMOVE_FRIEND = "Remove friend"
+ REMOVE_FOE = "Remove foe"
+ ADD_CHATTERBOX = "Ignore"
+ REMOVE_CHATTERBOX = "Unignore"
+ COPY_USERNAME = "Copy username"
+ INVITE_TO_PARTY = "Invite to party"
+ KICK_FROM_PARTY = "Kick from party"
+ SHOW_USER_INFO = "Show user info"
+
+
+class PlayerContextMenu:
+ def __init__(
+ self,
+ me: User,
+ power_tools: PowerTools,
+ parent_widget: QWidget,
+ avatar_widget_builder: Callable[..., AvatarWidget],
+ alias_viewer: AliasWindow,
+ client_window: ClientWindow,
+ game_runner: GameRunner,
+ ) -> None:
+ self._me = me
+ self._power_tools = power_tools
+ self._parent_widget = parent_widget
+ self._avatar_widget_builder = avatar_widget_builder
+ self._alias_viewer = alias_viewer
+ self._client_window = client_window
+ self._game_runner = game_runner
+
+ def actions(self, login: str, player_id: int) -> Generator[list[PlayerMenuItem], None, None]:
+ if player_id == -1 or self._me.player is None:
+ is_me = False
+ else:
+ is_me = player_id == self._me.player.id
+
+ yield list(self.user_actions(player_id))
+ yield list(self.me_actions(is_me=is_me))
+ yield list(self.power_actions(self._power_tools.power))
+ yield list(self.chatter_actions(player_id))
+ yield list(self.player_actions(player_id, is_me=is_me))
+ yield list(self.friend_actions(player_id, login, is_me=is_me))
+ yield list(self.ignore_actions(player_id, login, is_me=is_me))
+ yield list(self.party_actions(player_id, is_me=is_me))
+
+ def user_actions(self, player_id: int) -> Generator[PlayerMenuItem, None, None]:
+ if player_id != -1:
+ yield PlayerMenuItem.SHOW_USER_INFO
+
+ def chatter_actions(self, player_id: int) -> Generator[PlayerMenuItem, None, None]:
+ yield PlayerMenuItem.COPY_USERNAME
+ if player_id != -1:
+ yield PlayerMenuItem.VIEW_ALIASES
+
+ def me_actions(self, *, is_me: bool) -> Generator[PlayerMenuItem, None, None]:
+ if is_me:
+ yield PlayerMenuItem.SELECT_AVATAR
+
+ def power_actions(self, power: int) -> Generator[PlayerMenuItem, None, None]:
+ if power == 2:
+ yield PlayerMenuItem.SEND_ORCS
+ yield PlayerMenuItem.CLOSE_GAME
+ yield PlayerMenuItem.KICK_PLAYER
+
+ def _get_online_player_by_id(self, player_id: int) -> Player | None:
+ try:
+ return self._client_window.players[player_id]
+ except KeyError:
+ return None
+
+ def player_actions(
+ self,
+ player_id: int,
+ *,
+ is_me: bool,
+ ) -> Generator[PlayerMenuItem, None, None]:
+ if player_id != -1:
+ yield PlayerMenuItem.VIEW_REPLAYS
+
+ online_player = self._get_online_player_by_id(player_id)
+
+ if online_player is None:
+ return
+
+ game = online_player.currentGame
+
+ if game is not None and not is_me:
+ if game.state == GameState.OPEN:
+ yield PlayerMenuItem.JOIN_GAME
+ elif game.state == GameState.PLAYING:
+ yield PlayerMenuItem.VIEW_LIVEREPLAY
+
+ if online_player.ladder_estimate != 0:
+ yield PlayerMenuItem.VIEW_IN_LEADERBOARDS
+
+ def friend_actions(
+ self,
+ player_id: int,
+ login: str,
+ *,
+ is_me: bool,
+ ) -> Generator[PlayerMenuItem, None, None]:
+ if is_me:
+ return
+ if self._client_window.user_relations.model.is_friend(player_id, login):
+ yield PlayerMenuItem.REMOVE_FRIEND
+ elif self._client_window.user_relations.model.is_foe(player_id, login):
+ yield PlayerMenuItem.REMOVE_FOE
+ else:
+ yield PlayerMenuItem.ADD_FRIEND
+ yield PlayerMenuItem.ADD_FOE
+
+ def ignore_actions(
+ self,
+ player_id: int,
+ login: str,
+ *,
+ is_me: bool,
+ ) -> Generator[PlayerMenuItem, None, None]:
+ if is_me:
+ return
+ if self._client_window.user_relations.model.is_chatterbox(player_id, login):
+ yield PlayerMenuItem.REMOVE_CHATTERBOX
+ else:
+ yield PlayerMenuItem.ADD_CHATTERBOX
+
+ def party_actions(
+ self,
+ player_id: int,
+ *,
+ is_me: bool,
+ ) -> Generator[PlayerMenuItem, None, None]:
+ if is_me:
+ return
+
+ online_player = self._get_online_player_by_id(player_id)
+ if online_player is None:
+ return
+
+ if online_player.id in self._client_window.games.party.memberIds:
+ if (
+ self._me.player.id
+ == self._client_window.games.party.owner_id
+ ):
+ yield PlayerMenuItem.KICK_FROM_PARTY
+ elif online_player.currentGame is not None:
+ return
+ else:
+ yield PlayerMenuItem.INVITE_TO_PARTY
+
+ def get_context_menu(self, login: str, player_id: int) -> QMenu:
+ return self.menu(login, player_id)
+
+ def menu(self, login: str, player_id: int) -> QMenu:
+ menu = QMenu(self._parent_widget)
+
+ def add_entry(item):
+ action = QAction(item.value, menu)
+ action.triggered.connect(self.handler(login, player_id, item))
+ menu.addAction(action)
+
+ for category in self.actions(login, player_id):
+ if not category:
+ continue
+ for item in category:
+ add_entry(item)
+ menu.addSeparator()
+ return menu
+
+ def handler(self, login: str, player_id: int, kind: PlayerMenuItem) -> Callable[[], None]:
+ return lambda: self._handle_action(login, player_id, kind)
+
+ def _handle_action(self, login: str, player_id: int, kind: PlayerMenuItem) -> None:
+ Items = PlayerMenuItem
+ if kind == Items.COPY_USERNAME:
+ self._copy_username(login)
+ elif kind == Items.SEND_ORCS:
+ self._power_tools.actions.send_the_orcs(login)
+ elif kind == Items.CLOSE_GAME:
+ self._power_tools.view.close_game_dialog.show(login)
+ elif kind == Items.KICK_PLAYER:
+ self._power_tools.view.kick_dialog(login)
+ elif kind == Items.SELECT_AVATAR:
+ self._avatar_widget_builder().show()
+ elif kind in [
+ Items.ADD_FRIEND, Items.ADD_FOE, Items.REMOVE_FRIEND,
+ Items.REMOVE_FOE,
+ ]:
+ self._handle_friends(login, player_id, kind)
+ elif kind in [Items.ADD_CHATTERBOX, Items.REMOVE_CHATTERBOX]:
+ self._handle_chatterboxes(login, player_id, kind)
+ elif kind == Items.VIEW_ALIASES:
+ self._view_aliases(login)
+ elif kind == Items.SHOW_USER_INFO:
+ self._show_user_info(player_id)
+ elif kind == Items.VIEW_REPLAYS:
+ self._client_window.view_replays(login)
+ elif kind == Items.VIEW_IN_LEADERBOARDS:
+ self._client_window.view_in_leaderboards(player_id)
+ elif kind in [Items.JOIN_GAME, Items.VIEW_LIVEREPLAY]:
+ self._handle_game(player_id)
+ elif kind == Items.INVITE_TO_PARTY:
+ self._client_window.invite_to_party(player_id)
+ elif kind == Items.KICK_FROM_PARTY:
+ self._client_window.games.kickPlayerFromParty(player_id)
+
+ def _handle_game(self, player_id: int) -> None:
+ online_player = self._get_online_player_by_id(player_id)
+ if online_player is None:
+ return
+
+ game = online_player.currentGame
+ if game is None:
+ return
+
+ self._game_runner.run_game_with_url(game, player_id)
+
+ def _copy_username(self, login: str) -> None:
+ clip = QApplication.clipboard()
+ if clip is not None:
+ clip.setText(login)
+
+ def _handle_friends(self, login: str, player_id: int, kind: PlayerMenuItem) -> None:
+ ctl = self._client_window.user_relations.controller
+
+ if player_id == -1:
+ ctl = ctl.irc
+ uid = login
+ else:
+ ctl = ctl.faf
+ uid = player_id
+
+ Items = PlayerMenuItem
+ if kind == Items.ADD_FRIEND:
+ ctl.friends.add(uid)
+ elif kind == Items.REMOVE_FRIEND:
+ ctl.friends.remove(uid)
+ if kind == Items.ADD_FOE:
+ ctl.foes.add(uid)
+ elif kind == Items.REMOVE_FOE:
+ ctl.foes.remove(uid)
+
+ def _handle_chatterboxes(
+ self,
+ login: str,
+ player_id: int,
+ kind: PlayerMenuItem,
+ ) -> None:
+ ctl = self._client_window.user_relations.controller
+
+ if player_id == -1:
+ ctl = ctl.irc
+ uid = login
+ else:
+ ctl = ctl.faf
+ uid = player_id
+
+ Items = PlayerMenuItem
+ if kind == Items.ADD_CHATTERBOX:
+ ctl.chatterboxes.add(uid)
+ elif kind == Items.REMOVE_CHATTERBOX:
+ ctl.chatterboxes.remove(uid)
+
+ def _view_aliases(self, login: str) -> None:
+ self._alias_viewer.view_aliases(login)
+
+ def _show_user_info(self, player_id: int) -> None:
+ dialog = PlayerInfoDialog(self._client_window, str(player_id))
+ dialog.run()
diff --git a/src/stats/itemviews/leaderboardtablemenu.py b/src/stats/itemviews/leaderboardtablemenu.py
deleted file mode 100644
index 94755d997..000000000
--- a/src/stats/itemviews/leaderboardtablemenu.py
+++ /dev/null
@@ -1,129 +0,0 @@
-from collections.abc import Generator
-from enum import Enum
-
-from PyQt6 import QtWidgets
-from PyQt6.QtGui import QAction
-
-from playercard.playerinfodialog import PlayerInfoDialog
-
-
-class LeaderboardTableMenuItems(Enum):
- VIEW_ALIASES = "View aliases"
- VIEW_REPLAYS = "View Replays in Vault"
- ADD_FRIEND = "Add friend"
- ADD_FOE = "Add foe"
- REMOVE_FRIEND = "Remove friend"
- REMOVE_FOE = "Remove foe"
- COPY_USERNAME = "Copy username"
- SHOW_USER_INFO = "Show user info"
-
-
-class LeaderboardTableMenu:
- def __init__(self, parent, client, leaderboardName):
- self.parent = parent
- self.client = client
- self.leaderboardName = leaderboardName
-
- @classmethod
- def build(cls, parent, client, leaderboardName):
- return cls(parent, client, leaderboardName)
-
- def actions(
- self,
- name: str,
- uid: str,
- ) -> Generator[list[LeaderboardTableMenuItems], None, None]:
- yield list(self.player_actions())
- yield list(self.usernameActions())
-
- if self.client.me.player is None:
- return
-
- is_me = self.client.me.id == uid
- yield list(self.friendActions(name, uid, is_me))
-
- def usernameActions(self):
- yield LeaderboardTableMenuItems.COPY_USERNAME
- yield LeaderboardTableMenuItems.VIEW_ALIASES
-
- def player_actions(self) -> Generator[LeaderboardTableMenuItems, None, None]:
- yield LeaderboardTableMenuItems.SHOW_USER_INFO
- yield LeaderboardTableMenuItems.VIEW_REPLAYS
-
- def friendActions(
- self,
- name: str,
- uid: int,
- is_me: bool,
- ) -> Generator[LeaderboardTableMenuItems, None, None]:
- if is_me:
- return
-
- if self.client.user_relations.model.is_friend(uid, name):
- yield LeaderboardTableMenuItems.REMOVE_FRIEND
- elif self.client.user_relations.model.is_foe(uid, name):
- yield LeaderboardTableMenuItems.REMOVE_FOE
- else:
- yield LeaderboardTableMenuItems.ADD_FRIEND
- yield LeaderboardTableMenuItems.ADD_FOE
-
- def getMenu(self, name: str, uid: int) -> QtWidgets.QMenu:
- menu = QtWidgets.QMenu(self.parent)
-
- def addEntry(item):
- action = QAction(item.value, menu)
- action.triggered.connect(self.handler(name, uid, item))
- menu.addAction(action)
-
- first = True
- for category in self.actions(name, uid):
- if not category:
- continue
- if not first:
- menu.addSeparator()
- for item in category:
- addEntry(item)
- first = False
- return menu
-
- def handler(self, name, uid, kind):
- Items = LeaderboardTableMenuItems
- if kind == Items.COPY_USERNAME:
- return lambda: self.copyUsername(name)
- elif kind == Items.VIEW_ALIASES:
- return lambda: self.viewAliases(name)
- elif kind == Items.VIEW_REPLAYS:
- return lambda: self.viewReplays(name)
- elif kind == Items.SHOW_USER_INFO:
- return lambda: self.show_user_info(uid)
- elif kind in [
- Items.ADD_FRIEND, Items.ADD_FOE, Items.REMOVE_FRIEND,
- Items.REMOVE_FOE,
- ]:
- return lambda: self.handleFriends(uid, kind)
-
- def copyUsername(self, name):
- QtWidgets.QApplication.clipboard().setText(name)
-
- def viewAliases(self, name):
- self.client._alias_viewer.view_aliases(name)
-
- def viewReplays(self, name):
- self.client.view_replays(name, self.leaderboardName)
-
- def handleFriends(self, uid: int, kind: LeaderboardTableMenuItems) -> None:
- ctl = self.client.user_relations.controller.faf
-
- Items = LeaderboardTableMenuItems
- if kind == Items.ADD_FRIEND:
- ctl.friends.add(uid)
- elif kind == Items.REMOVE_FRIEND:
- ctl.friends.remove(uid)
- if kind == Items.ADD_FOE:
- ctl.foes.add(uid)
- elif kind == Items.REMOVE_FOE:
- ctl.foes.remove(uid)
-
- def show_user_info(self, uid: str) -> None:
- dialog = PlayerInfoDialog(self.client, uid)
- dialog.run()
diff --git a/src/stats/itemviews/leaderboardtableview.py b/src/stats/itemviews/leaderboardtableview.py
index 69d78bd63..61782c8f8 100644
--- a/src/stats/itemviews/leaderboardtableview.py
+++ b/src/stats/itemviews/leaderboardtableview.py
@@ -3,7 +3,6 @@
from PyQt6.QtGui import QMouseEvent
from qt.itemviews.tableview import TableView
-from stats.itemviews.leaderboardtablemenu import LeaderboardTableMenu
class LeaderboardTableView(TableView):
@@ -24,7 +23,5 @@ def mousePressEvent(self, event: QMouseEvent) -> None:
def context_menu(self, name: str, uid: int) -> None:
client = self.parent().parent().client
- leaderboardName = self.parent().parent().leaderboardName
- menuHandler = LeaderboardTableMenu.build(self, client, leaderboardName)
- menu = menuHandler.getMenu(name, uid)
+ menu = client.player_ctx_menu.get_context_menu(name, uid)
menu.popup(QCursor.pos())
From 4dd20d38ec28e113949019e46e555d1b8c206298 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Wed, 24 Jul 2024 00:12:40 +0300
Subject: [PATCH 48/73] PlayerContextMenu: Put social handlers into one method
---
src/contextmenu/playercontextmenu.py | 49 ++++++++--------------------
1 file changed, 14 insertions(+), 35 deletions(-)
diff --git a/src/contextmenu/playercontextmenu.py b/src/contextmenu/playercontextmenu.py
index 4d7a1ee75..4096fac4a 100644
--- a/src/contextmenu/playercontextmenu.py
+++ b/src/contextmenu/playercontextmenu.py
@@ -223,11 +223,9 @@ def _handle_action(self, login: str, player_id: int, kind: PlayerMenuItem) -> No
self._avatar_widget_builder().show()
elif kind in [
Items.ADD_FRIEND, Items.ADD_FOE, Items.REMOVE_FRIEND,
- Items.REMOVE_FOE,
+ Items.REMOVE_FOE, Items.ADD_CHATTERBOX, Items.REMOVE_CHATTERBOX,
]:
- self._handle_friends(login, player_id, kind)
- elif kind in [Items.ADD_CHATTERBOX, Items.REMOVE_CHATTERBOX]:
- self._handle_chatterboxes(login, player_id, kind)
+ self._handle_social(login, player_id, kind)
elif kind == Items.VIEW_ALIASES:
self._view_aliases(login)
elif kind == Items.SHOW_USER_INFO:
@@ -259,7 +257,7 @@ def _copy_username(self, login: str) -> None:
if clip is not None:
clip.setText(login)
- def _handle_friends(self, login: str, player_id: int, kind: PlayerMenuItem) -> None:
+ def _handle_social(self, login: str, player_id: int, kind: PlayerMenuItem) -> None:
ctl = self._client_window.user_relations.controller
if player_id == -1:
@@ -269,36 +267,17 @@ def _handle_friends(self, login: str, player_id: int, kind: PlayerMenuItem) -> N
ctl = ctl.faf
uid = player_id
- Items = PlayerMenuItem
- if kind == Items.ADD_FRIEND:
- ctl.friends.add(uid)
- elif kind == Items.REMOVE_FRIEND:
- ctl.friends.remove(uid)
- if kind == Items.ADD_FOE:
- ctl.foes.add(uid)
- elif kind == Items.REMOVE_FOE:
- ctl.foes.remove(uid)
-
- def _handle_chatterboxes(
- self,
- login: str,
- player_id: int,
- kind: PlayerMenuItem,
- ) -> None:
- ctl = self._client_window.user_relations.controller
-
- if player_id == -1:
- ctl = ctl.irc
- uid = login
- else:
- ctl = ctl.faf
- uid = player_id
-
- Items = PlayerMenuItem
- if kind == Items.ADD_CHATTERBOX:
- ctl.chatterboxes.add(uid)
- elif kind == Items.REMOVE_CHATTERBOX:
- ctl.chatterboxes.remove(uid)
+ social_handlers = {
+ PlayerMenuItem.ADD_FRIEND: ctl.friends.add,
+ PlayerMenuItem.REMOVE_FRIEND: ctl.friends.remove,
+ PlayerMenuItem.ADD_FOE: ctl.foes.add,
+ PlayerMenuItem.REMOVE_FOE: ctl.foes.remove,
+ PlayerMenuItem.ADD_CHATTERBOX: ctl.chatterboxes.add,
+ PlayerMenuItem.REMOVE_CHATTERBOX: ctl.chatterboxes.remove,
+ }
+ handler = social_handlers.get(kind)
+ if handler is not None:
+ handler(uid)
def _view_aliases(self, login: str) -> None:
self._alias_viewer.view_aliases(login)
From d4d7442c0e5281b5cb5047c26254377fc0f3a392 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Wed, 24 Jul 2024 00:17:18 +0300
Subject: [PATCH 49/73] Remove 'Veiw in Leaderboards' action from context
1. there are multiple leaderboards and their count can change
2. its behaviour is very inconvenient
---
src/client/_clientwindow.py | 10 ----------
src/contextmenu/playercontextmenu.py | 6 ------
2 files changed, 16 deletions(-)
diff --git a/src/client/_clientwindow.py b/src/client/_clientwindow.py
index 14dd63e0a..a03a44a6d 100644
--- a/src/client/_clientwindow.py
+++ b/src/client/_clientwindow.py
@@ -1671,16 +1671,6 @@ def view_replays(self, name, leaderboardName=None):
self.replays.set_player(name, leaderboardName)
self.mainTabs.setCurrentIndex(self.mainTabs.indexOf(self.replaysTab))
- def view_in_leaderboards(self, user):
- self.ladder.setCurrentIndex(
- self.ladder.indexOf(self.ladder.leaderboardsTab),
- )
- self.ladder.leaderboards.widget(0).searchPlayerInLeaderboard(user)
- self.ladder.leaderboards.widget(1).searchPlayerInLeaderboard(user)
- self.ladder.leaderboards.widget(2).searchPlayerInLeaderboard(user)
- self.ladder.leaderboards.setCurrentIndex(1)
- self.mainTabs.setCurrentIndex(self.mainTabs.indexOf(self.ladderTab))
-
def manage_power(self):
""" update the interface accordingly to the power of the user """
if self.power_tools.power >= 1:
diff --git a/src/contextmenu/playercontextmenu.py b/src/contextmenu/playercontextmenu.py
index 4096fac4a..a5ee3e39c 100644
--- a/src/contextmenu/playercontextmenu.py
+++ b/src/contextmenu/playercontextmenu.py
@@ -32,7 +32,6 @@ class PlayerMenuItem(Enum):
CLOSE_GAME = "Close Game"
KICK_PLAYER = "Close FAF Client"
VIEW_ALIASES = "View aliases"
- VIEW_IN_LEADERBOARDS = "View in Leaderboards"
JOIN_GAME = "Join hosted Game"
VIEW_LIVEREPLAY = "View live replay"
VIEW_REPLAYS = "View Replays in Vault"
@@ -129,9 +128,6 @@ def player_actions(
elif game.state == GameState.PLAYING:
yield PlayerMenuItem.VIEW_LIVEREPLAY
- if online_player.ladder_estimate != 0:
- yield PlayerMenuItem.VIEW_IN_LEADERBOARDS
-
def friend_actions(
self,
player_id: int,
@@ -232,8 +228,6 @@ def _handle_action(self, login: str, player_id: int, kind: PlayerMenuItem) -> No
self._show_user_info(player_id)
elif kind == Items.VIEW_REPLAYS:
self._client_window.view_replays(login)
- elif kind == Items.VIEW_IN_LEADERBOARDS:
- self._client_window.view_in_leaderboards(player_id)
elif kind in [Items.JOIN_GAME, Items.VIEW_LIVEREPLAY]:
self._handle_game(player_id)
elif kind == Items.INVITE_TO_PARTY:
From c07fd4a7417bb659f2ff3e31db500fbb47b23604 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Thu, 25 Jul 2024 20:35:35 +0300
Subject: [PATCH 50/73] Add context menu to players in replay scoreboard
---
src/api/models/ConfiguredModel.py | 15 ++++++++---
src/replays/models.py | 43 ++++++++++++++++---------------
src/replays/replayitem.py | 2 ++
src/replays/scoreboard.py | 9 +++++--
src/replays/scoreboardlistview.py | 30 +++++++++++++++++++++
5 files changed, 73 insertions(+), 26 deletions(-)
create mode 100644 src/replays/scoreboardlistview.py
diff --git a/src/api/models/ConfiguredModel.py b/src/api/models/ConfiguredModel.py
index 1154f55ce..166f32d33 100644
--- a/src/api/models/ConfiguredModel.py
+++ b/src/api/models/ConfiguredModel.py
@@ -5,6 +5,11 @@
from pydantic import field_validator
+def api_response_empty(resp: dict) -> bool:
+ wasnt_included = ("id" in resp and "type" in resp and len(resp) == 2)
+ return not resp or wasnt_included
+
+
class ConfiguredModel(BaseModel):
model_config = ConfigDict(populate_by_name=True)
@@ -12,8 +17,12 @@ class ConfiguredModel(BaseModel):
@classmethod
def ensure_included_and_not_empty_or_none(cls, v: Any) -> Any:
if isinstance(v, dict):
- if not v or ("id" in v and "type" in v and len(v) == 2):
+ if api_response_empty(v):
+ return None
+ elif isinstance(v, list):
+ if (
+ not v
+ or len(list(filter(api_response_empty, v))) == len(v)
+ ):
return None
- elif isinstance(v, list) and not v:
- return None
return v
diff --git a/src/replays/models.py b/src/replays/models.py
index 6ab949989..0ccb3fc07 100644
--- a/src/replays/models.py
+++ b/src/replays/models.py
@@ -9,6 +9,7 @@
from PyQt6.QtGui import QIcon
import util
+from api.models.Player import Player
from model.rating import Rating
from pydantic import BaseModel
from pydantic import Field
@@ -31,13 +32,13 @@ class MetadataModel(BaseModel):
class ScoreboardModelItem(QObject):
updated = pyqtSignal()
- def __init__(self, player: dict, mod: str | None) -> None:
+ def __init__(self, replay_data: dict, mod: str | None) -> None:
QObject.__init__(self)
- self.player = player
+ self.replay_data = replay_data
self.mod = mod or ""
-
- if len(self.player["ratingChanges"]) > 0:
- self.rating_stats = self.player["ratingChanges"][0]
+ self.player = Player(**replay_data["player"])
+ if len(self.replay_data["ratingChanges"]) > 0:
+ self.rating_stats = self.replay_data["ratingChanges"][0]
else:
self.rating_stats = None
@@ -48,10 +49,10 @@ def build(data: dict) -> ScoreboardModelItem:
return build
def score(self) -> int:
- return self.player["score"]
+ return self.replay_data["score"]
def login(self) -> str:
- return self.player["player"]["login"]
+ return self.player.login
def rating_before(self) -> int:
# gamePlayerStats' fields 'before*' and 'after*' can be removed
@@ -63,10 +64,10 @@ def rating_before(self) -> int:
self.rating_stats["deviationBefore"],
)
return round(rating.displayed())
- elif self.player.get("beforeMean") and self.player.get("beforeDeviation"):
+ elif self.replay_data.get("beforeMean") and self.replay_data.get("beforeDeviation"):
rating = Rating(
- self.player["beforeMean"],
- self.player["beforeDeviation"],
+ self.replay_data["beforeMean"],
+ self.replay_data["beforeDeviation"],
)
return round(rating.displayed())
return 0
@@ -78,16 +79,16 @@ def rating_after(self) -> int:
self.rating_stats["deviationAfter"],
)
return round(rating.displayed())
- elif self.player.get("afterMean") and self.player.get("afterDeviation"):
+ elif self.replay_data.get("afterMean") and self.replay_data.get("afterDeviation"):
rating = Rating(
- self.player["afterMean"],
- self.player["afterDeviation"],
+ self.replay_data["afterMean"],
+ self.replay_data["afterDeviation"],
)
return round(rating.displayed())
return 0
def rating(self) -> int | None:
- if self.rating_stats is None and "beforeMean" not in self.player:
+ if self.rating_stats is None and "beforeMean" not in self.replay_data:
return None
return self.rating_before()
@@ -97,21 +98,21 @@ def rating_change(self) -> int:
return self.rating_after() - self.rating_before()
def faction_name(self) -> str:
- if "faction" in self.player:
- if self.player["faction"] == 1:
+ if "faction" in self.replay_data:
+ if self.replay_data["faction"] == 1:
faction = "UEF"
- elif self.player["faction"] == 2:
+ elif self.replay_data["faction"] == 2:
faction = "Aeon"
- elif self.player["faction"] == 3:
+ elif self.replay_data["faction"] == 3:
faction = "Cybran"
- elif self.player["faction"] == 4:
+ elif self.replay_data["faction"] == 4:
faction = "Seraphim"
- elif self.player["faction"] == 5:
+ elif self.replay_data["faction"] == 5:
if self.mod == "nomads":
faction = "Nomads"
else:
faction = "Random"
- elif self.player["faction"] == 6:
+ elif self.replay_data["faction"] == 6:
if self.mod == "nomads":
faction = "Random"
else:
diff --git a/src/replays/replayitem.py b/src/replays/replayitem.py
index 9d18ec109..4e6966b9d 100644
--- a/src/replays/replayitem.py
+++ b/src/replays/replayitem.py
@@ -271,9 +271,11 @@ def generate_scoreboard(self) -> Scoreboard:
if not self.extra_info_loaded:
self.load_extra_info()
self.spoiled = not self.parent.spoilerCheckbox.isChecked()
+ assert self.client is not None
scoreboard = Scoreboard(
self.mod, self.winner, self.spoiled,
self.duration, self.teamWin, self.uid, self.teams,
+ self.client.player_ctx_menu,
)
scoreboard.setup()
return scoreboard
diff --git a/src/replays/scoreboard.py b/src/replays/scoreboard.py
index 5e03513ca..8a24019dc 100644
--- a/src/replays/scoreboard.py
+++ b/src/replays/scoreboard.py
@@ -12,9 +12,11 @@
from PyQt6.QtWidgets import QVBoxLayout
from PyQt6.QtWidgets import QWidget
+from contextmenu.playercontextmenu import PlayerContextMenu
from replays.models import ScoreboardModel
from replays.models import ScoreboardModelItem
from replays.scoreboarditemdelegate import ScoreboardItemDelegate
+from replays.scoreboardlistview import ScoreboardListView
class GameResult(Enum):
@@ -37,6 +39,7 @@ def __init__(
teamwin: dict | None,
uid: str,
teams: dict,
+ player_menu_handler: PlayerContextMenu,
) -> None:
super().__init__()
self.winner = winner
@@ -47,6 +50,7 @@ def __init__(
self.teams = teams
self.num_teams = len(self.teams)
self.biggest_team = max(len(team) for team in self.teams.values()) if self.teams else 0
+ self.player_menu_handler = player_menu_handler
self.main_layout = QVBoxLayout()
if self.num_teams == 2:
@@ -58,8 +62,8 @@ def __init__(
self._height = 0
self._team_heights = []
- def create_teamlist_view(self) -> QListView:
- team_view = QListView()
+ def create_teamlist_view(self) -> ScoreboardListView:
+ team_view = ScoreboardListView()
team_view.setObjectName("replayScoreTeamList")
return team_view
@@ -109,6 +113,7 @@ def add_team_score(
team_view = self.create_teamlist_view()
team_view.setModel(model)
team_view.setItemDelegate(ScoreboardItemDelegate())
+ team_view.set_menu_handler(self.player_menu_handler)
team_layout.addWidget(team_view)
view_height = self.teamview_height(team_view)
diff --git a/src/replays/scoreboardlistview.py b/src/replays/scoreboardlistview.py
new file mode 100644
index 000000000..ac10cff99
--- /dev/null
+++ b/src/replays/scoreboardlistview.py
@@ -0,0 +1,30 @@
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QCursor
+from PyQt6.QtGui import QMouseEvent
+from PyQt6.QtWidgets import QListView
+
+from contextmenu.playercontextmenu import PlayerContextMenu
+from replays.scoreboarditemdelegate import ScoreboardModelItem
+
+
+class ScoreboardListView(QListView):
+ def __init__(self) -> None:
+ QListView.__init__(self)
+ self.menu_handler = None
+
+ def set_menu_handler(self, menu_handler: PlayerContextMenu) -> None:
+ self.menu_handler = menu_handler
+
+ def mousePressEvent(self, event: QMouseEvent) -> None:
+ QListView.mousePressEvent(self, event)
+ if event.button() == Qt.MouseButton.RightButton:
+ row = self.indexAt(event.pos()).row()
+ if row != -1:
+ index = self.model().index(row, 0)
+ self.context_menu(index.data())
+
+ def context_menu(self, item: ScoreboardModelItem) -> None:
+ if self.menu_handler is None:
+ return
+ menu = self.menu_handler.get_context_menu(item.login(), int(item.player.xd))
+ menu.popup(QCursor.pos())
From 8bca2b1d89006b474ec339cb3039ac4d9a21eb98 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Thu, 25 Jul 2024 20:39:31 +0300
Subject: [PATCH 51/73] Do not pass the whole client window to PlayerInfoDialog
it only needs avatar downloader
---
src/contextmenu/playercontextmenu.py | 2 +-
src/playercard/playerinfodialog.py | 10 +++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/contextmenu/playercontextmenu.py b/src/contextmenu/playercontextmenu.py
index a5ee3e39c..df6397593 100644
--- a/src/contextmenu/playercontextmenu.py
+++ b/src/contextmenu/playercontextmenu.py
@@ -277,5 +277,5 @@ def _view_aliases(self, login: str) -> None:
self._alias_viewer.view_aliases(login)
def _show_user_info(self, player_id: int) -> None:
- dialog = PlayerInfoDialog(self._client_window, str(player_id))
+ dialog = PlayerInfoDialog(self._client_window.avatar_downloader, str(player_id))
dialog.run()
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index 5e1a5805e..516ba80cf 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -2,7 +2,6 @@
from bisect import bisect_left
from collections.abc import Sequence
-from typing import TYPE_CHECKING
import pyqtgraph as pg
from PyQt6.QtCore import QDateTime
@@ -37,11 +36,8 @@
from downloadManager import AvatarDownloader
from downloadManager import DownloadRequest
from model.rating import Rating
+from playercard.leagueformatter import LegueFormatter
from playercard.statistics import StatsCharts
-from src.playercard.leagueformatter import LegueFormatter
-
-if TYPE_CHECKING:
- from client._clientwindow import ClientWindow
FormClass, BaseClass = util.THEME.loadUiType("player_card/playercard.ui")
@@ -174,13 +170,13 @@ def show_at_pos(self, pos: QPointF) -> None:
class PlayerInfoDialog(FormClass, BaseClass):
- def __init__(self, client_window: ClientWindow, player_id: str) -> None:
+ def __init__(self, avatar_dler: AvatarDownloader, player_id: str) -> None:
BaseClass.__init__(self)
self.setupUi(self)
self.load_stylesheet()
self.tab_widget_ctrl = RatingTabWidgetController(player_id, self.tabWidget)
- self.avatar_handler = AvatarHandler(self.avatarList, client_window.avatar_downloader)
+ self.avatar_handler = AvatarHandler(self.avatarList, avatar_dler)
self.player_id = player_id
From 95397d17de89e351f5046e63a782f7a06d99fc01 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Fri, 26 Jul 2024 04:52:33 +0300
Subject: [PATCH 52/73] Bring back original rankedFrame style
---
res/client/client.css | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/res/client/client.css b/res/client/client.css
index 0fe93270a..a3213e7b6 100644
--- a/res/client/client.css
+++ b/res/client/client.css
@@ -393,6 +393,18 @@ QTextEdit, QPlainTextEdit, QLineEdit, QListWidget, QListView, QTableWidget, QTre
border-bottom-right-radius : 5px;
}
+QFrame#rankedFrame
+{
+ border-style:solid;
+ border-width:1px;
+ border-color:#353535;
+ color:silver;
+ padding:5px;
+ background-color:#303038;
+ border-bottom-left-radius : 5px;
+ border-bottom-right-radius : 5px;
+}
+
QListView#replayScoreTeamList
{
border-width:0px;
@@ -848,14 +860,6 @@ QToolButton#rankedPlay::disabled
border: 1px solid darkslategrey;
}
-QProgressBar#searchProgress
-{
- background-color: silver;
- padding: 2px;
- border-radius: 5px;
- border: 1px solid grey;
-}
-
QToolButton#mapsPool
{
color: silver;
@@ -884,7 +888,7 @@ QToolButton::hover
color:silver;
padding:5px;
- background-color:#606060;
+ background-color:#808080;
border-radius : 5px;
}
From 5f1c96a90979f280682b1881c0477214f7bfe7b6 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 27 Jul 2024 17:11:35 +0300
Subject: [PATCH 53/73] Playercard: Format global rating in a special way
(special icon and no league name)
---
res/player_card/global.png | Bin 0 -> 3447 bytes
src/playercard/leagueformatter.py | 77 ++++++++++++++++++++---------
src/playercard/playerinfodialog.py | 5 +-
3 files changed, 58 insertions(+), 24 deletions(-)
create mode 100644 res/player_card/global.png
diff --git a/res/player_card/global.png b/res/player_card/global.png
new file mode 100644
index 0000000000000000000000000000000000000000..007706e2e8c80ad1beebabe5a1244fa985bde9a7
GIT binary patch
literal 3447
zcmV--4T$oIP)^@RCt{2T??>QRTch__e;2xq12ich
zACzV)Nr7dOq{TzPGPDq|!s2l=A5mbXh=QR-`JgfdQ!GUTe08|6G1;7^ooB^O?V}DFB;wS)p0DOr%bT5D)r9wj60^o-L
z#slco*dLo^3&EVYET9X3>jC_;fIXak@*fC>N~1aJy~K>#KL_&$JpS+5-N_^k$>
zHKcP&9`EO6=^aO>>;kYFz!d;aO8NK40=NUfzdVFPgJ1wk5X}Hg0#IZ5_(K5Ju(EAc
zpmve*FbBX+OS@=RE$5k75;zUOX3Gcv2f$QbZW`0H9?j;oshw{Cn1~{u6;s)g(LRuT
zh$#tXLr(xR0dyDte^ev2&TFi&1D+x_ZvQFKMRURr45ya|L@E?Ag7?o
zX$&K0v2C(gOvkYiV8bWb5YWD1dok&j)7V?qK4b-eZVoee8i2n6_?+_hQ+bIC*J%<6
zm3Mg-O3Mbk2E7
zCqJh=yV^2{&SgC)-&vIvp^O$IJm678x}iNuh^vreW0Y
zx9Es|%pS;hexAU(O9ev|ue;8mkl`?c{|lglcz%jQ7*Pd6<+n<^erkE1XqTgvcY3ku
z?xU{?g1!nhPD{=x<=OT;rEMK`wPJDY$%8fuAX~%Ygz2gvvPa?ik1O
z^{nJ+uSLUm3$0Hc5NFK-%HKs
z*yCV0n=y%~StP5NUWpTC)1LPoCa_sOi}&Pz!83HTvabIMz{C9ST>$1XZ$_Q=DGNvC
z!iRY_?KB9O7~wEJs#sk%M%f$R5S7*_OVVVIQAym;FF6J(%9`Am=*33HQy$;gzsJyLBNP%+F1v|z$z;X+ll#fviP7*t(Lr-~
zd6~c;lJ7{uZtTo`omtvW39Y?=S#0SDJ|Lcd*am5|MM8#cf}lNlDPbs_K!o~O`$qrT$urZ
zJft|Waoa=|Rv6R8-=B;lkeoN2D_<6WKQBRp$ECD91StxH0^!1FZP=FfDa%A%$15hV
zi-!3>bQRXYVI{J#IzcDO&7Mse5J;e`?JvfxXTM^UtQXH*7DXTziI>R%lZ2rbtK?G-
zD~;Wg5rGVeLC2d41w(}KE%A49ZoTni@iK+WKhElK2<7Sd3;I$=e_SU3f
z_Ld#P!a0W0Pss#zvb2P$ll#-4P9z;(CKr(!xi}>bx!BJ^zjr8M`u&kS)9>>g(KoR-
zsGd%7gKBIO-k`b=DQ)5A4z97m85^1g+39ZU5%!e)=-2$T#u79Mt3Tb)uou(Mww-nQ|H+@%~`aSf+_I)^jA
z*$(Us4;|RKi7m%9EHEwe-SCu1R9eby)>Z5SJGo48@<Swc(BG7(iE!xcRw
z4}B*7?rBPA%45+JJsSHepA#IMmE435G~o_
zA?An9QgWL3pn})nNqk!Ndz=AuC0j*LIuZvg=F`1&r0h~obVJNQ9DIc9dQNqzSrE1uMo>4N4RW-&Qv7v}$RsBb2+jH^XD92~
znlddvw@|9Oyru^ull#^gCEPz0^DSE;uki1Swp8>X@q*e7`p)y_HqcoJ38jTP0
zp|FX_45LScc&NAnk%`Mr@rV^TsN|2&nZ%O%c}3Z>$Q#-#AKsvZ_<$R=DMljY`FRw`
z^GZaaHps%I*5GCLRG5l_CsNLlc(tCX#@i{$yj-cqD?E1+;|SzjrBe?(1bA|URO52*
zs9+duNXAe8h=yw-CgZ;}4+4>yh`?s4>G{=$J9JIS_$7-`aEvlsS3y*VX=a(OtC+7m
ze{YHc*`?&r9b!nfxzCaybAW+KAeJE$m}uDUTwuA-WrmW$`ml15S6784h$E0A%2L%*
zN#)nTv18=mX&7TL%U5QNG#z8u_<2IP+Ai#?EMeUfgsvTuLhNU_+bW7cXt{L7F>h3k
zON0l}Lc?rY6q7v7JBAu|5O*s(X;P^!4rLfxXsCN%Oo7PlS#ZkOdhXyq^8LCdR9P~U
zdWC~FCWtirx1sUXmZc!)rB7w=|6;=>GCLw(n@5HL6hG$~7Q8Kbuob6O(sDE&j1$V!
zSm?|YgC>*%yy+$V011=eI&n6ldWS$Bv)oa5oW~M#w&eoj7ugvsI$Uk>xL;Kf8>eauJsTz_$d2Lo*<
zH#t;rL`a;(_d&{KHw)Z$dvue+0N&5Gt> None:
self.setStyleSheet(util.THEME.readstylesheet("client/client.css"))
+ def default_pixmap(self) -> QPixmap:
+ return util.THEME.pixmap("player_card/unlisted.png")
+
+ def default_league(self) -> str:
+ return "Unlisted"
+
+ def rating_text(self) -> str:
+ # chr(0xB1) = +-
+ return f"{self.rating.rating:.0f} [{self.rating.mean:.0f}\xb1{self.rating.deviation:.0f}]"
+
+ def fill_ui(self) -> None:
+ self.divisionLabel.setText(self.default_league())
+ self.set_league_icon()
+ self.gamesLabel.setText(f"{self.rating.total_games:.0f} Games")
+ self.ratingLabel.setText(self.rating_text())
+ self.leaderboardLabel.setText(self.leaderboard.pretty_name)
+
+ def fetch_league_score(self) -> None:
+ self.league_score_api.get_player_score_in_leaderboard(
+ self.player_id, self.leaderboard.technical_name,
+ )
+
def on_league_score_ready(self, score: LeagueSeasonScore) -> None:
if score.season.leaderboard.technical_name != self.leaderboard.technical_name:
return
if score.score is None:
- self.divisionLabel.setText("Unlisted")
return
subdivision = score.subdivision
@@ -71,8 +80,11 @@ def on_league_score_ready(self, score: LeagueSeasonScore) -> None:
else:
self.download_league_icon(subdivision.image_url)
- def set_league_icon(self, image_path: str) -> None:
- self.iconLabel.setPixmap(QPixmap(image_path).scaled(160, 80))
+ def set_league_icon(self, image_path: str = "") -> None:
+ if os.path.isfile(image_path):
+ self.iconLabel.setPixmap(QPixmap(image_path).scaled(160, 80))
+ else:
+ self.iconLabel.setPixmap(self.default_pixmap().scaled(80, 80))
def download_league_icon(self, url: str) -> None:
name = os.path.basename(url)
@@ -82,3 +94,24 @@ def on_image_downloaded(self, _: str, result: tuple[str, bool]) -> None:
image_path, download_failed = result
if not download_failed:
self.set_league_icon(image_path)
+
+
+class GlobalLeagueFormatter(LeagueFormatter):
+ def default_pixmap(self) -> QPixmap:
+ return util.THEME.pixmap("player_card/global.png")
+
+ def default_league(self) -> str:
+ return ""
+
+ def fetch_league_score(self) -> None:
+ return
+
+
+def league_formatter_factory(
+ player_id: str,
+ rating: LeaderboardRating,
+ api: LeagueSeasonScoreApiConnector,
+) -> LeagueFormatter | GlobalLeagueFormatter:
+ if rating.leaderboard.technical_name == "global":
+ return GlobalLeagueFormatter(player_id, rating, api)
+ return LeagueFormatter(player_id, rating, api)
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index 516ba80cf..e554748bb 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -36,7 +36,7 @@
from downloadManager import AvatarDownloader
from downloadManager import DownloadRequest
from model.rating import Rating
-from playercard.leagueformatter import LegueFormatter
+from playercard.leagueformatter import league_formatter_factory
from playercard.statistics import StatsCharts
FormClass, BaseClass = util.THEME.loadUiType("player_card/playercard.ui")
@@ -205,7 +205,8 @@ def run(self) -> None:
def process_player_ratings(self, ratings: dict[str, list[LeaderboardRating]]) -> None:
for rating in ratings["values"]:
- self.leaguesLayout.addWidget(LegueFormatter(self.player_id, rating, self.leagues_api))
+ widget = league_formatter_factory(self.player_id, rating, self.leagues_api)
+ self.leaguesLayout.addWidget(widget)
pie_chart = self.stats_charts.game_types_played(ratings["values"])
self.statsChartsLayout.addWidget(pie_chart)
From feb578488df51a3bfb8d869a0a6ed4809c61e15f Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 27 Jul 2024 17:14:43 +0300
Subject: [PATCH 54/73] Playercard: Scale blank avatar icon
---
src/playercard/playerinfodialog.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index e554748bb..9c0911636 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -270,7 +270,7 @@ def _add_avatar(self, avatar: Avatar) -> None:
def _add_avatar_item(self, pixmap: QPixmap, description: str) -> None:
if pixmap.isNull():
- icon = util.THEME.icon("chat/avatar/avatar_blank.png")
+ icon = QIcon(util.THEME.pixmap("chat/avatar/avatar_blank.png").scaled(40, 20))
else:
icon = QIcon(pixmap.scaled(40, 20))
avatar_item = QListWidgetItem(icon, description)
From a49a8f625b5d71965919edab9281c39651842b36 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sun, 28 Jul 2024 04:24:10 +0300
Subject: [PATCH 55/73] Improve computing and memory efficiency of rating plots
do not 'pre-parse' API response -- extract data
directly from the dictionary json.load provided
rating history responses can be very large --
tens of thousands of records, and skipping
default API response parsing and convertion parsed
data into pydantic models (especially skipping
pydantic) saves lots of time
additionally, using numpy arrays over python lists
and deleting unused data structures saves memory
---
src/api/stats_api.py | 16 ++--
src/playercard/playerinfodialog.py | 137 +++++++++++++++++++++++------
2 files changed, 116 insertions(+), 37 deletions(-)
diff --git a/src/api/stats_api.py b/src/api/stats_api.py
index 018f42794..42e6a3528 100644
--- a/src/api/stats_api.py
+++ b/src/api/stats_api.py
@@ -4,13 +4,12 @@
from PyQt6.QtCore import Qt
from PyQt6.QtCore import pyqtSignal
+from api.ApiAccessors import ApiAccessor
from api.ApiAccessors import DataApiAccessor
from api.models.Leaderboard import Leaderboard
-from api.models.LeaderboardRatingJournal import LeaderboardRatingJournal
from api.models.LeagueSeasonScore import LeagueSeasonScore
from api.models.PlayerEvent import PlayerEvent
from api.parsers.LeaderboardParser import LeaderboardParser
-from api.parsers.LeaderboardRatingJournalParser import LeaderboardRatingJournalParser
from api.parsers.LeaderboardRatingParser import LeaderboardRatingParser
logger = logging.getLogger(__name__)
@@ -42,22 +41,22 @@ def prepare_data(self, message: dict) -> dict[str, list[Leaderboard]]:
return {"values": LeaderboardParser.parse_many(message)}
-class LeaderboardRatingJournalApiConnector(DataApiAccessor):
- ratings_ready = pyqtSignal(dict)
+class LeaderboardRatingJournalApiConnector(ApiAccessor):
+ ratings_ready = pyqtSignal()
+ ratings_chunk_ready = pyqtSignal(dict)
def __init__(self) -> None:
super().__init__("/data/leaderboardRatingJournal")
- self._result: list[LeaderboardRatingJournal] = []
self.query = {}
def handle_page(self, message: dict) -> None:
total_pages = message["meta"]["page"]["totalPages"]
current_page = message["meta"]["page"]["number"]
- self._result.extend(LeaderboardRatingJournalParser.parse_many(message))
+ self.ratings_chunk_ready.emit(message)
if current_page < total_pages:
self.get_history_page(current_page + 1)
else:
- self.ratings_ready.emit({"values": self._result})
+ self.ratings_ready.emit()
def get_history_page(self, page: int) -> None:
self.query.update({
@@ -68,9 +67,8 @@ def get_history_page(self, page: int) -> None:
self.get_by_query(self.query, self.handle_page)
def get_full_history(self, pid: str, leaderboard: str) -> None:
- self._result.clear()
self.query.update({
- "include": "gamePlayerStats,leaderboard",
+ "include": "gamePlayerStats",
"filter": (
f"gamePlayerStats.player.id=={pid!r};"
f"leaderboard.technicalName=={leaderboard!r};"
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index 9c0911636..f19e26578 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -3,11 +3,13 @@
from bisect import bisect_left
from collections.abc import Sequence
+import numpy as np
import pyqtgraph as pg
from PyQt6.QtCore import QDateTime
from PyQt6.QtCore import QObject
from PyQt6.QtCore import QPointF
from PyQt6.QtCore import Qt
+from PyQt6.QtCore import QThread
from PyQt6.QtCore import pyqtSignal
from PyQt6.QtGui import QColor
from PyQt6.QtGui import QIcon
@@ -23,7 +25,6 @@
from api.models.AvatarAssignment import AvatarAssignment
from api.models.Leaderboard import Leaderboard
from api.models.LeaderboardRating import LeaderboardRating
-from api.models.LeaderboardRatingJournal import LeaderboardRatingJournal
from api.models.NameRecord import NameRecord
from api.models.Player import Player
from api.models.PlayerEvent import PlayerEvent
@@ -137,7 +138,7 @@ def get_ytext_pos(self, scene_point: QPointF) -> tuple[float, float]:
return x, y
def update_lines_and_text(self, pos: QPointF) -> None:
- if not self.series.x():
+ if len(self.series.x()) == 0:
return
data_point = self.map_to_data(pos)
@@ -283,26 +284,84 @@ def _handle_avatar_download(self, url: str, pixmap: QPixmap) -> None:
class LineSeries:
- def __init__(self) -> None:
- self._x: list[Numeric] = []
- self._y: list[Numeric] = []
+ def __init__(self, size: int = 0) -> None:
+ self._x: np.ndarray = np.zeros(size)
+ self._y: np.ndarray = np.zeros(size)
- def x(self) -> list[Numeric]:
+ def x(self) -> np.ndarray:
return self._x
- def y(self) -> list[Numeric]:
+ def y(self) -> np.ndarray:
return self._y
- def append(self, x: Numeric, y: Numeric) -> None:
- self._x.append(x)
- self._y.append(y)
+ def set_point(self, index: int, point: QPointF) -> None:
+ self._x[index] = point.x()
+ self._y[index] = point.y()
+
+ def extend(self, series: LineSeries) -> None:
+ self._x = np.append(self._x, series.x())
+ self._y = np.append(self._y, series.y())
def point_at(self, index: int) -> QPointF:
return QPointF(self._x[index], self._y[index])
+class LineSeriesParser(QObject):
+ result_ready = pyqtSignal(LineSeries)
+
+ def __init__(self, identifier: int, unparsed_api_response: dict) -> None:
+ QObject.__init__(self)
+ self.id = identifier
+ self.data = unparsed_api_response
+
+ def parse(self, index: int) -> None:
+ if index != self.id:
+ return
+
+ journal = self.data["data"]
+ journal_leng = len(journal)
+ if journal_leng == 0:
+ self.result_ready.emit(LineSeries())
+ return
+
+ stats = self.data["included"]
+ stats_leng = len(stats)
+
+ series = LineSeries(stats_leng)
+
+ stats_index = journal_index = 0
+ while stats_index < stats_leng and journal_index < journal_leng:
+ if (
+ stats[stats_index]["id"]
+ != journal[journal_index]["relationships"]["gamePlayerStats"]["data"]["id"]
+ ):
+ journal_index += 1
+ continue
+
+ score_time_str = stats[stats_index]["attributes"]["scoreTime"]
+ score_time = QDateTime.fromString(score_time_str, Qt.DateFormat.ISODate)
+ # not creating additional objects (like Rating and QPointF)
+ # and not accessing their attributes in a loop will also give small
+ # improvement, but not quite noticeable (a few hundreds of a second
+ # per 10000 loop cycles -- ~10x less than API call deviation)
+ rating = Rating(
+ journal[journal_index]["attributes"]["meanAfter"],
+ journal[journal_index]["attributes"]["deviationAfter"],
+ )
+ point = QPointF(
+ score_time.toSecsSinceEpoch(),
+ rating.displayed(),
+ )
+ series.set_point(stats_index, point)
+ stats_index += 1
+ journal_index += 1
+
+ self.result_ready.emit(series)
+
+
class RatingsPlotTab(QObject):
name_changed = pyqtSignal(int, str)
+ parse_ratings_chunk = pyqtSignal(int)
def __init__(
self,
@@ -316,32 +375,51 @@ def __init__(
self.player_id = player_id
self.leaderboard = leaderboard
self.ratings_history_api = LeaderboardRatingJournalApiConnector()
- self.ratings_history_api.ratings_ready.connect(self.process_rating_history)
+ self.ratings_history_api.ratings_ready.connect(self.on_ratings_loaded)
+ self.ratings_history_api.ratings_chunk_ready.connect(self.process_rating_history)
self.plot = plot
self._loaded = False
+ self.worker_thread = QThread()
+ self.workers = []
+
+ def __del__(self) -> None:
+ self.clear_threads()
def enter(self) -> None:
if self._loaded:
return
self.name_changed.emit(self.index, "Loading...")
self.ratings_history_api.get_full_history(self.player_id, self.leaderboard.technical_name)
+ self.worker_thread.start()
- def get_plot_series(self, ratings: list[LeaderboardRatingJournal]) -> LineSeries:
- series = LineSeries()
- for entry in ratings:
- assert entry.player_stats is not None
- score_time = QDateTime.fromString(entry.player_stats.score_time, Qt.DateFormat.ISODate)
- series.append(
- score_time.toSecsSinceEpoch(),
- Rating(entry.mean_after, entry.deviation_after).displayed(),
- )
- return series
-
- def process_rating_history(self, ratings: dict[str, list[LeaderboardRatingJournal]]) -> None:
- self.plot.draw_series(self.get_plot_series(ratings["values"]))
+ def on_ratings_loaded(self) -> None:
self._loaded = True
+
+ def clear_threads(self) -> None:
+ self.worker_thread.quit()
+ self.workers.clear()
+
+ def finish(self) -> None:
+ self.clear_threads()
+ self.plot.draw_series()
self.name_changed.emit(self.index, self.leaderboard.pretty_name)
+ def process_rating_history(self, message: dict) -> None:
+ index = len(self.workers)
+ worker = LineSeriesParser(index, message)
+ self.workers.append(worker)
+
+ worker.result_ready.connect(self.data_parsed)
+ worker.moveToThread(self.worker_thread)
+
+ self.parse_ratings_chunk.connect(worker.parse)
+ self.parse_ratings_chunk.emit(index)
+
+ def data_parsed(self, series: LineSeries) -> None:
+ self.plot.add_data(series)
+ if self._loaded:
+ self.finish()
+
class RatingTabWidgetController:
def __init__(self, player_id: str, tab_widget: QTabWidget) -> None:
@@ -373,18 +451,21 @@ def __init__(self, widget: pg.PlotWidget) -> None:
self.widget = widget
self.widget.setBackground("#202025")
self.widget.setAxisItems({"bottom": DateAxisItem()})
- self.crosshairs = Crosshairs(self.widget, LineSeries())
+ self.series = LineSeries()
+ self.crosshairs = Crosshairs(self.widget, self.series)
self.hide_irrelevant_plot_actions()
self.add_custom_menu_actions()
def clear(self) -> None:
self.widget.clear()
- def draw_series(self, series: LineSeries) -> None:
- self.widget.plot(series.x(), series.y(), pen=pg.mkPen("orange"))
- self.crosshairs.set_series(series)
+ def draw_series(self) -> None:
+ self.widget.plot(self.series.x(), self.series.y(), pen=pg.mkPen("orange"))
self.widget.autoRange()
+ def add_data(self, series: LineSeries) -> None:
+ self.series.extend(series)
+
def hide_irrelevant_plot_actions(self) -> None:
for action in ("Transforms", "Downsample", "Average", "Alpha", "Points"):
self.widget.plotItem.setContextMenuActionVisible(action, visible=False)
From 3417953775fd77dd6e32facec96b8979c711b1c3 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sun, 28 Jul 2024 05:39:40 +0300
Subject: [PATCH 56/73] Process data for rating plots more straightforwardly
don't create overhead signals and inherit LineSeriesParser
directly from QThread
---
src/api/stats_api.py | 7 ++---
src/playercard/playerinfodialog.py | 45 ++++++++++++++----------------
2 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/src/api/stats_api.py b/src/api/stats_api.py
index 42e6a3528..23057ecdb 100644
--- a/src/api/stats_api.py
+++ b/src/api/stats_api.py
@@ -42,8 +42,7 @@ def prepare_data(self, message: dict) -> dict[str, list[Leaderboard]]:
class LeaderboardRatingJournalApiConnector(ApiAccessor):
- ratings_ready = pyqtSignal()
- ratings_chunk_ready = pyqtSignal(dict)
+ ratings_ready = pyqtSignal(dict)
def __init__(self) -> None:
super().__init__("/data/leaderboardRatingJournal")
@@ -52,11 +51,9 @@ def __init__(self) -> None:
def handle_page(self, message: dict) -> None:
total_pages = message["meta"]["page"]["totalPages"]
current_page = message["meta"]["page"]["number"]
- self.ratings_chunk_ready.emit(message)
+ self.ratings_ready.emit(message)
if current_page < total_pages:
self.get_history_page(current_page + 1)
- else:
- self.ratings_ready.emit()
def get_history_page(self, page: int) -> None:
self.query.update({
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index f19e26578..e5b01f711 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -306,20 +306,20 @@ def point_at(self, index: int) -> QPointF:
return QPointF(self._x[index], self._y[index])
-class LineSeriesParser(QObject):
+class LineSeriesParser(QThread):
result_ready = pyqtSignal(LineSeries)
- def __init__(self, identifier: int, unparsed_api_response: dict) -> None:
- QObject.__init__(self)
- self.id = identifier
+ def __init__(self, unparsed_api_response: dict) -> None:
+ QThread.__init__(self)
self.data = unparsed_api_response
- def parse(self, index: int) -> None:
- if index != self.id:
- return
+ def run(self) -> None:
+ self.parse()
+ def parse(self) -> None:
journal = self.data["data"]
journal_leng = len(journal)
+
if journal_leng == 0:
self.result_ready.emit(LineSeries())
return
@@ -361,7 +361,6 @@ def parse(self, index: int) -> None:
class RatingsPlotTab(QObject):
name_changed = pyqtSignal(int, str)
- parse_ratings_chunk = pyqtSignal(int)
def __init__(
self,
@@ -375,28 +374,27 @@ def __init__(
self.player_id = player_id
self.leaderboard = leaderboard
self.ratings_history_api = LeaderboardRatingJournalApiConnector()
- self.ratings_history_api.ratings_ready.connect(self.on_ratings_loaded)
- self.ratings_history_api.ratings_chunk_ready.connect(self.process_rating_history)
+ self.ratings_history_api.ratings_ready.connect(self.process_rating_history)
self.plot = plot
self._loaded = False
- self.worker_thread = QThread()
self.workers = []
def __del__(self) -> None:
- self.clear_threads()
+ try:
+ self.clear_threads()
+ except RuntimeError:
+ pass
def enter(self) -> None:
if self._loaded:
return
self.name_changed.emit(self.index, "Loading...")
self.ratings_history_api.get_full_history(self.player_id, self.leaderboard.technical_name)
- self.worker_thread.start()
-
- def on_ratings_loaded(self) -> None:
- self._loaded = True
def clear_threads(self) -> None:
- self.worker_thread.quit()
+ for worker in self.workers:
+ if worker.isRunning():
+ worker.quit()
self.workers.clear()
def finish(self) -> None:
@@ -405,15 +403,14 @@ def finish(self) -> None:
self.name_changed.emit(self.index, self.leaderboard.pretty_name)
def process_rating_history(self, message: dict) -> None:
- index = len(self.workers)
- worker = LineSeriesParser(index, message)
- self.workers.append(worker)
+ total_pages = message["meta"]["page"]["totalPages"]
+ current_page = message["meta"]["page"]["number"]
+ self._loaded = current_page == total_pages
+ worker = LineSeriesParser(message)
+ self.workers.append(worker)
worker.result_ready.connect(self.data_parsed)
- worker.moveToThread(self.worker_thread)
-
- self.parse_ratings_chunk.connect(worker.parse)
- self.parse_ratings_chunk.emit(index)
+ worker.start()
def data_parsed(self, series: LineSeries) -> None:
self.plot.add_data(series)
From 8179a2cde75dca541c754a1f50355af488876b46 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sun, 28 Jul 2024 05:59:07 +0300
Subject: [PATCH 57/73] Split playerinfodialog's mess into separate smaller
files
---
src/playercard/avatarhandler.py | 55 ++++
src/playercard/playerinfodialog.py | 390 +----------------------------
src/playercard/plot.py | 197 +++++++++++++++
src/playercard/ratingtabwidget.py | 154 ++++++++++++
4 files changed, 408 insertions(+), 388 deletions(-)
create mode 100644 src/playercard/avatarhandler.py
create mode 100644 src/playercard/plot.py
create mode 100644 src/playercard/ratingtabwidget.py
diff --git a/src/playercard/avatarhandler.py b/src/playercard/avatarhandler.py
new file mode 100644
index 000000000..ac33ce667
--- /dev/null
+++ b/src/playercard/avatarhandler.py
@@ -0,0 +1,55 @@
+from __future__ import annotations
+
+from PyQt6.QtGui import QIcon
+from PyQt6.QtGui import QPixmap
+from PyQt6.QtWidgets import QListWidget
+from PyQt6.QtWidgets import QListWidgetItem
+
+import util
+from api.models.Avatar import Avatar
+from api.models.AvatarAssignment import AvatarAssignment
+from downloadManager import AvatarDownloader
+from downloadManager import DownloadRequest
+
+
+class AvatarHandler:
+ def __init__(self, avatar_list: QListWidget, avatar_downloader: AvatarDownloader) -> None:
+ self.avatar_list = avatar_list
+ self.avatar_dler = avatar_downloader
+ self.requests = {}
+
+ def populate_avatars(self, avatar_assignments: list[AvatarAssignment] | None) -> None:
+ if avatar_assignments is None:
+ return
+
+ for assignment in avatar_assignments:
+ if self.avatar_dler.has_avatar(assignment.avatar.filename):
+ self._add_avatar(assignment.avatar)
+ else:
+ self._download_avatar(assignment.avatar)
+
+ def _prepare_avatar_dl_request(self, avatar: Avatar) -> DownloadRequest:
+ req = DownloadRequest()
+ req.done.connect(self._handle_avatar_download)
+ self.requests[avatar.url] = (req, avatar.tooltip)
+ return req
+
+ def _download_avatar(self, avatar: Avatar) -> None:
+ req = self._prepare_avatar_dl_request(avatar)
+ self.avatar_dler.download_avatar(avatar.url, req)
+
+ def _add_avatar(self, avatar: Avatar) -> None:
+ self._add_avatar_item(self.avatar_dler.get_avatar(avatar.filename), avatar.tooltip)
+
+ def _add_avatar_item(self, pixmap: QPixmap, description: str) -> None:
+ if pixmap.isNull():
+ icon = QIcon(util.THEME.pixmap("chat/avatar/avatar_blank.png").scaled(40, 20))
+ else:
+ icon = QIcon(pixmap.scaled(40, 20))
+ avatar_item = QListWidgetItem(icon, description)
+ self.avatar_list.addItem(avatar_item)
+
+ def _handle_avatar_download(self, url: str, pixmap: QPixmap) -> None:
+ _, tooltip = self.requests[url]
+ self._add_avatar_item(pixmap, tooltip)
+ del self.requests[url]
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index e5b01f711..a3f2e65fc 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -1,174 +1,27 @@
from __future__ import annotations
-from bisect import bisect_left
-from collections.abc import Sequence
-
-import numpy as np
-import pyqtgraph as pg
from PyQt6.QtCore import QDateTime
-from PyQt6.QtCore import QObject
-from PyQt6.QtCore import QPointF
from PyQt6.QtCore import Qt
-from PyQt6.QtCore import QThread
-from PyQt6.QtCore import pyqtSignal
-from PyQt6.QtGui import QColor
-from PyQt6.QtGui import QIcon
-from PyQt6.QtGui import QPixmap
-from PyQt6.QtWidgets import QListWidget
-from PyQt6.QtWidgets import QListWidgetItem
from PyQt6.QtWidgets import QTableWidgetItem
-from PyQt6.QtWidgets import QTabWidget
-from pyqtgraph.graphicsItems.DateAxisItem import DateAxisItem
import util
-from api.models.Avatar import Avatar
from api.models.AvatarAssignment import AvatarAssignment
-from api.models.Leaderboard import Leaderboard
from api.models.LeaderboardRating import LeaderboardRating
from api.models.NameRecord import NameRecord
from api.models.Player import Player
from api.models.PlayerEvent import PlayerEvent
from api.player_api import PlayerApiConnector
-from api.stats_api import LeaderboardApiConnector
from api.stats_api import LeaderboardRatingApiConnector
-from api.stats_api import LeaderboardRatingJournalApiConnector
from api.stats_api import LeagueSeasonScoreApiConnector
from api.stats_api import PlayerEventApiAccessor
from downloadManager import AvatarDownloader
-from downloadManager import DownloadRequest
-from model.rating import Rating
+from playercard.avatarhandler import AvatarHandler
from playercard.leagueformatter import league_formatter_factory
+from playercard.ratingtabwidget import RatingTabWidgetController
from playercard.statistics import StatsCharts
FormClass, BaseClass = util.THEME.loadUiType("player_card/playercard.ui")
-Numeric = float | int
-
-
-class Crosshairs:
- def __init__(self, plotwidget: pg.PlotWidget, series: LineSeries) -> None:
- self.plotwidget = plotwidget
- self.plotwidget.scene().sigMouseMoved.connect(self.update_lines_and_text)
-
- self.series = series
-
- pen = pg.mkPen("green", width=3)
- self.xLine = pg.InfiniteLine(angle=90, pen=pen)
- self.yLine = pg.InfiniteLine(angle=0, pen=pen)
-
- self.plotwidget.addItem(self.xLine, ignoreBounds=True)
- self.plotwidget.addItem(self.yLine, ignoreBounds=True)
-
- color = QColor("black")
- self.xText = pg.TextItem(color=color)
- self.yText = pg.TextItem(color=color)
-
- self.plotwidget.scene().addItem(self.xText)
- self.plotwidget.scene().addItem(self.yText)
-
- self.plotwidget.plotItem.getAxis("left").setWidth(40)
- self._visible = True
-
- def set_series(self, series: LineSeries) -> None:
- self.series = series
-
- def set_visible(self, visible: bool) -> None:
- self.xLine.setVisible(visible)
- self.yLine.setVisible(visible)
- self.xText.setVisible(visible)
- self.yText.setVisible(visible)
-
- def display(self, *, seen: bool) -> None:
- if not self._visible:
- return
- self.set_visible(seen)
-
- def hide(self) -> None:
- self.set_visible(False)
-
- def show(self) -> None:
- self.set_visible(True)
-
- def change_visibility(self) -> None:
- new_state = not self._visible
- self.set_visible(new_state)
- self._visible = new_state
-
- def is_visible(self) -> bool:
- return self._visible
-
- def _closest_index(self, lst: Sequence[Numeric], value: Numeric) -> int:
- pos = bisect_left(lst, value)
- if pos == 0:
- return pos
- if pos == len(lst):
- return pos - 1
-
- before = lst[pos - 1]
- after = lst[pos]
- if after - value < value - before:
- return pos
- else:
- return pos - 1
-
- def map_to_data(self, pos: QPointF) -> QPointF:
- view = self.plotwidget.plotItem.getViewBox()
- value_pos = view.mapSceneToView(pos)
- point_index = self._closest_index(self.series.x(), value_pos.x())
- return self.series.point_at(point_index)
-
- def get_xtext_pos(self, scene_point: QPointF) -> tuple[float, float]:
- scene_width = self.plotwidget.sceneBoundingRect().width()
- text_width = self.xText.boundingRect().width()
- text_height = self.xText.boundingRect().height()
- padding = 3
-
- left_margin = self.plotwidget.plotItem.getAxis("left").width() - padding
- right_margin = scene_width - text_width + padding
-
- x = max(left_margin, scene_point.x() - text_width / 2)
- x = min(x, right_margin)
- y = self.plotwidget.sceneBoundingRect().bottom() - text_height + padding
- return x, y
-
- def get_ytext_pos(self, scene_point: QPointF) -> tuple[float, float]:
- padding = 3
- x = self.plotwidget.sceneBoundingRect().left() - padding
- y = scene_point.y() - self.yText.boundingRect().height() / 2
- return x, y
-
- def update_lines_and_text(self, pos: QPointF) -> None:
- if len(self.series.x()) == 0:
- return
-
- data_point = self.map_to_data(pos)
- view = self.plotwidget.plotItem.getViewBox()
- scene_point = view.mapViewToScene(data_point)
-
- left_margin = self.plotwidget.plotItem.getAxis("left").width()
- if scene_point.x() < left_margin or scene_point.y() < 0:
- return
-
- self.update_lines(pos, data_point)
- self.update_text(scene_point, data_point)
- self.show_at_pos(scene_point)
-
- def update_text(self, scene_point: QPointF, data_point: QPointF) -> None:
- date = QDateTime.fromSecsSinceEpoch(round(data_point.x())).toString("dd-MM-yyyy hh:mm")
- self.xText.setHtml(f"{date}
")
- self.xText.setPos(*self.get_xtext_pos(scene_point))
- self.yText.setHtml(f"{data_point.y():.2f}
")
- self.yText.setPos(*self.get_ytext_pos(scene_point))
-
- def update_lines(self, pos: QPointF, data_point: QPointF) -> None:
- if self.plotwidget.sceneBoundingRect().contains(pos):
- self.xLine.setPos(data_point.x())
- self.yLine.setPos(data_point.y())
-
- def show_at_pos(self, pos: QPointF) -> None:
- seen = self.plotwidget.sceneBoundingRect().contains(pos)
- self.display(seen=seen)
-
class PlayerInfoDialog(FormClass, BaseClass):
def __init__(self, avatar_dler: AvatarDownloader, player_id: str) -> None:
@@ -238,242 +91,3 @@ def add_avatars(self, avatar_assignments: list[AvatarAssignment] | None) -> None
def process_player_events(self, events: list[PlayerEvent]) -> None:
for chartview in self.stats_charts.player_events_charts(events):
self.statsChartsLayout.addWidget(chartview)
-
-
-class AvatarHandler:
- def __init__(self, avatar_list: QListWidget, avatar_downloader: AvatarDownloader) -> None:
- self.avatar_list = avatar_list
- self.avatar_dler = avatar_downloader
- self.requests = {}
-
- def populate_avatars(self, avatar_assignments: list[AvatarAssignment] | None) -> None:
- if avatar_assignments is None:
- return
-
- for assignment in avatar_assignments:
- if self.avatar_dler.has_avatar(assignment.avatar.filename):
- self._add_avatar(assignment.avatar)
- else:
- self._download_avatar(assignment.avatar)
-
- def _prepare_avatar_dl_request(self, avatar: Avatar) -> DownloadRequest:
- req = DownloadRequest()
- req.done.connect(self._handle_avatar_download)
- self.requests[avatar.url] = (req, avatar.tooltip)
- return req
-
- def _download_avatar(self, avatar: Avatar) -> None:
- req = self._prepare_avatar_dl_request(avatar)
- self.avatar_dler.download_avatar(avatar.url, req)
-
- def _add_avatar(self, avatar: Avatar) -> None:
- self._add_avatar_item(self.avatar_dler.get_avatar(avatar.filename), avatar.tooltip)
-
- def _add_avatar_item(self, pixmap: QPixmap, description: str) -> None:
- if pixmap.isNull():
- icon = QIcon(util.THEME.pixmap("chat/avatar/avatar_blank.png").scaled(40, 20))
- else:
- icon = QIcon(pixmap.scaled(40, 20))
- avatar_item = QListWidgetItem(icon, description)
- self.avatar_list.addItem(avatar_item)
-
- def _handle_avatar_download(self, url: str, pixmap: QPixmap) -> None:
- _, tooltip = self.requests[url]
- self._add_avatar_item(pixmap, tooltip)
- del self.requests[url]
-
-
-class LineSeries:
- def __init__(self, size: int = 0) -> None:
- self._x: np.ndarray = np.zeros(size)
- self._y: np.ndarray = np.zeros(size)
-
- def x(self) -> np.ndarray:
- return self._x
-
- def y(self) -> np.ndarray:
- return self._y
-
- def set_point(self, index: int, point: QPointF) -> None:
- self._x[index] = point.x()
- self._y[index] = point.y()
-
- def extend(self, series: LineSeries) -> None:
- self._x = np.append(self._x, series.x())
- self._y = np.append(self._y, series.y())
-
- def point_at(self, index: int) -> QPointF:
- return QPointF(self._x[index], self._y[index])
-
-
-class LineSeriesParser(QThread):
- result_ready = pyqtSignal(LineSeries)
-
- def __init__(self, unparsed_api_response: dict) -> None:
- QThread.__init__(self)
- self.data = unparsed_api_response
-
- def run(self) -> None:
- self.parse()
-
- def parse(self) -> None:
- journal = self.data["data"]
- journal_leng = len(journal)
-
- if journal_leng == 0:
- self.result_ready.emit(LineSeries())
- return
-
- stats = self.data["included"]
- stats_leng = len(stats)
-
- series = LineSeries(stats_leng)
-
- stats_index = journal_index = 0
- while stats_index < stats_leng and journal_index < journal_leng:
- if (
- stats[stats_index]["id"]
- != journal[journal_index]["relationships"]["gamePlayerStats"]["data"]["id"]
- ):
- journal_index += 1
- continue
-
- score_time_str = stats[stats_index]["attributes"]["scoreTime"]
- score_time = QDateTime.fromString(score_time_str, Qt.DateFormat.ISODate)
- # not creating additional objects (like Rating and QPointF)
- # and not accessing their attributes in a loop will also give small
- # improvement, but not quite noticeable (a few hundreds of a second
- # per 10000 loop cycles -- ~10x less than API call deviation)
- rating = Rating(
- journal[journal_index]["attributes"]["meanAfter"],
- journal[journal_index]["attributes"]["deviationAfter"],
- )
- point = QPointF(
- score_time.toSecsSinceEpoch(),
- rating.displayed(),
- )
- series.set_point(stats_index, point)
- stats_index += 1
- journal_index += 1
-
- self.result_ready.emit(series)
-
-
-class RatingsPlotTab(QObject):
- name_changed = pyqtSignal(int, str)
-
- def __init__(
- self,
- index: int,
- player_id: str,
- leaderboard: Leaderboard,
- plot: PlotController,
- ) -> None:
- super().__init__()
- self.index = index
- self.player_id = player_id
- self.leaderboard = leaderboard
- self.ratings_history_api = LeaderboardRatingJournalApiConnector()
- self.ratings_history_api.ratings_ready.connect(self.process_rating_history)
- self.plot = plot
- self._loaded = False
- self.workers = []
-
- def __del__(self) -> None:
- try:
- self.clear_threads()
- except RuntimeError:
- pass
-
- def enter(self) -> None:
- if self._loaded:
- return
- self.name_changed.emit(self.index, "Loading...")
- self.ratings_history_api.get_full_history(self.player_id, self.leaderboard.technical_name)
-
- def clear_threads(self) -> None:
- for worker in self.workers:
- if worker.isRunning():
- worker.quit()
- self.workers.clear()
-
- def finish(self) -> None:
- self.clear_threads()
- self.plot.draw_series()
- self.name_changed.emit(self.index, self.leaderboard.pretty_name)
-
- def process_rating_history(self, message: dict) -> None:
- total_pages = message["meta"]["page"]["totalPages"]
- current_page = message["meta"]["page"]["number"]
- self._loaded = current_page == total_pages
-
- worker = LineSeriesParser(message)
- self.workers.append(worker)
- worker.result_ready.connect(self.data_parsed)
- worker.start()
-
- def data_parsed(self, series: LineSeries) -> None:
- self.plot.add_data(series)
- if self._loaded:
- self.finish()
-
-
-class RatingTabWidgetController:
- def __init__(self, player_id: str, tab_widget: QTabWidget) -> None:
- self.player_id = player_id
- self.widget = tab_widget
- self.widget.currentChanged.connect(self.on_tab_changed)
-
- self.leaderboards_api = LeaderboardApiConnector()
- self.leaderboards_api.data_ready.connect(self.populate_leaderboards)
- self.tabs: dict[int, RatingsPlotTab] = {}
-
- def run(self) -> None:
- self.leaderboards_api.requestData()
-
- def populate_leaderboards(self, message: dict[str, list[Leaderboard]]) -> None:
- for index, leaderboard in enumerate(message["values"]):
- widget = pg.PlotWidget()
- tab = RatingsPlotTab(index, self.player_id, leaderboard, PlotController(widget))
- tab.name_changed.connect(self.widget.setTabText)
- self.tabs[index] = tab
- self.widget.insertTab(index, widget, leaderboard.pretty_name)
-
- def on_tab_changed(self, index: int) -> None:
- self.tabs[index].enter()
-
-
-class PlotController:
- def __init__(self, widget: pg.PlotWidget) -> None:
- self.widget = widget
- self.widget.setBackground("#202025")
- self.widget.setAxisItems({"bottom": DateAxisItem()})
- self.series = LineSeries()
- self.crosshairs = Crosshairs(self.widget, self.series)
- self.hide_irrelevant_plot_actions()
- self.add_custom_menu_actions()
-
- def clear(self) -> None:
- self.widget.clear()
-
- def draw_series(self) -> None:
- self.widget.plot(self.series.x(), self.series.y(), pen=pg.mkPen("orange"))
- self.widget.autoRange()
-
- def add_data(self, series: LineSeries) -> None:
- self.series.extend(series)
-
- def hide_irrelevant_plot_actions(self) -> None:
- for action in ("Transforms", "Downsample", "Average", "Alpha", "Points"):
- self.widget.plotItem.setContextMenuActionVisible(action, visible=False)
-
- def add_custom_menu_actions(self) -> None:
- viewbox = self.widget.plotItem.getViewBox()
- if viewbox is None:
- return
-
- menu = viewbox.getMenu(ev=None)
- if menu is None:
- return
-
- menu.addAction("Show/Hide crosshair", self.crosshairs.change_visibility)
diff --git a/src/playercard/plot.py b/src/playercard/plot.py
new file mode 100644
index 000000000..d612ee8d0
--- /dev/null
+++ b/src/playercard/plot.py
@@ -0,0 +1,197 @@
+from __future__ import annotations
+
+from bisect import bisect_left
+from collections.abc import Sequence
+
+import numpy as np
+import pyqtgraph as pg
+from PyQt6.QtCore import QDateTime
+from PyQt6.QtCore import QPointF
+from PyQt6.QtGui import QColor
+from pyqtgraph.graphicsItems.DateAxisItem import DateAxisItem
+
+Numeric = float | int
+
+
+class Crosshairs:
+ def __init__(self, plotwidget: pg.PlotWidget, series: LineSeries) -> None:
+ self.plotwidget = plotwidget
+ self.plotwidget.scene().sigMouseMoved.connect(self.update_lines_and_text)
+
+ self.series = series
+
+ pen = pg.mkPen("green", width=3)
+ self.xLine = pg.InfiniteLine(angle=90, pen=pen)
+ self.yLine = pg.InfiniteLine(angle=0, pen=pen)
+
+ self.plotwidget.addItem(self.xLine, ignoreBounds=True)
+ self.plotwidget.addItem(self.yLine, ignoreBounds=True)
+
+ color = QColor("black")
+ self.xText = pg.TextItem(color=color)
+ self.yText = pg.TextItem(color=color)
+
+ self.plotwidget.scene().addItem(self.xText)
+ self.plotwidget.scene().addItem(self.yText)
+
+ self.plotwidget.plotItem.getAxis("left").setWidth(40)
+ self._visible = True
+
+ def set_series(self, series: LineSeries) -> None:
+ self.series = series
+
+ def set_visible(self, visible: bool) -> None:
+ self.xLine.setVisible(visible)
+ self.yLine.setVisible(visible)
+ self.xText.setVisible(visible)
+ self.yText.setVisible(visible)
+
+ def display(self, *, seen: bool) -> None:
+ if not self._visible:
+ return
+ self.set_visible(seen)
+
+ def hide(self) -> None:
+ self.set_visible(False)
+
+ def show(self) -> None:
+ self.set_visible(True)
+
+ def change_visibility(self) -> None:
+ new_state = not self._visible
+ self.set_visible(new_state)
+ self._visible = new_state
+
+ def is_visible(self) -> bool:
+ return self._visible
+
+ def _closest_index(self, lst: Sequence[Numeric], value: Numeric) -> int:
+ pos = bisect_left(lst, value)
+ if pos == 0:
+ return pos
+ if pos == len(lst):
+ return pos - 1
+
+ before = lst[pos - 1]
+ after = lst[pos]
+ if after - value < value - before:
+ return pos
+ else:
+ return pos - 1
+
+ def map_to_data(self, pos: QPointF) -> QPointF:
+ view = self.plotwidget.plotItem.getViewBox()
+ value_pos = view.mapSceneToView(pos)
+ point_index = self._closest_index(self.series.x(), value_pos.x())
+ return self.series.point_at(point_index)
+
+ def get_xtext_pos(self, scene_point: QPointF) -> tuple[float, float]:
+ scene_width = self.plotwidget.sceneBoundingRect().width()
+ text_width = self.xText.boundingRect().width()
+ text_height = self.xText.boundingRect().height()
+ padding = 3
+
+ left_margin = self.plotwidget.plotItem.getAxis("left").width() - padding
+ right_margin = scene_width - text_width + padding
+
+ x = max(left_margin, scene_point.x() - text_width / 2)
+ x = min(x, right_margin)
+ y = self.plotwidget.sceneBoundingRect().bottom() - text_height + padding
+ return x, y
+
+ def get_ytext_pos(self, scene_point: QPointF) -> tuple[float, float]:
+ padding = 3
+ x = self.plotwidget.sceneBoundingRect().left() - padding
+ y = scene_point.y() - self.yText.boundingRect().height() / 2
+ return x, y
+
+ def update_lines_and_text(self, pos: QPointF) -> None:
+ if len(self.series.x()) == 0:
+ return
+
+ data_point = self.map_to_data(pos)
+ view = self.plotwidget.plotItem.getViewBox()
+ scene_point = view.mapViewToScene(data_point)
+
+ left_margin = self.plotwidget.plotItem.getAxis("left").width()
+ if scene_point.x() < left_margin or scene_point.y() < 0:
+ return
+
+ self.update_lines(pos, data_point)
+ self.update_text(scene_point, data_point)
+ self.show_at_pos(scene_point)
+
+ def update_text(self, scene_point: QPointF, data_point: QPointF) -> None:
+ date = QDateTime.fromSecsSinceEpoch(round(data_point.x())).toString("dd-MM-yyyy hh:mm")
+ self.xText.setHtml(f"{date}
")
+ self.xText.setPos(*self.get_xtext_pos(scene_point))
+ self.yText.setHtml(f"{data_point.y():.2f}
")
+ self.yText.setPos(*self.get_ytext_pos(scene_point))
+
+ def update_lines(self, pos: QPointF, data_point: QPointF) -> None:
+ if self.plotwidget.sceneBoundingRect().contains(pos):
+ self.xLine.setPos(data_point.x())
+ self.yLine.setPos(data_point.y())
+
+ def show_at_pos(self, pos: QPointF) -> None:
+ seen = self.plotwidget.sceneBoundingRect().contains(pos)
+ self.display(seen=seen)
+
+
+class LineSeries:
+ def __init__(self, size: int = 0) -> None:
+ self._x: np.ndarray = np.zeros(size)
+ self._y: np.ndarray = np.zeros(size)
+
+ def x(self) -> np.ndarray:
+ return self._x
+
+ def y(self) -> np.ndarray:
+ return self._y
+
+ def set_point(self, index: int, point: QPointF) -> None:
+ self._x[index] = point.x()
+ self._y[index] = point.y()
+
+ def extend(self, series: LineSeries) -> None:
+ self._x = np.append(self._x, series.x())
+ self._y = np.append(self._y, series.y())
+
+ def point_at(self, index: int) -> QPointF:
+ return QPointF(self._x[index], self._y[index])
+
+
+class PlotController:
+ def __init__(self, widget: pg.PlotWidget) -> None:
+ self.widget = widget
+ self.widget.setBackground("#202025")
+ self.widget.setAxisItems({"bottom": DateAxisItem()})
+ self.series = LineSeries()
+ self.crosshairs = Crosshairs(self.widget, self.series)
+ self.hide_irrelevant_plot_actions()
+ self.add_custom_menu_actions()
+
+ def clear(self) -> None:
+ self.widget.clear()
+
+ def draw_series(self) -> None:
+ self.widget.plot(self.series.x(), self.series.y(), pen=pg.mkPen("orange"))
+ self.widget.autoRange()
+
+ def add_data(self, series: LineSeries) -> None:
+ self.series.extend(series)
+
+ def hide_irrelevant_plot_actions(self) -> None:
+ for action in ("Transforms", "Downsample", "Average", "Alpha", "Points"):
+ self.widget.plotItem.setContextMenuActionVisible(action, visible=False)
+
+ def add_custom_menu_actions(self) -> None:
+ viewbox = self.widget.plotItem.getViewBox()
+ if viewbox is None:
+ return
+
+ menu = viewbox.getMenu(ev=None)
+ if menu is None:
+ return
+
+ menu.addAction("Show/Hide crosshair", self.crosshairs.change_visibility)
diff --git a/src/playercard/ratingtabwidget.py b/src/playercard/ratingtabwidget.py
new file mode 100644
index 000000000..0e79db2b7
--- /dev/null
+++ b/src/playercard/ratingtabwidget.py
@@ -0,0 +1,154 @@
+from __future__ import annotations
+
+import pyqtgraph as pg
+from PyQt6.QtCore import QDateTime
+from PyQt6.QtCore import QObject
+from PyQt6.QtCore import QPointF
+from PyQt6.QtCore import Qt
+from PyQt6.QtCore import QThread
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtWidgets import QTabWidget
+
+from api.models.Leaderboard import Leaderboard
+from api.stats_api import LeaderboardApiConnector
+from api.stats_api import LeaderboardRatingJournalApiConnector
+from model.rating import Rating
+from playercard.plot import LineSeries
+from playercard.plot import PlotController
+
+
+class LineSeriesParser(QThread):
+ result_ready = pyqtSignal(LineSeries)
+
+ def __init__(self, unparsed_api_response: dict) -> None:
+ QThread.__init__(self)
+ self.data = unparsed_api_response
+
+ def run(self) -> None:
+ self.parse()
+
+ def parse(self) -> None:
+ journal = self.data["data"]
+ journal_leng = len(journal)
+
+ if journal_leng == 0:
+ self.result_ready.emit(LineSeries())
+ return
+
+ stats = self.data["included"]
+ stats_leng = len(stats)
+
+ series = LineSeries(stats_leng)
+
+ stats_index = journal_index = 0
+ while stats_index < stats_leng and journal_index < journal_leng:
+ if (
+ stats[stats_index]["id"]
+ != journal[journal_index]["relationships"]["gamePlayerStats"]["data"]["id"]
+ ):
+ journal_index += 1
+ continue
+
+ score_time_str = stats[stats_index]["attributes"]["scoreTime"]
+ score_time = QDateTime.fromString(score_time_str, Qt.DateFormat.ISODate)
+ # not creating additional objects (like Rating and QPointF)
+ # and not accessing their attributes in a loop will also give small
+ # improvement, but not quite noticeable (a few hundreds of a second
+ # per 10000 loop cycles -- ~10x less than API call deviation)
+ rating = Rating(
+ journal[journal_index]["attributes"]["meanAfter"],
+ journal[journal_index]["attributes"]["deviationAfter"],
+ )
+ point = QPointF(
+ score_time.toSecsSinceEpoch(),
+ rating.displayed(),
+ )
+ series.set_point(stats_index, point)
+ stats_index += 1
+ journal_index += 1
+
+ self.result_ready.emit(series)
+
+
+class RatingsPlotTab(QObject):
+ name_changed = pyqtSignal(int, str)
+
+ def __init__(
+ self,
+ index: int,
+ player_id: str,
+ leaderboard: Leaderboard,
+ plot: PlotController,
+ ) -> None:
+ super().__init__()
+ self.index = index
+ self.player_id = player_id
+ self.leaderboard = leaderboard
+ self.ratings_history_api = LeaderboardRatingJournalApiConnector()
+ self.ratings_history_api.ratings_ready.connect(self.process_rating_history)
+ self.plot = plot
+ self._loaded = False
+ self.workers = []
+
+ def __del__(self) -> None:
+ try:
+ self.clear_threads()
+ except RuntimeError:
+ pass
+
+ def enter(self) -> None:
+ if self._loaded:
+ return
+ self.name_changed.emit(self.index, "Loading...")
+ self.ratings_history_api.get_full_history(self.player_id, self.leaderboard.technical_name)
+
+ def clear_threads(self) -> None:
+ for worker in self.workers:
+ if worker.isRunning():
+ worker.quit()
+ self.workers.clear()
+
+ def finish(self) -> None:
+ self.clear_threads()
+ self.plot.draw_series()
+ self.name_changed.emit(self.index, self.leaderboard.pretty_name)
+
+ def process_rating_history(self, message: dict) -> None:
+ total_pages = message["meta"]["page"]["totalPages"]
+ current_page = message["meta"]["page"]["number"]
+ self._loaded = current_page == total_pages
+
+ worker = LineSeriesParser(message)
+ self.workers.append(worker)
+ worker.result_ready.connect(self.data_parsed)
+ worker.start()
+
+ def data_parsed(self, series: LineSeries) -> None:
+ self.plot.add_data(series)
+ if self._loaded:
+ self.finish()
+
+
+class RatingTabWidgetController:
+ def __init__(self, player_id: str, tab_widget: QTabWidget) -> None:
+ self.player_id = player_id
+ self.widget = tab_widget
+ self.widget.currentChanged.connect(self.on_tab_changed)
+
+ self.leaderboards_api = LeaderboardApiConnector()
+ self.leaderboards_api.data_ready.connect(self.populate_leaderboards)
+ self.tabs: dict[int, RatingsPlotTab] = {}
+
+ def run(self) -> None:
+ self.leaderboards_api.requestData()
+
+ def populate_leaderboards(self, message: dict[str, list[Leaderboard]]) -> None:
+ for index, leaderboard in enumerate(message["values"]):
+ widget = pg.PlotWidget()
+ tab = RatingsPlotTab(index, self.player_id, leaderboard, PlotController(widget))
+ tab.name_changed.connect(self.widget.setTabText)
+ self.tabs[index] = tab
+ self.widget.insertTab(index, widget, leaderboard.pretty_name)
+
+ def on_tab_changed(self, index: int) -> None:
+ self.tabs[index].enter()
From 6e84baaf99b4c1fd6a565387fc29db7fa21b071b Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sun, 28 Jul 2024 06:01:52 +0300
Subject: [PATCH 58/73] Fix loading empty rating plots
---
src/playercard/ratingtabwidget.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/playercard/ratingtabwidget.py b/src/playercard/ratingtabwidget.py
index 0e79db2b7..070a23dd0 100644
--- a/src/playercard/ratingtabwidget.py
+++ b/src/playercard/ratingtabwidget.py
@@ -116,7 +116,7 @@ def finish(self) -> None:
def process_rating_history(self, message: dict) -> None:
total_pages = message["meta"]["page"]["totalPages"]
current_page = message["meta"]["page"]["number"]
- self._loaded = current_page == total_pages
+ self._loaded = current_page >= total_pages
worker = LineSeriesParser(message)
self.workers.append(worker)
From 183d5fed9a3fddaf057aa215770e4a29044e536c Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Mon, 29 Jul 2024 04:08:07 +0300
Subject: [PATCH 59/73] Hide 'Export' action from the plots
it requires additional libraries to be installed
to work properly
---
src/playercard/plot.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/playercard/plot.py b/src/playercard/plot.py
index d612ee8d0..d05dd1584 100644
--- a/src/playercard/plot.py
+++ b/src/playercard/plot.py
@@ -168,6 +168,7 @@ def __init__(self, widget: pg.PlotWidget) -> None:
self.widget.setAxisItems({"bottom": DateAxisItem()})
self.series = LineSeries()
self.crosshairs = Crosshairs(self.widget, self.series)
+ self.hide_scene_actions()
self.hide_irrelevant_plot_actions()
self.add_custom_menu_actions()
@@ -181,6 +182,12 @@ def draw_series(self) -> None:
def add_data(self, series: LineSeries) -> None:
self.series.extend(series)
+ def hide_scene_actions(self) -> None:
+ # hide the 'Export...' action
+ scene_menu = self.widget.scene().contextMenu
+ for action in scene_menu:
+ action.setVisible(False)
+
def hide_irrelevant_plot_actions(self) -> None:
for action in ("Transforms", "Downsample", "Average", "Alpha", "Points"):
self.widget.plotItem.setContextMenuActionVisible(action, visible=False)
From e8f2bea333fa6d9d05407b28c10b8d10b7618845 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Mon, 29 Jul 2024 22:35:43 +0300
Subject: [PATCH 60/73] Fix utctolocal func and spread its usage a little
---
src/playercard/playerinfodialog.py | 11 +++--------
src/stats/models/leaderboardtablemodel.py | 9 +++------
src/util/__init__.py | 2 +-
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index a3f2e65fc..117433bbe 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -1,7 +1,5 @@
from __future__ import annotations
-from PyQt6.QtCore import QDateTime
-from PyQt6.QtCore import Qt
from PyQt6.QtWidgets import QTableWidgetItem
import util
@@ -67,10 +65,8 @@ def process_player_ratings(self, ratings: dict[str, list[LeaderboardRating]]) ->
def process_player(self, player: Player) -> None:
self.nicknameLabel.setText(player.login)
self.idLabel.setText(player.xd)
- registered = QDateTime.fromString(player.create_time, Qt.DateFormat.ISODate).toLocalTime()
- self.registeredLabel.setText(registered.toString("yyyy-MM-dd hh:mm"))
- last_login = QDateTime.fromString(player.update_time, Qt.DateFormat.ISODate).toLocalTime()
- self.lastLoginLabel.setText(last_login.toString("yyyy-MM-dd hh:mm"))
+ self.registeredLabel.setText(util.utctolocal(player.create_time))
+ self.lastLoginLabel.setText(util.utctolocal(player.update_time))
self.add_avatars(player.avatar_assignments)
self.add_names(player.names)
@@ -80,8 +76,7 @@ def add_names(self, names: list[NameRecord] | None) -> None:
self.nameHistoryTableWidget.setRowCount(len(names))
for row, name_record in enumerate(names):
name = QTableWidgetItem(name_record.name)
- change_time = QDateTime.fromString(name_record.change_time, Qt.DateFormat.ISODate)
- used_until = QTableWidgetItem(change_time.toString("yyyy-MM-dd hh:mm"))
+ used_until = QTableWidgetItem(util.utctolocal(name_record.change_time))
self.nameHistoryTableWidget.setItem(row, 0, name)
self.nameHistoryTableWidget.setItem(row, 1, used_until)
diff --git a/src/stats/models/leaderboardtablemodel.py b/src/stats/models/leaderboardtablemodel.py
index c01c95d06..968eeb563 100644
--- a/src/stats/models/leaderboardtablemodel.py
+++ b/src/stats/models/leaderboardtablemodel.py
@@ -1,8 +1,9 @@
from PyQt6.QtCore import QAbstractTableModel
-from PyQt6.QtCore import QDateTime
from PyQt6.QtCore import QModelIndex
from PyQt6.QtCore import Qt
+from util import utctolocal
+
class LeaderboardTableModel(QAbstractTableModel):
def __init__(self, data=None):
@@ -68,11 +69,7 @@ def data(self, index, role=Qt.ItemDataRole.DisplayRole):
/ self.values[row]["totalGames"],
)
elif column == 7:
- dateUTC = QDateTime.fromString(
- self.values[row]["updateTime"], Qt.DateFormat.ISODate,
- )
- dateLocal = dateUTC.toLocalTime().toString("yyyy-MM-dd")
- return "{}".format(dateLocal)
+ return utctolocal(self.values[row]["updateTime"])
elif column == 8:
return "{}".format(self.values[row]["player"]["id"])
diff --git a/src/util/__init__.py b/src/util/__init__.py
index 62549a053..6745554c6 100644
--- a/src/util/__init__.py
+++ b/src/util/__init__.py
@@ -513,7 +513,7 @@ def strtodate(s: str) -> QDateTime:
def datetostr(d: QDateTime) -> str:
- return d.toString("yyyy-mm-dd HH:MM:ss")
+ return d.toString("yyyy-MM-dd hh:mm")
def utctolocal(s: str) -> str:
From 6116906cc012ba6acae06844bf0bceec24af5681 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Tue, 30 Jul 2024 21:49:36 +0300
Subject: [PATCH 61/73] Add achievements to player card
---
res/client/client.css | 26 +++-
res/player_card/achievement.png | Bin 0 -> 777 bytes
res/player_card/achievement.ui | 147 +++++++++++++++++++++
res/player_card/playercard.ui | 139 +++++++++++++-------
src/api/models/Achievement.py | 40 ++++++
src/api/models/PlayerAchievement.py | 17 +++
src/api/stats_api.py | 29 +++++
src/playercard/achievements.py | 191 ++++++++++++++++++++++++++++
src/playercard/playerinfodialog.py | 10 +-
src/util/__init__.py | 12 ++
10 files changed, 560 insertions(+), 51 deletions(-)
create mode 100644 res/player_card/achievement.png
create mode 100644 res/player_card/achievement.ui
create mode 100644 src/api/models/Achievement.py
create mode 100644 src/api/models/PlayerAchievement.py
create mode 100644 src/playercard/achievements.py
diff --git a/res/client/client.css b/res/client/client.css
index a3213e7b6..58be94c25 100644
--- a/res/client/client.css
+++ b/res/client/client.css
@@ -177,7 +177,17 @@ QWidget#replayScore
padding: 0px;
}
-QWidget#scrollAreaWidgetContents
+QWidget#achievementWidget
+{
+ background-color: #202025;
+}
+
+QWidget#hline
+{
+ background-color: #202025;
+}
+
+QWidget#statisticsChartsScrollArea,#achievementsScrollArea
{
background-color: #383838;
}
@@ -1044,3 +1054,17 @@ QFrame#settingsFrame {
{
background-color: #202025;
}
+
+QProgressBar#achievementBar
+{
+ background-color: black;
+ text-align: center;
+ max-height: 12px;
+ border: 1px solid black;
+}
+
+QProgressBar#achievementBar::chunk
+{
+ background-color: orange;
+
+}
diff --git a/res/player_card/achievement.png b/res/player_card/achievement.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d44cba1f7e0c5142c8a8641e9e8b0d568ad96d5
GIT binary patch
literal 777
zcmV+k1NQuhP)rrMUCw1stD1
ze1|Bg8y`Rv72Nu-2+oKbgJhp84dueYYNyTg)UDg+gR?8rQ|DCO+chB-5JCtcL`X)!
zZD0miWtsw$G>2-LI55%s017}o0QCS=f;!g7+LS{*00p2P
zfO-HbK^<#kZOWk@fC5ktKs^AJppG@NHo55mdzlBWcl?00>2GXg#{Q&7-ew+pIx{|U
z0B15|-}LA|_cITDkQpC2fJd3JJ3ac(rIrtQeLw-+Xc>E<&j5}ByDblYn6~Eco)9U3
z^)$EK%5U@oI6}|dbYO@%)iqYY7y3|jME!ITVsx@-Sp9m*%#U=Gyz)&azmmv|r4C!vx`~
z14FH&t`LZ3C4F>Ysx7DwUTXU?X-<**4$QR$v`tX%IxyG%p*sZT5b(r-$(GTx^wJQT
z<^cEJf!Q{vcfckC;iR*s`~}!zU~Hx>U)ubqLt6Rsj8kJS@piPI8gBTSzX;pF=M|d&
z2{>DN(%u*Wm(!&eeHs5f{n8}dA#0he0q23oOEkXuS?5%4x?@X{_)km$l*JT)0vI%=
z9Uz1dLd3g=bQ2un@>d1D&!gzVwO
zYePOE*Rb*}@(I~0RTxSeX$qjcnWi03-cVBss!L%gZKNrH@@ATLKzTz=C8#cip|p`U
z^Z@$&s~77@%>^T2sPW6VTLfa1La1RUOe20BErbw42>#?3o@OFhx%?=T00000NkvXX
Hu0mjf2OU_D
literal 0
HcmV?d00001
diff --git a/res/player_card/achievement.ui b/res/player_card/achievement.ui
new file mode 100644
index 000000000..890719d3e
--- /dev/null
+++ b/res/player_card/achievement.ui
@@ -0,0 +1,147 @@
+
+
+ Form
+
+
+
+ 0
+ 0
+ 400
+ 300
+
+
+
+ Form
+
+
+ -
+
+
+
+ 375
+ 0
+
+
+
+
-
+
+
-
+
+
+ 6
+
+
-
+
+
-
+
+
+ Qt::Orientation::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+
+ 120
+ 16777215
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Orientation::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 16777215
+ 40
+
+
+
+
+ 12
+ true
+
+
+
+
+
+
+ Qt::AlignmentFlag::AlignCenter
+
+
+ true
+
+
+
+ -
+
+
+
+ 16777215
+ 40
+
+
+
+
+ 10
+
+
+
+
+
+
+ Qt::AlignmentFlag::AlignCenter
+
+
+ true
+
+
+
+ -
+
+
+ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/player_card/playercard.ui b/res/player_card/playercard.ui
index d7caae5b2..59b79c721 100644
--- a/res/player_card/playercard.ui
+++ b/res/player_card/playercard.ui
@@ -29,11 +29,11 @@
-
-
-
+
0
-
+
0
@@ -198,7 +198,7 @@
-
-
+
-1
@@ -216,7 +216,93 @@
-
+
+
+ Statistics
+
+
+ -
+
+
+ true
+
+
+
+
+ 0
+ 0
+ 817
+ 648
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+
+ Achievements
+
+
+ -
+
+
+ true
+
+
+
+
+ 0
+ 0
+ 817
+ 648
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+
+
+
+
+
+
Previous Names
@@ -264,51 +350,6 @@
-
-
- Statistics
-
-
- -
-
-
- true
-
-
-
-
- 0
- 0
- 817
- 648
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- 10
-
-
-
-
-
-
-
-
-
diff --git a/src/api/models/Achievement.py b/src/api/models/Achievement.py
new file mode 100644
index 000000000..3b34ab374
--- /dev/null
+++ b/src/api/models/Achievement.py
@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+from api.models.AbstractEntity import AbstractEntity
+from pydantic import Field
+from util import StringValuedEnum
+
+
+class State(StringValuedEnum):
+ REVEALED = "REVEALED"
+ UNLOCKED = "UNLOCKED"
+
+
+class ProgressType(StringValuedEnum):
+ STANDARD = "STANDARD"
+ INCREMENTAL = "INCREMENTAL"
+
+
+class Achievement(AbstractEntity):
+ description: str
+ experience_points: int = Field(alias="experiencePoints")
+ initial_state: str = Field(alias="initialState")
+ name: str
+ order: int
+ revealed_icon_url: str = Field(alias="revealedIconUrl")
+ total_steps: int | None = Field(alias="totalSteps")
+ typ: str = Field(alias="type")
+ unlocked_icon_url: str = Field(alias="unlockedIconUrl")
+ unlockers_avg_duration: int | None = Field(alias="unlockersAvgDuration")
+ unlockers_count: int = Field(alias="unlockersCount")
+ unlockers_max_duration: int | None = Field(alias="unlockersMaxDuration")
+ unlockers_min_duration: int | None = Field(alias="unlockersMinDuration")
+ unlockers_percent: float = Field(alias="unlockersPercent")
+
+ @property
+ def init_state(self) -> State:
+ return State.from_string(self.initial_state)
+
+ @property
+ def progress_type(self) -> ProgressType:
+ return ProgressType.from_string(self.typ)
diff --git a/src/api/models/PlayerAchievement.py b/src/api/models/PlayerAchievement.py
new file mode 100644
index 000000000..479ea3fe4
--- /dev/null
+++ b/src/api/models/PlayerAchievement.py
@@ -0,0 +1,17 @@
+from api.models.AbstractEntity import AbstractEntity
+from api.models.Achievement import Achievement
+from api.models.Achievement import State
+from api.models.Player import Player
+from pydantic import Field
+
+
+class PlayerAchievement(AbstractEntity):
+ current_steps: int | None = Field(alias="currentSteps")
+ state: str
+
+ achievement: Achievement | None = Field(None)
+ player: Player | None = Field(None)
+
+ @property
+ def current_state(self) -> State:
+ return State.from_string(self.state)
diff --git a/src/api/stats_api.py b/src/api/stats_api.py
index 23057ecdb..d0a2bd6db 100644
--- a/src/api/stats_api.py
+++ b/src/api/stats_api.py
@@ -1,4 +1,5 @@
import logging
+from typing import Iterator
from PyQt6.QtCore import QDateTime
from PyQt6.QtCore import Qt
@@ -6,8 +7,10 @@
from api.ApiAccessors import ApiAccessor
from api.ApiAccessors import DataApiAccessor
+from api.models.Achievement import Achievement
from api.models.Leaderboard import Leaderboard
from api.models.LeagueSeasonScore import LeagueSeasonScore
+from api.models.PlayerAchievement import PlayerAchievement
from api.models.PlayerEvent import PlayerEvent
from api.parsers.LeaderboardParser import LeaderboardParser
from api.parsers.LeaderboardRatingParser import LeaderboardRatingParser
@@ -122,3 +125,29 @@ def get_player_events(self, player_id: str) -> None:
def handle_player_events(self, message: dict) -> None:
self.events_ready.emit([PlayerEvent(**entry) for entry in message["data"]])
+
+
+class PlayerAchievementApiAccessor(DataApiAccessor):
+ achievments_ready = pyqtSignal(object)
+
+ def __init__(self) -> None:
+ super().__init__("/data/playerAchievement")
+
+ def get_achievements(self, player_id: str | int) -> None:
+ query = {
+ "include": "achievement",
+ "filter": f"player.id=={player_id}",
+ "sort": "achievement.order",
+ }
+ self.get_by_query(query, self.handle_achievements)
+
+ def handle_achievements(self, message: dict) -> None:
+ self.achievments_ready.emit((PlayerAchievement(**entry) for entry in message["data"]))
+
+
+class AchievementsApiAccessor(DataApiAccessor):
+ def __init__(self) -> None:
+ super().__init__("/data/achievement")
+
+ def prepare_data(self, message: dict) -> dict[str, Iterator[Achievement]]:
+ return {"values": (Achievement(**entry) for entry in message["data"])}
diff --git a/src/playercard/achievements.py b/src/playercard/achievements.py
new file mode 100644
index 000000000..b9613fa03
--- /dev/null
+++ b/src/playercard/achievements.py
@@ -0,0 +1,191 @@
+from __future__ import annotations
+
+import os
+from itertools import batched
+from typing import Iterator
+from typing import NamedTuple
+
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QPixmap
+from PyQt6.QtWidgets import QGridLayout
+from PyQt6.QtWidgets import QLabel
+from PyQt6.QtWidgets import QLayout
+from PyQt6.QtWidgets import QProgressBar
+from PyQt6.QtWidgets import QSizePolicy
+from PyQt6.QtWidgets import QWidget
+
+from api.models.Achievement import Achievement
+from api.models.Achievement import ProgressType
+from api.models.Achievement import State
+from api.models.PlayerAchievement import PlayerAchievement
+from api.stats_api import AchievementsApiAccessor
+from api.stats_api import PlayerAchievementApiAccessor
+from downloadManager import Downloader
+from downloadManager import DownloadRequest
+from util import CACHE_DIR
+from util import THEME
+
+FormClass, BaseClass = THEME.loadUiType("player_card/achievement.ui")
+
+
+class AchievementWidget(FormClass, BaseClass):
+ def __init__(self, player_achievement: PlayerAchievement, img_dler: Downloader) -> None:
+ BaseClass.__init__(self)
+ self.setupUi(self)
+
+ self.player_achievement = player_achievement
+ self.achievement = player_achievement.achievement
+ self.img_dler = img_dler
+ self.img_dl_request = DownloadRequest()
+ self.img_dl_request.done.connect(self.on_icon_downloaded)
+
+ def setup(self) -> None:
+ self.achievementNameLabel.setText(self.achievement.name)
+ self.achievementDescLabel.setText(self.achievement.description)
+
+ self.add_progress_if_present()
+
+ self.detailsLayout.addRow(
+ QLabel("Unlockers:"),
+ QLabel(f"{self.achievement.unlockers_count} ({self.achievement.unlockers_percent}%)"),
+ )
+ self.detailsLayout.addRow(
+ QLabel("Experience points"),
+ QLabel(str(self.achievement.experience_points)),
+ )
+
+ self.add_achievement_image()
+
+ def add_progress_if_present(self) -> None:
+ if self.achievement.progress_type != ProgressType.INCREMENTAL:
+ return
+
+ bar = QProgressBar()
+ bar.setObjectName("achievementBar")
+ bar.setMaximum(self.achievement.total_steps)
+ bar.setValue(self.player_achievement.current_steps)
+ bar.setFormat("%v/%m")
+ self.detailsLayout.addRow(bar)
+
+ def add_achievement_image(self) -> None:
+ image_name = os.path.basename(self.achievement.revealed_icon_url)
+ image_path = os.path.join(CACHE_DIR, "achievements", "revealed", image_name)
+ if os.path.isfile(image_path):
+ self.set_icon(image_path)
+ else:
+ self.download_icon(self.achievement.revealed_icon_url)
+
+ def icon(self, icon_path: str = "") -> QPixmap:
+ if os.path.isfile(icon_path):
+ return QPixmap(icon_path)
+ else:
+ return THEME.pixmap("player_card/achievement.png")
+
+ def set_icon(self, icon_path: str) -> None:
+ self.iconLabel.setPixmap(self.icon(icon_path).scaled(128, 128))
+
+ def on_icon_downloaded(self, _: str, result: tuple[str, bool]) -> None:
+ icon_path, download_failed = result
+ if not download_failed:
+ self.set_icon(icon_path)
+
+ def download_icon(self, url: str) -> None:
+ name = os.path.basename(url)
+ self.img_dler.download(name, self.img_dl_request, url)
+
+
+class AchievementsHandler:
+ def __init__(self, layout: QLayout, player_id: str) -> None:
+ self.player_id = player_id
+ self.layout = layout
+ self.player_achievements_api = PlayerAchievementApiAccessor()
+ self.player_achievements_api.achievments_ready.connect(self.on_player_achievements_ready)
+
+ self.achievements_api = AchievementsApiAccessor()
+ self.achievements_api.data_ready.connect(self.on_achievements_ready)
+ self.img_dler = Downloader(os.path.join(CACHE_DIR, "achievements", "revealed"))
+ self.all_achievements = []
+ self._loaded = False
+
+ def run(self) -> None:
+ if not self._loaded:
+ self.achievements_api.requestData()
+
+ def on_achievements_ready(self, achievements: dict[str, Iterator[Achievement]]) -> None:
+ for achievement in achievements["values"]:
+ self.all_achievements.append(achievement)
+ self.player_achievements_api.get_achievements(self.player_id)
+
+ def mock_player_achievement(self, achievement: Achievement) -> PlayerAchievement:
+ return PlayerAchievement(
+ id="0",
+ create_time="",
+ update_time="",
+ current_steps=(None, 0)[achievement.progress_type == ProgressType.INCREMENTAL],
+ state=State.REVEALED,
+ achievement=achievement,
+ )
+
+ def create_group_title_label(self, text: str) -> QLabel:
+ label = QLabel(text)
+ font = label.font()
+ font.setPointSize(font.pointSize() + 8)
+ font.setBold(True)
+ label.setFont(font)
+ label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ return label
+
+ def create_hline(self) -> QWidget:
+ hline = QWidget()
+ hline.setObjectName("hline")
+ hline.setFixedHeight(2)
+ hline.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+ return hline
+
+ def create_achievement_group_layout(self, group: list[PlayerAchievement]) -> QGridLayout:
+ layout = QGridLayout()
+ for row, batch in enumerate(batched(group, 2)):
+ for column, player_achievement in enumerate(batch):
+ widget = AchievementWidget(player_achievement, self.img_dler)
+ widget.setup()
+ layout.addWidget(widget, row, column)
+ return layout
+
+ def add_achievement_group(self, name: str, group: list[PlayerAchievement]) -> None:
+ label = self.create_group_title_label(f"{name} ({len(group)})")
+ self.layout.addWidget(label)
+ self.layout.addWidget(self.create_hline())
+ group_layout = self.create_achievement_group_layout(group)
+ self.layout.addLayout(group_layout)
+
+ def group_achievements(
+ self,
+ player_achievements: Iterator[PlayerAchievement],
+ ) -> AchievementGroup:
+ unlocked, locked, included_ids = [], [], []
+ for player_achievement in player_achievements:
+ included_ids.append(player_achievement.achievement.xd)
+ if player_achievement.current_state == State.UNLOCKED:
+ unlocked.append(player_achievement)
+ else:
+ locked.append(player_achievement)
+ locked.extend((
+ self.mock_player_achievement(entry)
+ for entry in self.all_achievements
+ if entry.xd not in included_ids
+ ))
+ return AchievementGroup(locked, unlocked)
+
+ def on_player_achievements_ready(
+ self,
+ player_achievements: Iterator[PlayerAchievement],
+ ) -> None:
+ locked, unlocked = self.group_achievements(player_achievements)
+ self.add_achievement_group("Unlocked", unlocked)
+ self.add_achievement_group("Locked", locked)
+ self._loaded = True
+
+
+class AchievementGroup(NamedTuple):
+ locked: list[PlayerAchievement]
+ unlocked: list[PlayerAchievement]
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index 117433bbe..814970705 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -13,6 +13,7 @@
from api.stats_api import LeagueSeasonScoreApiConnector
from api.stats_api import PlayerEventApiAccessor
from downloadManager import AvatarDownloader
+from playercard.achievements import AchievementsHandler
from playercard.avatarhandler import AvatarHandler
from playercard.leagueformatter import league_formatter_factory
from playercard.ratingtabwidget import RatingTabWidgetController
@@ -27,7 +28,8 @@ def __init__(self, avatar_dler: AvatarDownloader, player_id: str) -> None:
self.setupUi(self)
self.load_stylesheet()
- self.tab_widget_ctrl = RatingTabWidgetController(player_id, self.tabWidget)
+ self.mainTabWidget.currentChanged.connect(self.on_tab_changed)
+ self.tab_widget_ctrl = RatingTabWidgetController(player_id, self.ratingsTabWidget)
self.avatar_handler = AvatarHandler(self.avatarList, avatar_dler)
self.player_id = player_id
@@ -45,6 +47,8 @@ def __init__(self, avatar_dler: AvatarDownloader, player_id: str) -> None:
self.stats_charts = StatsCharts()
+ self.achievements_handler = AchievementsHandler(self.verticalLayout_2, self.player_id)
+
def load_stylesheet(self) -> None:
self.setStyleSheet(util.THEME.readstylesheet("client/client.css"))
@@ -55,6 +59,10 @@ def run(self) -> None:
self.tab_widget_ctrl.run()
self.exec()
+ def on_tab_changed(self, index: int) -> None:
+ if self.mainTabWidget.currentWidget() == self.achievementsTab:
+ self.achievements_handler.run()
+
def process_player_ratings(self, ratings: dict[str, list[LeaderboardRating]]) -> None:
for rating in ratings["values"]:
widget = league_formatter_factory(self.player_id, rating, self.leagues_api)
diff --git a/src/util/__init__.py b/src/util/__init__.py
index 6745554c6..1daf13549 100644
--- a/src/util/__init__.py
+++ b/src/util/__init__.py
@@ -7,6 +7,8 @@
import shutil
import subprocess
import sys
+from enum import Enum
+from typing import Self
from PyQt6 import QtWidgets
from PyQt6.QtCore import QDateTime
@@ -525,3 +527,13 @@ def capitalize(string: str) -> str:
Capitalize the first letter only, leave the rest as it is
"""
return f"{string[0].upper()}{string[1:]}"
+
+
+class StringValuedEnum(Enum):
+
+ @classmethod
+ def from_string(cls, string: str) -> Self:
+ for member in iter(cls):
+ if member.value == string:
+ return member
+ raise ValueError("Unsupported value")
From 29c2be8e908939362245cf5e8774103ad88e1842 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Wed, 31 Jul 2024 04:00:17 +0300
Subject: [PATCH 62/73] Playercard: Set player's login as window title
---
src/playercard/playerinfodialog.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index 814970705..5ec6076e2 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -71,6 +71,7 @@ def process_player_ratings(self, ratings: dict[str, list[LeaderboardRating]]) ->
self.statsChartsLayout.addWidget(pie_chart)
def process_player(self, player: Player) -> None:
+ self.setWindowTitle(player.login)
self.nicknameLabel.setText(player.login)
self.idLabel.setText(player.xd)
self.registeredLabel.setText(util.utctolocal(player.create_time))
From 9b0ddf56b2874f9a8372e2a45c6b668116fbb5b2 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Wed, 31 Jul 2024 23:49:01 +0300
Subject: [PATCH 63/73] Turn AvatarDownloader into ImageDownloader
---
src/chat/_avatarWidget.py | 4 +--
src/chat/channel_view.py | 4 +--
src/chat/chatter_model.py | 7 ++--
src/client/_clientwindow.py | 4 +--
src/downloadManager/__init__.py | 54 +++++++++++++++++-------------
src/playercard/achievements.py | 39 ++++++++++-----------
src/playercard/avatarhandler.py | 10 +++---
src/playercard/leagueformatter.py | 45 ++++++++++++-------------
src/playercard/playerinfodialog.py | 4 +--
9 files changed, 84 insertions(+), 87 deletions(-)
diff --git a/src/chat/_avatarWidget.py b/src/chat/_avatarWidget.py
index 486339d34..6efe0d306 100644
--- a/src/chat/_avatarWidget.py
+++ b/src/chat/_avatarWidget.py
@@ -62,7 +62,7 @@ def select_avatar(self, val):
})
self.base.close()
- def set_avatar_list(self, avatars):
+ def set_avatar_list(self, avatars: list[dict]) -> None:
self.avatar_list.clear()
self._add_avatar_item(None)
@@ -70,7 +70,7 @@ def set_avatar_list(self, avatars):
self._add_avatar_item(avatar)
url = avatar["url"]
avatar_name = QUrl(url).fileName()
- icon = self._avatar_dler.avatars.get(avatar_name, None)
+ icon = self._avatar_dler.get_image(avatar_name)
if icon is not None:
self._set_avatar_icon(url, icon)
else:
diff --git a/src/chat/channel_view.py b/src/chat/channel_view.py
index 02b3eccdd..e1e1e85dc 100644
--- a/src/chat/channel_view.py
+++ b/src/chat/channel_view.py
@@ -175,9 +175,9 @@ def __init__(self, widget, avatar_dler):
def build(cls, widget, avatar_dler, **kwargs):
return cls(widget, avatar_dler)
- def add_avatar(self, url):
+ def add_avatar(self, url: str) -> None:
avatar_name = QUrl(url).fileName()
- avatar_pix = self._avatar_dler.avatars.get(avatar_name, None)
+ avatar_pix = self._avatar_dler.get_image(avatar_name)
if avatar_pix is not None:
self._add_avatar_resource(url, avatar_pix)
elif url not in self._requests:
diff --git a/src/chat/chatter_model.py b/src/chat/chatter_model.py
index 2f436af75..3732febab 100644
--- a/src/chat/chatter_model.py
+++ b/src/chat/chatter_model.py
@@ -219,14 +219,13 @@ def chatter_rank(self, data):
return "newplayer"
return league["league"]
- def chatter_avatar_icon(self, data):
+ def chatter_avatar_icon(self, data: ChatterModelItem) -> QIcon | None:
avatar_url = data.avatar_url()
avatar_name = QtCore.QUrl(avatar_url).fileName()
if avatar_url is None:
return None
- if avatar_name not in self._avatars.avatars:
- return
- return QIcon(self._avatars.avatars[avatar_name])
+ if (pixmap := self._avatars.get_image(avatar_name)) is not None:
+ return QIcon(pixmap)
def chatter_country(self, data):
if data.player is None:
diff --git a/src/client/_clientwindow.py b/src/client/_clientwindow.py
index a03a44a6d..02f9cbcc2 100644
--- a/src/client/_clientwindow.py
+++ b/src/client/_clientwindow.py
@@ -44,7 +44,7 @@
from connectivity.ConnectivityDialog import ConnectivityDialog
from contextmenu.playercontextmenu import PlayerContextMenu
from coop import CoopWidget
-from downloadManager import AvatarDownloader
+from downloadManager import ImageDownloader
from downloadManager import MapSmallPreviewDownloader
from fa.factions import Factions
from fa.game_runner import GameRunner
@@ -235,7 +235,7 @@ def __init__(self, *args, **kwargs):
)
self.map_preview_downloader = MapSmallPreviewDownloader(util.MAP_PREVIEW_SMALL_DIR)
- self.avatar_downloader = AvatarDownloader()
+ self.avatar_downloader = ImageDownloader()
# Map generator
self.map_generator = MapGeneratorManager()
diff --git a/src/downloadManager/__init__.py b/src/downloadManager/__init__.py
index 7e3387e53..a9975567f 100644
--- a/src/downloadManager/__init__.py
+++ b/src/downloadManager/__init__.py
@@ -10,6 +10,7 @@
from PyQt6.QtCore import QFile
from PyQt6.QtCore import QIODevice
from PyQt6.QtCore import QObject
+from PyQt6.QtCore import QSize
from PyQt6.QtCore import QTimer
from PyQt6.QtCore import QUrl
from PyQt6.QtCore import pyqtSignal
@@ -19,7 +20,6 @@
from PyQt6.QtNetwork import QNetworkRequest
from config import Settings
-from qt.utils import qopen
from util import AVATARS_CACHE_DIR
logger = logging.getLogger(__name__)
@@ -417,35 +417,37 @@ def _clear_timeouts(self):
self._timed_out_items.clear()
-class AvatarDownloader:
- def __init__(self):
+class ImageDownloader:
+ def __init__(self, cache_dir: str = AVATARS_CACHE_DIR, size: QSize | None = None) -> None:
+ self._size = size
self._nam = QNetworkAccessManager()
self._requests = {}
- self.avatars = {}
- self._nam.finished.connect(self._avatar_download_finished)
- self.cache_dir = AVATARS_CACHE_DIR
+ self.images = {}
+ self._nam.finished.connect(self._image_download_finished)
+ self.cache_dir = cache_dir
self.load_cache()
def load_cache(self) -> None:
for filename in os.listdir(self.cache_dir):
filepath = os.path.join(self.cache_dir, filename)
- self.avatars[filename] = QPixmap(filepath)
+ pix = QPixmap(filepath)
+ self.images[filename] = pix if self._size is None else pix.scaled(self._size)
- def avatar_name(self, url: QUrl | str) -> str:
+ def image_name(self, url: QUrl | str) -> str:
return QUrl(url).fileName(QUrl.ComponentFormattingOption.EncodeSpaces)
- def has_avatar(self, name_or_url: str) -> bool:
- return self.get_avatar(name_or_url) is not None
+ def has_image(self, name_or_url: QUrl | str) -> bool:
+ return self.get_image(name_or_url) is not None
- def get_avatar(self, name_or_url: str) -> QPixmap:
- return self.avatars.get(self.avatar_name(name_or_url), None)
+ def get_image(self, name_or_url: QUrl | str) -> QPixmap | None:
+ return self.images.get(self.image_name(name_or_url))
def download_if_needed(self, url: str | None, req: DownloadRequest) -> None:
- if url is None or self.has_avatar(url):
+ if url is None or self.has_image(url):
return
- self.download_avatar(url, req)
+ self.download_image(url, req)
- def download_avatar(self, url, req):
+ def download_image(self, url: str, req: DownloadRequest) -> None:
self._add_request(url, req)
def _add_request(self, url, req):
@@ -454,20 +456,24 @@ def _add_request(self, url, req):
if should_download:
self._nam.get(QNetworkRequest(QUrl(url)))
- def _avatar_download_finished(self, reply: QNetworkReply) -> None:
+ def _image_download_finished(self, reply: QNetworkReply) -> None:
url_str = reply.url().toString()
- avatar_name = self.avatar_name(reply.url())
- avatar_path = self._save_avatar_to_cache(avatar_name, reply.readAll())
+ avatar_name = self.image_name(reply.url())
+ avatar_path = self._save_image_to_cache(avatar_name, reply.readAll())
- if avatar_name not in self.avatars:
- self.avatars[avatar_name] = QPixmap(avatar_path)
+ if avatar_name not in self.images:
+ self.images[avatar_name] = QPixmap(avatar_path)
reqs = self._requests.pop(url_str, [])
for req in reqs:
- req.finished(url_str, self.avatars[avatar_name])
+ req.finished(url_str, self.images[avatar_name])
- def _save_avatar_to_cache(self, name: str, qbytes: QByteArray) -> str:
+ def _save_image_to_cache(self, name: str, qbytes: QByteArray) -> str:
filepath = os.path.join(self.cache_dir, name)
- with qopen(filepath, QFile.OpenModeFlag.WriteOnly) as file:
- file.write(qbytes.data())
+ pixmap = QPixmap()
+ pixmap.loadFromData(qbytes)
+ if self._size is not None:
+ pixmap.scaled(self._size).save(filepath)
+ else:
+ pixmap.save(filepath)
return filepath
diff --git a/src/playercard/achievements.py b/src/playercard/achievements.py
index b9613fa03..68af5ce60 100644
--- a/src/playercard/achievements.py
+++ b/src/playercard/achievements.py
@@ -5,6 +5,7 @@
from typing import Iterator
from typing import NamedTuple
+from PyQt6.QtCore import QSize
from PyQt6.QtCore import Qt
from PyQt6.QtGui import QPixmap
from PyQt6.QtWidgets import QGridLayout
@@ -20,8 +21,8 @@
from api.models.PlayerAchievement import PlayerAchievement
from api.stats_api import AchievementsApiAccessor
from api.stats_api import PlayerAchievementApiAccessor
-from downloadManager import Downloader
from downloadManager import DownloadRequest
+from downloadManager import ImageDownloader
from util import CACHE_DIR
from util import THEME
@@ -29,7 +30,7 @@
class AchievementWidget(FormClass, BaseClass):
- def __init__(self, player_achievement: PlayerAchievement, img_dler: Downloader) -> None:
+ def __init__(self, player_achievement: PlayerAchievement, img_dler: ImageDownloader) -> None:
BaseClass.__init__(self)
self.setupUi(self)
@@ -69,29 +70,22 @@ def add_progress_if_present(self) -> None:
def add_achievement_image(self) -> None:
image_name = os.path.basename(self.achievement.revealed_icon_url)
- image_path = os.path.join(CACHE_DIR, "achievements", "revealed", image_name)
- if os.path.isfile(image_path):
- self.set_icon(image_path)
- else:
- self.download_icon(self.achievement.revealed_icon_url)
+ self.set_icon(self.icon(image_name))
+ self.download_icon_if_needed(self.achievement.revealed_icon_url)
- def icon(self, icon_path: str = "") -> QPixmap:
- if os.path.isfile(icon_path):
- return QPixmap(icon_path)
- else:
- return THEME.pixmap("player_card/achievement.png")
+ def icon(self, icon_name: str = "") -> QPixmap:
+ if (pixmap := self.img_dler.get_image(icon_name)) is not None:
+ return pixmap
+ return THEME.pixmap("player_card/achievement.png")
- def set_icon(self, icon_path: str) -> None:
- self.iconLabel.setPixmap(self.icon(icon_path).scaled(128, 128))
+ def set_icon(self, pixmap: QPixmap) -> None:
+ self.iconLabel.setPixmap(pixmap)
- def on_icon_downloaded(self, _: str, result: tuple[str, bool]) -> None:
- icon_path, download_failed = result
- if not download_failed:
- self.set_icon(icon_path)
+ def on_icon_downloaded(self, _: str, pixmap: QPixmap) -> None:
+ self.set_icon(pixmap)
- def download_icon(self, url: str) -> None:
- name = os.path.basename(url)
- self.img_dler.download(name, self.img_dl_request, url)
+ def download_icon_if_needed(self, url: str) -> None:
+ self.img_dler.download_if_needed(url, self.img_dl_request)
class AchievementsHandler:
@@ -103,7 +97,8 @@ def __init__(self, layout: QLayout, player_id: str) -> None:
self.achievements_api = AchievementsApiAccessor()
self.achievements_api.data_ready.connect(self.on_achievements_ready)
- self.img_dler = Downloader(os.path.join(CACHE_DIR, "achievements", "revealed"))
+ self.cache_dir = os.path.join(CACHE_DIR, "achievements", "revealed")
+ self.img_dler = ImageDownloader(self.cache_dir, QSize(128, 128))
self.all_achievements = []
self._loaded = False
diff --git a/src/playercard/avatarhandler.py b/src/playercard/avatarhandler.py
index ac33ce667..133dbfe4b 100644
--- a/src/playercard/avatarhandler.py
+++ b/src/playercard/avatarhandler.py
@@ -8,12 +8,12 @@
import util
from api.models.Avatar import Avatar
from api.models.AvatarAssignment import AvatarAssignment
-from downloadManager import AvatarDownloader
from downloadManager import DownloadRequest
+from downloadManager import ImageDownloader
class AvatarHandler:
- def __init__(self, avatar_list: QListWidget, avatar_downloader: AvatarDownloader) -> None:
+ def __init__(self, avatar_list: QListWidget, avatar_downloader: ImageDownloader) -> None:
self.avatar_list = avatar_list
self.avatar_dler = avatar_downloader
self.requests = {}
@@ -23,7 +23,7 @@ def populate_avatars(self, avatar_assignments: list[AvatarAssignment] | None) ->
return
for assignment in avatar_assignments:
- if self.avatar_dler.has_avatar(assignment.avatar.filename):
+ if self.avatar_dler.has_image(assignment.avatar.filename):
self._add_avatar(assignment.avatar)
else:
self._download_avatar(assignment.avatar)
@@ -36,10 +36,10 @@ def _prepare_avatar_dl_request(self, avatar: Avatar) -> DownloadRequest:
def _download_avatar(self, avatar: Avatar) -> None:
req = self._prepare_avatar_dl_request(avatar)
- self.avatar_dler.download_avatar(avatar.url, req)
+ self.avatar_dler.download_image(avatar.url, req)
def _add_avatar(self, avatar: Avatar) -> None:
- self._add_avatar_item(self.avatar_dler.get_avatar(avatar.filename), avatar.tooltip)
+ self._add_avatar_item(self.avatar_dler.get_image(avatar.filename), avatar.tooltip)
def _add_avatar_item(self, pixmap: QPixmap, description: str) -> None:
if pixmap.isNull():
diff --git a/src/playercard/leagueformatter.py b/src/playercard/leagueformatter.py
index 8e7af3e90..4e6526adf 100644
--- a/src/playercard/leagueformatter.py
+++ b/src/playercard/leagueformatter.py
@@ -1,13 +1,14 @@
import os
+from PyQt6.QtCore import QSize
from PyQt6.QtGui import QPixmap
import util
from api.models.LeaderboardRating import LeaderboardRating
from api.models.LeagueSeasonScore import LeagueSeasonScore
from api.stats_api import LeagueSeasonScoreApiConnector
-from downloadManager import Downloader
from downloadManager import DownloadRequest
+from downloadManager import ImageDownloader
FormClass, BaseClass = util.THEME.loadUiType("player_card/playerleague.ui")
@@ -30,7 +31,7 @@ def __init__(
self.league_score_api = league_score_api
self.league_score_api.score_ready.connect(self.on_league_score_ready)
- self._downloader = Downloader(util.DIVISIONS_CACHE_DIR)
+ self._downloader = ImageDownloader(util.DIVISIONS_CACHE_DIR, QSize(160, 80))
self._images_dl_request = DownloadRequest()
self._images_dl_request.done.connect(self.on_image_downloaded)
@@ -41,7 +42,7 @@ def load_stylesheet(self) -> None:
self.setStyleSheet(util.THEME.readstylesheet("client/client.css"))
def default_pixmap(self) -> QPixmap:
- return util.THEME.pixmap("player_card/unlisted.png")
+ return util.THEME.pixmap("player_card/unlisted.png").scaled(80, 80)
def default_league(self) -> str:
return "Unlisted"
@@ -52,7 +53,7 @@ def rating_text(self) -> str:
def fill_ui(self) -> None:
self.divisionLabel.setText(self.default_league())
- self.set_league_icon()
+ self.set_league_icon(self.default_pixmap())
self.gamesLabel.setText(f"{self.rating.total_games:.0f} Games")
self.ratingLabel.setText(self.rating_text())
self.leaderboardLabel.setText(self.leaderboard.pretty_name)
@@ -74,26 +75,22 @@ def on_league_score_ready(self, score: LeagueSeasonScore) -> None:
self.divisionLabel.setText(league_name)
image_name = os.path.basename(subdivision.image_url)
- image_path = os.path.join(util.CACHE_DIR, "divisions", image_name)
- if os.path.isfile(image_path):
- self.set_league_icon(image_path)
- else:
- self.download_league_icon(subdivision.image_url)
-
- def set_league_icon(self, image_path: str = "") -> None:
- if os.path.isfile(image_path):
- self.iconLabel.setPixmap(QPixmap(image_path).scaled(160, 80))
- else:
- self.iconLabel.setPixmap(self.default_pixmap().scaled(80, 80))
-
- def download_league_icon(self, url: str) -> None:
- name = os.path.basename(url)
- self._downloader.download(name, self._images_dl_request, url)
-
- def on_image_downloaded(self, _: str, result: tuple[str, bool]) -> None:
- image_path, download_failed = result
- if not download_failed:
- self.set_league_icon(image_path)
+ self.set_league_icon(self.icon(image_name))
+ self.download_league_icon_if_needed(subdivision.image_url)
+
+ def icon(self, image_name: str = "") -> QPixmap:
+ if (pixmap := self._downloader.get_image(image_name)) is not None:
+ return pixmap
+ return self.default_pixmap()
+
+ def set_league_icon(self, pixmap: QPixmap) -> None:
+ self.iconLabel.setPixmap(pixmap)
+
+ def download_league_icon_if_needed(self, url: str) -> None:
+ self._downloader.download_if_needed(url, self._images_dl_request)
+
+ def on_image_downloaded(self, _: str, pixmap: QPixmap) -> None:
+ self.set_league_icon(pixmap)
class GlobalLeagueFormatter(LeagueFormatter):
diff --git a/src/playercard/playerinfodialog.py b/src/playercard/playerinfodialog.py
index 5ec6076e2..cd2f056d1 100644
--- a/src/playercard/playerinfodialog.py
+++ b/src/playercard/playerinfodialog.py
@@ -12,7 +12,7 @@
from api.stats_api import LeaderboardRatingApiConnector
from api.stats_api import LeagueSeasonScoreApiConnector
from api.stats_api import PlayerEventApiAccessor
-from downloadManager import AvatarDownloader
+from downloadManager import ImageDownloader
from playercard.achievements import AchievementsHandler
from playercard.avatarhandler import AvatarHandler
from playercard.leagueformatter import league_formatter_factory
@@ -23,7 +23,7 @@
class PlayerInfoDialog(FormClass, BaseClass):
- def __init__(self, avatar_dler: AvatarDownloader, player_id: str) -> None:
+ def __init__(self, avatar_dler: ImageDownloader, player_id: str) -> None:
BaseClass.__init__(self)
self.setupUi(self)
self.load_stylesheet()
From 92d3f25c424015cb08806abbc7aac02e6ba6fc8b Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Thu, 1 Aug 2024 00:03:30 +0300
Subject: [PATCH 64/73] Ensure avatars dir
---
src/playercard/achievements.py | 5 ++---
src/util/__init__.py | 5 ++++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/playercard/achievements.py b/src/playercard/achievements.py
index 68af5ce60..e1b36a174 100644
--- a/src/playercard/achievements.py
+++ b/src/playercard/achievements.py
@@ -23,7 +23,7 @@
from api.stats_api import PlayerAchievementApiAccessor
from downloadManager import DownloadRequest
from downloadManager import ImageDownloader
-from util import CACHE_DIR
+from util import ACHIEVEMENTS_CACHE_DIR
from util import THEME
FormClass, BaseClass = THEME.loadUiType("player_card/achievement.ui")
@@ -97,8 +97,7 @@ def __init__(self, layout: QLayout, player_id: str) -> None:
self.achievements_api = AchievementsApiAccessor()
self.achievements_api.data_ready.connect(self.on_achievements_ready)
- self.cache_dir = os.path.join(CACHE_DIR, "achievements", "revealed")
- self.img_dler = ImageDownloader(self.cache_dir, QSize(128, 128))
+ self.img_dler = ImageDownloader(ACHIEVEMENTS_CACHE_DIR, QSize(128, 128))
self.all_achievements = []
self._loaded = False
diff --git a/src/util/__init__.py b/src/util/__init__.py
index 1daf13549..2265a398c 100644
--- a/src/util/__init__.py
+++ b/src/util/__init__.py
@@ -68,6 +68,9 @@
# Cache for league division images
DIVISIONS_CACHE_DIR = os.path.join(CACHE_DIR, "divisions")
+# Cache for achievement images
+ACHIEVEMENTS_CACHE_DIR = os.path.join(CACHE_DIR, "achievements", "revealed")
+
# This contains cached game files
GAME_CACHE_DIR = os.path.join(CACHE_DIR, "featured_mod")
@@ -177,7 +180,7 @@ def setPersonalDir():
MAP_PREVIEW_SMALL_DIR, MAP_PREVIEW_LARGE_DIR, MOD_PREVIEW_DIR,
THEME_DIR, REPLAY_DIR, LOG_DIR, EXTRA_DIR, NEWS_CACHE_DIR,
GAME_CACHE_DIR, GAMEDATA_DIR, BIN_DIR, REPLAY_DIR, AVATARS_CACHE_DIR,
- DIVISIONS_CACHE_DIR,
+ DIVISIONS_CACHE_DIR, ACHIEVEMENTS_CACHE_DIR,
]:
if not os.path.isdir(data_dir):
os.makedirs(data_dir)
From 31cf80031694eea01995c898d5ba004f179602b9 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Thu, 1 Aug 2024 21:39:13 +0300
Subject: [PATCH 65/73] Fix achievement bar's background
so black numbers are visible on it
---
res/client/client.css | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/res/client/client.css b/res/client/client.css
index 58be94c25..5318bce7a 100644
--- a/res/client/client.css
+++ b/res/client/client.css
@@ -1057,7 +1057,7 @@ QFrame#settingsFrame {
QProgressBar#achievementBar
{
- background-color: black;
+ background-color: gray;
text-align: center;
max-height: 12px;
border: 1px solid black;
@@ -1066,5 +1066,4 @@ QProgressBar#achievementBar
QProgressBar#achievementBar::chunk
{
background-color: orange;
-
}
From ff6921fd791e63347e003b082f54e2f08ce3324f Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 09:44:45 +0300
Subject: [PATCH 66/73] Fix fields alignment in Achievement model
---
src/api/models/Achievement.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/api/models/Achievement.py b/src/api/models/Achievement.py
index 3b34ab374..0f8f5bba5 100644
--- a/src/api/models/Achievement.py
+++ b/src/api/models/Achievement.py
@@ -25,10 +25,10 @@ class Achievement(AbstractEntity):
total_steps: int | None = Field(alias="totalSteps")
typ: str = Field(alias="type")
unlocked_icon_url: str = Field(alias="unlockedIconUrl")
- unlockers_avg_duration: int | None = Field(alias="unlockersAvgDuration")
- unlockers_count: int = Field(alias="unlockersCount")
- unlockers_max_duration: int | None = Field(alias="unlockersMaxDuration")
- unlockers_min_duration: int | None = Field(alias="unlockersMinDuration")
+ unlockers_avg_duration: int | None = Field(alias="unlockersAvgDuration")
+ unlockers_count: int | None = Field(alias="unlockersCount")
+ unlockers_max_duration: int | None = Field(alias="unlockersMaxDuration")
+ unlockers_min_duration: int | None = Field(alias="unlockersMinDuration")
unlockers_percent: float = Field(alias="unlockersPercent")
@property
From 1faec4aff6dc17977b78a9dbf90290df033e2415 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 09:51:24 +0300
Subject: [PATCH 67/73] Remove obsolete argument from view_replays method
since a7197c7e9a8cdc0bb5f0120bd0597a35263d64b9 view_replays uses
only player's login to search
---
src/client/_clientwindow.py | 4 ++--
src/replays/_replayswidget.py | 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/client/_clientwindow.py b/src/client/_clientwindow.py
index 02f9cbcc2..fbb0862e8 100644
--- a/src/client/_clientwindow.py
+++ b/src/client/_clientwindow.py
@@ -1667,8 +1667,8 @@ def vault_tab_changed(self, curr):
self.tab_changed(self.topTabs, curr, self._vault_tab)
self._vault_tab = curr
- def view_replays(self, name, leaderboardName=None):
- self.replays.set_player(name, leaderboardName)
+ def view_replays(self, name: str) -> None:
+ self.replays.set_player(name)
self.mainTabs.setCurrentIndex(self.mainTabs.indexOf(self.replaysTab))
def manage_power(self):
diff --git a/src/replays/_replayswidget.py b/src/replays/_replayswidget.py
index 953ae93e2..1871abc72 100644
--- a/src/replays/_replayswidget.py
+++ b/src/replays/_replayswidget.py
@@ -1102,13 +1102,9 @@ def __init__(self, client, dispatcher, gameset, playerset):
def refresh_leaderboards(self) -> None:
self.vaultManager.refresh_leaderboards()
- def set_player(self, name: str, leaderboard_name: str | None = None) -> None:
+ def set_player(self, name: str) -> None:
self.setCurrentIndex(2) # focus on Online Fault
- if leaderboard_name is not None:
- item_index = self.leaderboardList.findData(leaderboard_name)
- self.vaultManager.searchVault(0, "", name, item_index, 0, 100, exactPlayerName=True)
- else:
- self.vaultManager.searchVault(0, "", name, 0, 0, 100, exactPlayerName=True)
+ self.vaultManager.searchVault(0, "", name, 0, 0, 100, exactPlayerName=True)
def focusEvent(self, event):
self.localManager.updatemyTree()
From 5a493c7e29aa791be211b6afc67d686691488724 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 20:46:34 +0300
Subject: [PATCH 68/73] Allow individual override of ingame notification
settings
which allows to disable ingame notification for everything except
the GAME_FULL notification
* apply common enabling/disabling rules to party invite notification
* fix NEW_GAME notification
---
src/notifications/__init__.py | 65 ++++++++++++++++----------------
src/notifications/ns_hook.py | 27 +++++++------
src/notifications/ns_settings.py | 30 ++++++++++++---
3 files changed, 73 insertions(+), 49 deletions(-)
diff --git a/src/notifications/__init__.py b/src/notifications/__init__.py
index 590b936cc..4a03a93e2 100644
--- a/src/notifications/__init__.py
+++ b/src/notifications/__init__.py
@@ -7,6 +7,7 @@
import util
from config import Settings
from fa import maps
+from model.game import Game
from model.player import Player
from notifications.ns_dialog import NotificationDialog
from notifications.ns_settings import IngameNotification
@@ -44,10 +45,7 @@ def __init__(self, client, gameset, playerset, me):
self.user = util.THEME.icon("client/user.png", pix=True)
def _newPlayer(self, player: Player) -> None:
- if (
- self.isDisabled()
- or not self.settings.popupEnabled(self.USER_ONLINE)
- ):
+ if self.is_disabled(self.USER_ONLINE):
return
if self.me.player is not None and self.me.player == player:
@@ -63,21 +61,21 @@ def _newPlayer(self, player: Player) -> None:
self.events.append((self.USER_ONLINE, player.copy()))
self.checkEvent()
- def _newLobby(self, game):
- if self.isDisabled() or not self.settings.popupEnabled(self.NEW_GAME):
+ def _newLobby(self, game: Game) -> None:
+ if self.is_disabled(self.NEW_GAME):
return
host = game.host_player
notify_mode = self.settings.getCustomSetting(self.NEW_GAME, 'mode')
if notify_mode != 'all':
- if host is None or not self.client.user_relations.model.is_friend(host):
+ if host is None or not self.client.user_relations.model.is_friend(host.id, host.login):
return
self.events.append((self.NEW_GAME, game.copy()))
self.checkEvent()
- def _gamefull(self):
- if self.isDisabled() or not self.settings.popupEnabled(self.GAME_FULL):
+ def _gamefull(self) -> None:
+ if self.is_disabled(self.GAME_FULL):
return
if (self.GAME_FULL, None) not in self.events:
self.events.append((self.GAME_FULL, None))
@@ -95,7 +93,10 @@ def unofficialClient(self, msg):
self.events.append((self.UNOFFICIAL_CLIENT, msg))
self.checkEvent()
- def partyInvite(self, message):
+ def partyInvite(self, message: dict) -> None:
+ if self.is_disabled(self.PARTY_INVITE):
+ return
+
notify_mode = self.settings.getCustomSetting(self.PARTY_INVITE, 'mode')
if (
notify_mode != 'all'
@@ -114,18 +115,22 @@ def gameExit(self):
if self.settings.ingame_notifications == IngameNotification.QUEUE:
self.checkEvent()
- def isDisabled(self):
- return (
- self.disabledStartup
- or (
- self.game_running
- and (
- self.settings.ingame_notifications
- == IngameNotification.DISABLE
- )
+ def is_enabled(self, event_type: str) -> bool:
+ if not self.settings.enabled or self.disabledStartup:
+ return False
+
+ if not self.settings.popupEnabled(event_type):
+ return False
+
+ if self.game_running:
+ return (
+ self.settings.ingame_notifications == IngameNotification.ENABLE
+ or self.settings.ingame_allowed(event_type)
)
- or not self.settings.enabled
- )
+ return True
+
+ def is_disabled(self, event_type: str) -> bool:
+ return not self.is_enabled(event_type)
def setNotificationEnabled(self, enabled):
self.settings.enabled = enabled
@@ -233,7 +238,7 @@ def showEvent(self):
self.settings.soundEnabled(eventType),
)
- def checkEvent(self):
+ def checkEvent(self) -> None:
"""
Checks that we are in correct state to show next notification popup
@@ -244,15 +249,9 @@ def checkEvent(self):
* Game isn't running, or ingame notifications are enabled
"""
- if (
- len(self.events) > 0
- and self.dialog.isHidden()
- and (
- not self.game_running
- or (
- self.settings.ingame_notifications
- == IngameNotification.ENABLE
- )
- )
- ):
+ if len(self.events) == 0 or not self.dialog.isHidden():
+ return
+
+ event_type, _ = self.events[0]
+ if self.is_enabled(event_type):
self.showEvent()
diff --git a/src/notifications/ns_hook.py b/src/notifications/ns_hook.py
index 00cb15a57..e0da941c5 100644
--- a/src/notifications/ns_hook.py
+++ b/src/notifications/ns_hook.py
@@ -20,17 +20,15 @@ def __init__(self, eventType):
self.button = QtWidgets.QPushButton('More')
self.button.setEnabled(False)
- def loadSettings(self):
- self.popup = Settings.get(
- self._settings_key + '/popup', True, type=bool,
- )
- self.sound = Settings.get(
- self._settings_key + '/sound', True, type=bool,
- )
-
- def saveSettings(self):
- Settings.set(self._settings_key + '/popup', self.popup)
- Settings.set(self._settings_key + '/sound', self.sound)
+ def loadSettings(self) -> None:
+ self.popup = Settings.get(f"{self._settings_key}/popup", default=True, type=bool)
+ self.sound = Settings.get(f"{self._settings_key}/sound", default=True, type=bool)
+ self.ingame = Settings.get(f"{self._settings_key}/ingame", default=False, type=bool)
+
+ def saveSettings(self) -> None:
+ Settings.set(f"{self._settings_key}/popup", self.popup)
+ Settings.set(f"{self._settings_key}/sound", self.sound)
+ Settings.set(f"{self._settings_key}/ingame", self.ingame)
def getEventDisplayName(self):
return self.eventType
@@ -45,6 +43,13 @@ def switchPopup(self):
def soundEnabled(self):
return self.sound
+ def ingame_allowed(self) -> bool:
+ return self.ingame
+
+ def switch_ingame(self) -> None:
+ self.ingame = not self.ingame
+ self.saveSettings()
+
def switchSound(self):
self.sound = not self.sound
self.saveSettings()
diff --git a/src/notifications/ns_settings.py b/src/notifications/ns_settings.py
index 8b7b976ec..e4bd94ea2 100644
--- a/src/notifications/ns_settings.py
+++ b/src/notifications/ns_settings.py
@@ -3,6 +3,7 @@
Each module/hook for the notification system must be registered here.
"""
from enum import Enum
+from typing import Any
from PyQt6 import QtCore
from PyQt6 import QtWidgets
@@ -74,7 +75,7 @@ def __init__(self, client):
for row in range(0, model.rowCount(None)):
self.tableView.setIndexWidget(
- model.createIndex(row, 3),
+ model.createIndex(row, 4),
model.getHook(row).settings(),
)
@@ -140,6 +141,11 @@ def soundEnabled(self, eventType):
return self.hooks[eventType].soundEnabled()
return False
+ def ingame_allowed(self, event_type: str) -> bool:
+ if event_type in self.hooks:
+ return self.hooks[event_type].ingame_allowed()
+ return False
+
def getCustomSetting(self, eventType, key):
if eventType in self.hooks:
if hasattr(self.hooks[eventType], key):
@@ -155,17 +161,18 @@ class NotificationHooks(QtCore.QAbstractTableModel):
POPUP = 1
SOUND = 2
- SETTINGS = 3
+ ALLOW_INGAME = 3
+ SETTINGS = 4
def __init__(self, parent, hooks, *args):
QtCore.QAbstractTableModel.__init__(self, parent, *args)
self.da = True
self.hooks = hooks
- self.headerdata = ['Type', 'PopUp', 'Sound', '#']
+ self.headerdata = ['Type', 'PopUp', 'Sound', 'Allow ingame', '#']
def flags(self, index):
flags = super(QtCore.QAbstractTableModel, self).flags(index)
- if index.column() == self.POPUP or index.column() == self.SOUND:
+ if index.column() in (self.POPUP, self.SOUND, self.ALLOW_INGAME):
return flags | QtCore.Qt.ItemFlag.ItemIsUserCheckable
if index.column() == self.SETTINGS:
return flags | QtCore.Qt.ItemFlag.ItemIsEditable
@@ -196,6 +203,10 @@ def data(self, index, role=QtCore.Qt.ItemDataRole.DisplayRole.EditRole):
return self.returnChecked(
self.hooks[index.row()].soundEnabled(),
)
+ if index.column() == self.ALLOW_INGAME:
+ return self.returnChecked(
+ self.hooks[index.row()].ingame_allowed(),
+ )
return None
if role != QtCore.Qt.ItemDataRole.DisplayRole:
@@ -208,7 +219,12 @@ def data(self, index, role=QtCore.Qt.ItemDataRole.DisplayRole.EditRole):
def returnChecked(self, state):
return QtCore.Qt.CheckState.Checked if state else QtCore.Qt.CheckState.Unchecked
- def setData(self, index, value, role=QtCore.Qt.ItemDataRole.DisplayRole.EditRole):
+ def setData(
+ self,
+ index: QtCore.QModelIndex,
+ value: Any,
+ role: QtCore.Qt.ItemDataRole = QtCore.Qt.ItemDataRole.EditRole,
+ ) -> bool:
if index.column() == self.POPUP:
self.hooks[index.row()].switchPopup()
self.dataChanged.emit(index, index)
@@ -217,6 +233,10 @@ def setData(self, index, value, role=QtCore.Qt.ItemDataRole.DisplayRole.EditRole
self.hooks[index.row()].switchSound()
self.dataChanged.emit(index, index)
return True
+ if index.column() == self.ALLOW_INGAME:
+ self.hooks[index.row()].switch_ingame()
+ self.dataChanged.emit(index, index)
+ return True
return False
def headerData(self, col, orientation, role):
From cf894d7a982430b0a8c4355e5f5215c23e26c10e Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 23:01:25 +0300
Subject: [PATCH 69/73] Fix some previously unnoticed typehint errors
---
src/api/vaults_api.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/api/vaults_api.py b/src/api/vaults_api.py
index c1cf6504a..271e7871c 100644
--- a/src/api/vaults_api.py
+++ b/src/api/vaults_api.py
@@ -64,11 +64,11 @@ class MapApiConnector(VaultsApiConnector):
def __init__(self) -> None:
super().__init__("/data/map")
- def _extend_query_options(self, query_options: dict) -> dict:
+ def _extend_query_options(self, query_options: dict) -> None:
super()._extend_query_options(query_options)
self._extend_includes(query_options, ["author"])
- def prepare_data(self, message: dict) -> None:
+ def prepare_data(self, message: dict) -> dict:
return {
"values": MapParser.parse_many(message["data"]),
"meta": message["meta"],
@@ -89,7 +89,7 @@ def _extend_query_options(self, query_options: dict) -> dict:
self._add_default_includes(query_options)
return query_options
- def prepare_data(self, message: dict) -> None:
+ def prepare_data(self, message: dict) -> dict:
return {
"values": MapPoolAssignmentParser.parse_many_to_maps(message["data"]),
"meta": message["meta"],
From ee6b70074f5adb789670785f8307bf54fe641469 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 23:03:20 +0300
Subject: [PATCH 70/73] setup.py: Unexclude pydoc -- it is needed for numpy
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 728138e0c..00fec336c 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@
# copied from https://github.com/marcelotduarte/cx_Freeze/blob/5e42a97d2da321eae270cdcc65cdc777eb8e8fc4/samples/pyqt6-simplebrowser/setup.py # noqa: E501
# and unexcluded overexcluded
- "excludes": ["tkinter", "unittest", "pydoc", "tcl"],
+ "excludes": ["tkinter", "unittest", "tcl"],
"zip_include_packages": ["*"],
"zip_exclude_packages": [],
From 2b6724b4cebeebae4055d5f0fd287cf6f6fd7763 Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 23:05:15 +0300
Subject: [PATCH 71/73] Update ice adapter to 3.3.9
---
.github/workflows/release.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 26b6370ae..1ba623f46 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
runs-on: windows-latest
env:
UID_VERSION: v4.0.6
- ICE_ADAPTER_VERSION: v3.3.7
+ ICE_ADAPTER_VERSION: v3.3.9
BUILD_VERSION: ${{ github.event.inputs.version }}
steps:
From f6e6a5b35d4fa4bfc2129c3cf79654a4322d0afc Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 23:12:01 +0300
Subject: [PATCH 72/73] release.yml: Remove unnecessary artifact path
shenanigans
the .msi file is stored in the 'dist' directory
---
.github/workflows/release.yml | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1ba623f46..b81c8492e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,25 +47,10 @@ jobs:
run: |
python setup.py bdist_msi
- - name: Get Artifact Paths
- id: artifact_paths
- run: |
- function getMsiPath {
- $files = Get-ChildItem *.msi -Recurse | Select -First 1
- (Get-Item $files).FullName
- }
- $WINDOWS_MSI = getMsiPath
- Write-Host "MSI path: $WINDOWS_MSI"
- $WINDOWS_MSI_NAME = (Get-Item $WINDOWS_MSI).Name
- Write-Host "MSI name: $WINDOWS_MSI_NAME"
- echo "WINDOWS_MSI=$WINDOWS_MSI" >> "$env:GITHUB_ENV"
- echo "WINDOWS_MSI_NAME=$WINDOWS_MSI_NAME" >> "$env:GITHUB_ENV"
-
- name: Calculate checksum
id: checksum
run: |
- Write-Host MSI path is: $env:WINDOWS_MSI
- $MSI_SUM = $(Get-FileHash $env:WINDOWS_MSI).hash
+ $MSI_SUM = $(Get-FileHash dist/*).hash
Write-Host $MSI_SUM
echo "MSI_SUM=$MSI_SUM" >> "$env:GITHUB_ENV"
@@ -78,4 +63,4 @@ jobs:
body: "SHA256: ${{ env.MSI_SUM }}"
draft: true
prerelease: true
- artifacts: ${{ env.WINDOWS_MSI }}
+ artifacts: dist/*
From 04de926a399231c8f6a290722958805eda6885cd Mon Sep 17 00:00:00 2001
From: gatsik <74517072+Gatsik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 23:26:57 +0300
Subject: [PATCH 73/73] Get chatters' avatars by url, not by name
the ImageDownloader's get_image method accepts url
---
src/chat/_avatarWidget.py | 4 +---
src/chat/channel_view.py | 4 +---
src/chat/chatter_model.py | 3 +--
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/chat/_avatarWidget.py b/src/chat/_avatarWidget.py
index 6efe0d306..29b711b3d 100644
--- a/src/chat/_avatarWidget.py
+++ b/src/chat/_avatarWidget.py
@@ -1,6 +1,5 @@
from PyQt6.QtCore import QObject
from PyQt6.QtCore import QSize
-from PyQt6.QtCore import QUrl
from PyQt6.QtGui import QIcon
from PyQt6.QtWidgets import QListWidgetItem
from PyQt6.QtWidgets import QPushButton
@@ -69,8 +68,7 @@ def set_avatar_list(self, avatars: list[dict]) -> None:
for avatar in avatars:
self._add_avatar_item(avatar)
url = avatar["url"]
- avatar_name = QUrl(url).fileName()
- icon = self._avatar_dler.get_image(avatar_name)
+ icon = self._avatar_dler.get_image(url)
if icon is not None:
self._set_avatar_icon(url, icon)
else:
diff --git a/src/chat/channel_view.py b/src/chat/channel_view.py
index e1e1e85dc..2d420dd50 100644
--- a/src/chat/channel_view.py
+++ b/src/chat/channel_view.py
@@ -3,7 +3,6 @@
import jinja2
from PyQt6.QtCore import QObject
-from PyQt6.QtCore import QUrl
from PyQt6.QtCore import pyqtSignal
from PyQt6.QtGui import QDesktopServices
@@ -176,8 +175,7 @@ def build(cls, widget, avatar_dler, **kwargs):
return cls(widget, avatar_dler)
def add_avatar(self, url: str) -> None:
- avatar_name = QUrl(url).fileName()
- avatar_pix = self._avatar_dler.get_image(avatar_name)
+ avatar_pix = self._avatar_dler.get_image(url)
if avatar_pix is not None:
self._add_avatar_resource(url, avatar_pix)
elif url not in self._requests:
diff --git a/src/chat/chatter_model.py b/src/chat/chatter_model.py
index 3732febab..3917bd249 100644
--- a/src/chat/chatter_model.py
+++ b/src/chat/chatter_model.py
@@ -221,10 +221,9 @@ def chatter_rank(self, data):
def chatter_avatar_icon(self, data: ChatterModelItem) -> QIcon | None:
avatar_url = data.avatar_url()
- avatar_name = QtCore.QUrl(avatar_url).fileName()
if avatar_url is None:
return None
- if (pixmap := self._avatars.get_image(avatar_name)) is not None:
+ if (pixmap := self._avatars.get_image(avatar_url)) is not None:
return QIcon(pixmap)
def chatter_country(self, data):