Added support for controller data

.gitignore

@@ -60,3 +60,4 @@ logs/*
 Pipfile*
 env
 desktop.ini
+assets/controller/*

src/Helpers/TSHControllerHelper.py

@@ -0,0 +1,152 @@
+import re
+import unicodedata
+from qtpy.QtCore import *
+from qtpy.QtGui import *
+from qtpy.QtWidgets import *
+import requests
+import os
+import shutil
+import traceback
+import zipfile
+from .TSHDictHelper import deep_get
+from ..TournamentDataProvider import TournamentDataProvider
+from .TSHLocaleHelper import TSHLocaleHelper
+import json
+from loguru import logger
+import glob
+
+
+class TSHControllerHelperSignals(QObject):
+    controllersUpdated = Signal()
+
+
+class TSHControllerHelper(QObject):
+    instance: "TSHControllerHelper" = None
+
+    signals = TSHControllerHelperSignals()
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.controller_list = {}
+        self.controllerModel = QStandardItemModel()
+
+        self.UpdateControllerFile()
+        self.BuildControllerTree()
+        self.UpdateControllerModel()
+
+
+    def UpdateControllerFile(self):
+        try:
+            url = 'https://github.com/Wolfy76700/ControllerDatabase/archive/refs/heads/main.zip'
+            r = requests.get(url, allow_redirects=True)
+
+            with open('./assets/controller.zip.tmp', 'wb') as zip_file:
+                zip_file.write(r.content)
+
+            try:
+                # Extract ZIP
+                if os.path.exists("./assets/controller_tmp"):
+                    shutil.rmtree("./assets/controller_tmp")
+                with zipfile.ZipFile('./assets/controller.zip.tmp', 'r') as zip_file:
+                    os.mkdir('./assets/controller_tmp')
+                    zip_file.extractall('./assets/controller_tmp')
+
+                # Remove ZIP
+                os.remove('./assets/controller.zip.tmp')
+
+                # Move directory
+                if os.path.exists("./assets/controller"):
+                    shutil.rmtree("./assets/controller")
+                os.rename(
+                    './assets/controller_tmp',
+                    './assets/controller'
+                )
+
+                logger.info("Controller files updated")
+            except:
+                logger.error("Controller files download failed")
+        except Exception as e:
+            logger.error(
+                "Could not update /assets/controller: "+str(e))
+
+    def BuildControllerTree(self):
+        controller_list = {}
+        list_controller_directories = glob.glob("./assets/controller/ControllerDatabase-main/*/*/*/")
+        for controller_directory in list_controller_directories:
+            if os.path.exists(f"{controller_directory}/config.json"):
+                split = controller_directory.split("/")
+                controller_id = f"{split[-4]}/{split[-3]}/{split[-2]}"
+                print(f"Loading: {controller_id}")
+                with open(f"{controller_directory}/config.json", "rt", encoding="utf-8") as config_file:
+                    config_json = json.loads(config_file.read())
+                    if os.path.exists(f"{"/".join(split[:-2])}/config.json"):
+                        with open(f"{"/".join(split[:-2])}/config.json", "rt", encoding="utf-8") as manufacturer_file:
+                            manufacturer = json.loads(manufacturer_file.read()).get("name")
+                            print(f"Manufacturer: {manufacturer}")
+                    else:
+                        manufacturer = None
+
+                    if os.path.exists(f"{"/".join(split[:-3])}/config.json"):
+                        with open(f"{"/".join(split[:-3])}/config.json", "rt", encoding="utf-8") as controller_type_file:
+                            controller_type = json.loads(controller_type_file.read()).get("name")
+                            print(f"Type: {controller_type}")
+                    else:
+                        controller_type = None
+
+                    if os.path.exists(f"{controller_directory}/image.png"):
+                        icon_path = f"{controller_directory}/image.png"
+                    else:
+                        icon_path = None
+
+                    controller_json = {
+                        "name": config_json.get("name"),
+                        "manufacturer": manufacturer,
+                        "type": controller_type,
+                        "icon_path": icon_path,
+                        "config_path": f"{controller_directory}/config.json"
+                    }
+                    controller_list[controller_id] = controller_json
+        self.controller_list = controller_list
+
+
+    def UpdateControllerModel(self):
+        try:
+            self.controllerModel = QStandardItemModel()
+
+            # Add one empty
+            item = QStandardItem("")
+            self.controllerModel.appendRow(item)
+
+            for c in self.controller_list.keys():
+                item = QStandardItem()
+                item.setData(c, Qt.ItemDataRole.EditRole)
+                print(c)
+
+                data = {
+                    "name": self.controller_list[c].get("name"),
+                    "manufacturer": self.controller_list[c].get("manufacturer"),
+                    "type": self.controller_list[c].get("type"),
+                    "codename": c
+                }
+
+
+                data["icon_path"] = self.controller_list[c].get("icon_path")
+                if data["icon_path"]:
+                    item.setIcon(QIcon(QPixmap.fromImage(QImage(data["icon_path"])))
+                    )
+                else:
+                    item.setIcon(QIcon(QPixmap.fromImage(QImage('./assets/icons/cancel.svg')))
+                    )
+
+                if self.controller_list[c].get("name") != c:
+                    item.setData(
+                        f'{self.controller_list[c].get("name")}', Qt.ItemDataRole.EditRole)
+
+                item.setData(data, Qt.ItemDataRole.UserRole)
+                self.controllerModel.appendRow(item)
+
+            self.controllerModel.sort(0)
+        except:
+            logger.error(traceback.format_exc())
+
+TSHControllerHelper.instance = TSHControllerHelper()

src/TSHPlayerDB.py

@@ -22,7 +22,7 @@ class TSHPlayerDB:
     database = {}
     model: QStandardItemModel = None
     fieldnames = ["prefix", "gamerTag", "name", "twitter",
-                  "country_code", "state_code", "mains", "pronoun", "custom_textbox"] # Please always add the new fields at the end of the list
+                  "country_code", "state_code", "mains", "pronoun", "custom_textbox", "controller"] # Please always add the new fields at the end of the list
     modelLock = Lock()
 
     def LoadDB():

src/TSHScoreboardPlayerWidget.py

@@ -8,6 +8,7 @@
 from .Helpers.TSHCountryHelper import TSHCountryHelper
 from .StateManager import StateManager
 from .TSHGameAssetManager import TSHGameAssetManager
+from .Helpers.TSHControllerHelper import TSHControllerHelper
 from .TSHPlayerDB import TSHPlayerDB
 from .TSHTournamentDataProvider import TSHTournamentDataProvider
 from .Helpers.TSHLocaleHelper import TSHLocaleHelper
@@ -54,10 +55,12 @@ def __init__(self, index=0, teamNumber=0, path="", scoreboardNumber=1, customNam
 
         uic.loadUi(TSHResolve("src/layout/TSHScoreboardPlayer.ui"), self)
 
+        self.LoadControllers()
+
         custom_textbox_layout = QHBoxLayout()
         self.custom_textbox = QPlainTextEdit()
         custom_textbox_layout.addWidget(self.custom_textbox)
-        self.layout().addLayout(custom_textbox_layout, 98, 0, 1, 3)
+        self.layout().addLayout(custom_textbox_layout, 98, 2, 1, 1)
         self.custom_textbox.setObjectName("custom_textbox")
         self.custom_textbox.setPlaceholderText(QApplication.translate("app", "Additional information"))
         self.custom_textbox.textChanged.connect(
@@ -526,6 +529,46 @@ def SwapCharacters(self, index1: int, index2: int):
 
         StateManager.ReleaseSaving()
 
+    def LoadControllers(self):
+        try:
+            if TSHControllerHelper.instance.controllerModel == None:
+                TSHControllerHelper.BuildControllerTree()
+                TSHControllerHelper.UpdateControllerModel()
+
+            controller_layout = QVBoxLayout()
+
+            controller_label = QLabel()
+            controller_layout.addWidget(controller_label)
+            controller_label.setText(QApplication.translate("app", "Controller").upper())
+            controller_label.setStyleSheet("QLabel{font-weight: bold; font-size: 8pt;}")
+            controller_label.setObjectName("controllerLabel")
+
+            self.controller = QComboBox()
+
+            controller_layout.addWidget(self.controller)
+            self.layout().addLayout(controller_layout, 97, 2, 1, 1)
+
+            self.controller.setObjectName("controller")
+            self.controller.setEditable(True)
+            self.controller.completer().setFilterMode(Qt.MatchFlag.MatchContains)
+            self.controller.completer().setCompletionMode(QCompleter.PopupCompletion)
+            self.controller.completer().popup().setMinimumWidth(250)
+            self.controller.setIconSize(QSize(24, 24))
+            self.controller.setFixedHeight(32)
+            self.controller.setMinimumWidth(60)
+            # self.controller.setMaximumWidth(120)
+            self.controller.setFont(
+                QFont(self.controller.font().family(), 9))
+            self.controller.setModel(
+                TSHControllerHelper.instance.controllerModel)
+            view = QListView()
+            view.setIconSize(QSize(24, 24))
+            self.controller.setView(view)
+
+        except Exception as e:
+            logger.error(traceback.format_exc())
+            exit()
+
     def LoadCountries(self):
         try:
             if TSHCountryHelper.countryModel == None:
@@ -743,6 +786,19 @@ def SetData(self, data, dontLoadFromDB=False, clear=True, no_mains=False):
                 if stateElement.currentIndex() != stateIndex:
                     stateElement.setCurrentIndex(stateIndex)
 
+            if data.get("controller"):
+                controllerElement: QComboBox = self.findChild(
+                    QComboBox, "controller")
+                controllerIndex = 0
+                for i in range(controllerElement.model().rowCount()):
+                    item = controllerElement.model().item(i).data(Qt.ItemDataRole.UserRole)
+                    if item:
+                        if data.get("controller") == item.get("codename"):
+                            controllerIndex = i
+                            break
+                if controllerElement.currentIndex() != controllerIndex:
+                    controllerElement.setCurrentIndex(controllerIndex)
+
             if data.get("mains") and no_mains != True:
                 if type(data.get("mains")) == list:
                     for element in self.character_elements:
@@ -858,6 +914,10 @@ def SavePlayerToDB(self):
         if self.findChild(QComboBox, "state").currentData(Qt.ItemDataRole.UserRole):
             playerData["state_code"] = self.findChild(
                 QComboBox, "state").currentData(Qt.ItemDataRole.UserRole).get("code")
+
+        if self.findChild(QComboBox, "controller").currentData(Qt.ItemDataRole.UserRole):
+            playerData["controller"] = self.findChild(
+                QComboBox, "controller").currentData(Qt.ItemDataRole.UserRole).get("codename")
 
         TSHPlayerDB.AddPlayers([playerData], overwrite=True)
 

src/TSHScoreboardWidget.py

@@ -223,14 +223,16 @@ def __init__(self, scoreboardNumber=1, *args):
             ["Location", ["locationLabel", "state", "country"]],
             ["Characters", ["characters"]],
             ["Pronouns", ["pronoun", "pronounLabel"]],
+            ["Controller", ["controller", "controllerLabel"]],
             ["Additional information", ["custom_textbox"]],
         ]
         self.elements[0][0] = QApplication.translate("app", "Real Name")
         self.elements[1][0] = QApplication.translate("app", "Twitter")
         self.elements[2][0] = QApplication.translate("app", "Location")
         self.elements[3][0] = QApplication.translate("app", "Characters")
         self.elements[4][0] = QApplication.translate("app", "Pronouns")
-        self.elements[5][0] = QApplication.translate("app", "Additional information")
+        self.elements[5][0] = QApplication.translate("app", "Controller")
+        self.elements[6][0] = QApplication.translate("app", "Additional information")
         for element in self.elements:
             action: QAction = self.eyeBt.menu().addAction(element[0])
             action.setCheckable(True)

src/TournamentStreamHelper.py

@@ -119,6 +119,7 @@ def flush(self):
 from .StateManager import StateManager
 from .SettingsManager import SettingsManager
 from .Helpers.TSHCountryHelper import TSHCountryHelper
+from .Helpers.TSHControllerHelper import TSHControllerHelper
 from .TSHScoreboardManager import TSHScoreboardManager
 from .TSHThumbnailSettingsWidget import TSHThumbnailSettingsWidget
 from src.TSHAssetDownloader import TSHAssetDownloader