Merge pull request #67 from Hpero4/main

战绩查询功能重构等
Zzaphkiel · Sep 21, 2023 · e4f124f · e4f124f
2 parents 7ce22a3 + 90a170b
commit e4f124f
Show file tree

Hide file tree

Showing 8 changed files with 254 additions and 159 deletions.
diff --git a/app/common/config.py b/app/common/config.py
@@ -55,6 +55,8 @@ class Config(QConfig):
     teamGamesNumber = RangeConfigItem("Functions", "TeamGamesNumber", 1,
                                       RangeValidator(1, 10))
 
+    gameInfoFilter = ConfigItem("Functions", "GameInfoFilter", False, BoolValidator())
+
     showTierInGameInfo = ConfigItem("Functions", "ShowTierInGameInfo", False,
                                     BoolValidator())
     enableAutoAcceptMatching = ConfigItem("Functions",

diff --git a/app/common/icons.py b/app/common/icons.py
@@ -41,6 +41,7 @@ class Icon(FluentIconBase, Enum):
     LOCK = 'Lock'
     TEAM = 'Team'
     SETTING = 'Setting'
+    FILTER = 'Filter'
 
     def path(self, theme=Theme.AUTO):
         return f'./app/resource/icons/{self.value}_{getIconColor(theme)}.svg'
diff --git a/app/components/mode_filter_widget.py b/app/components/mode_filter_widget.py
@@ -14,10 +14,9 @@ def __init__(self, parent=None):
 
         self.selected: List[int] = []
 
-        self.hBoxLayout = QVBoxLayout(self)
-        self.hBoxLayout.setAlignment(Qt.AlignCenter)
+        self.vBoxLayout = QVBoxLayout(self)
+        self.vBoxLayout.setAlignment(Qt.AlignCenter)
 
-        # TODO 本地化
         self.rankSoloCheckBox = CheckBox(self.tr("Ranked solo"))
         self.rankFlexCheckBox = CheckBox(self.tr("Ranked Flex"))
         self.normalCheckBox = CheckBox(self.tr("Normal"))
@@ -34,15 +33,15 @@ def __init__(self, parent=None):
             checkBox.stateChanged.connect(
                 lambda state, num=num: self.updateSelected(state, num))
 
-        self.hBoxLayout.addWidget(
+        self.vBoxLayout.addWidget(
             self.rankSoloCheckBox, alignment=Qt.AlignLeft)
-        self.hBoxLayout.addWidget(
+        self.vBoxLayout.addWidget(
             self.rankFlexCheckBox, alignment=Qt.AlignLeft)
-        self.hBoxLayout.addWidget(
+        self.vBoxLayout.addWidget(
             self.normalCheckBox, alignment=Qt.AlignLeft)
-        self.hBoxLayout.addWidget(self.aramCheckBox, alignment=Qt.AlignLeft)
+        self.vBoxLayout.addWidget(self.aramCheckBox, alignment=Qt.AlignLeft)
 
-        self.setLayout(self.hBoxLayout)
+        self.setLayout(self.vBoxLayout)
 
     def updateSelected(self, state, num, callback=None):
         if state == Qt.Checked:

diff --git a/app/resource/icons/Filter_black.svg b/app/resource/icons/Filter_black.svg
diff --git a/app/resource/icons/Filter_white.svg b/app/resource/icons/Filter_white.svg
diff --git a/app/view/main_window.py b/app/view/main_window.py
@@ -778,6 +778,8 @@ def updateGameInfoInterface(callback=None):
             summoners = []
             data = connector.getChampSelectSession()
 
+            isRank = bool(data["myTeam"][0]["assignedPosition"])  # 排位会有预选位
+
             def process_item(item):
                 summonerId = item["summonerId"]
 
@@ -797,6 +799,17 @@ def process_item(item):
                 origGamesInfo = connector.getSummonerGamesByPuuid(
                     puuid, 0, 14)
 
+                if cfg.get(cfg.gameInfoFilter) and isRank:
+                    origGamesInfo["games"] = [game for game in origGamesInfo["games"] if game["queueId"] in (420, 440)]
+                    begIdx = 15
+                    while len(origGamesInfo["games"]) < 11:
+                        endIdx = begIdx + 5
+                        origGamesInfo["games"].extend([
+                            game for game in connector.getSummonerGamesByPuuid(puuid, begIdx, endIdx)["games"]
+                            if game["queueId"] in (420, 440)
+                        ])
+                        begIdx = endIdx + 1
+
                 gamesInfo = [processGameData(game)
                              for game in origGamesInfo["games"][:11]]
 
@@ -937,6 +950,17 @@ def process_item(item):
                 origGamesInfo = connector.getSummonerGamesByPuuid(
                     puuid, 0, 14)
 
+                if cfg.get(cfg.gameInfoFilter) and queueId in (420, 440):
+                    origGamesInfo["games"] = [game for game in origGamesInfo["games"] if game["queueId"] in (420, 440)]
+                    begIdx = 15
+                    while len(origGamesInfo["games"]) < 11:
+                        endIdx = begIdx + 5
+                        origGamesInfo["games"].extend([
+                            game for game in connector.getSummonerGamesByPuuid(puuid, begIdx, endIdx)["games"]
+                            if game["queueId"] in (420, 440)
+                        ])
+                        begIdx = endIdx + 1
+
                 gamesInfo = [processGameData(game)
                              for game in origGamesInfo["games"][0:11]]
 
@@ -1051,10 +1075,8 @@ def _():
     def __onCareerInterfaceGameInfoBarClicked(self, gameId):
         name = self.careerInterface.name.text()
         self.searchInterface.searchLineEdit.setText(name)
-        self.searchInterface.gamesView.gamesTab.triggerByButton = False
-        self.searchInterface.gamesView.gamesTab.updatePuuid(
-            self.careerInterface.puuid)
-        self.searchInterface.gamesView.gamesTab.tabClicked.emit(gameId)
+        self.searchInterface.gamesView.gamesTab.triggerGameId = gameId
+        self.searchInterface.searchButton.click()
 
     def __onCareerInterfaceRefreshButtonClicked(self):
         self.__onSearchInterfaceSummonerNameClicked(