perf：优化资源路径写法

Author: eee555

src/main.py

@@ -16,20 +16,11 @@
 from mp_plugins.events import *
 from mp_plugins import PluginManager
 from pathlib import Path
-# import os
 from utils import get_paths, patch_env
 
 os.environ["QT_FONT_DPI"] = "96"
 
 
-# def patch_env():
-#     import os
-
-
-#     env = os.environ.copy()
-#     root = os.path.dirname(os.path.abspath(__file__))  # 你的项目根目录
-#     env["PYTHONPATH"] = root
-#     return env
 
 
 def on_new_connection(localServer: QLocalServer):

src/mineSweeperGUI.py

@@ -642,7 +642,7 @@ def dump_evf_file_data(self):
             if not country:
                 country = "XX"
             elif len(country) == 2 and country.isalpha() and country.isascii():
-                file_path = self.r_path.with_name('media') / (country.lower() + ".svg")
+                file_path = superGUI.resource_path('media') / (country.lower() + ".svg")
                 if os.path.exists(file_path):
                     country = country.upper()
             elif country in country_name:

src/superGUI.py

@@ -9,11 +9,19 @@
 from pathlib import Path
 from gameScoreBoard import gameScoreBoardManager
 from country_name import country_name
-import os
+import os, sys
 from typing import List, Tuple
 
 version = "元3.2.2"
 
+def resource_path(relative_path: str) -> Path:
+    """获取资源文件路径（开发环境 + PyInstaller）
+    用于qm文件和media
+    """
+    base_path = Path(getattr(sys, "_MEIPASS", Path(__file__).resolve().parent))
+    return base_path / relative_path
+
+
 class IniConfig:
     def __init__(self, file_path):
         """
@@ -175,6 +183,7 @@ def __init__(self, MainWindow, args):
             # 没权限，改用 %APPDATA%\你的程序名\
             self.setting_path = Path(os.environ['APPDATA']) / ('MetaMineSweeper' + version[1:])
             self.setting_path.mkdir(parents=True, exist_ok=True)
+        # r_path是打包后_internal外面那一层，和exe同一级
         self.r_path = r_path
 
         # 录像保存位置
@@ -189,22 +198,22 @@ def __init__(self, MainWindow, args):
         self.record_setting = IniConfig(record_path)
 
 
-        self.ico_path = str(r_path.with_name('media').joinpath('cat.ico'))
-        self.smileface_path = str(r_path.with_name('media').joinpath('smileface.svg'))
-        self.clickface_path = str(r_path.with_name('media').joinpath('clickface.svg'))
-        self.lostface_path = str(r_path.with_name('media').joinpath('lostface.svg'))
-        self.winface_path = str(r_path.with_name('media').joinpath('winface.svg'))
-        self.smilefacedown_path = str(r_path.with_name('media').joinpath('smilefacedown.svg'))
-        self.LED0_path = str(r_path.with_name('media').joinpath('LED0.png'))
-        self.LED1_path = str(r_path.with_name('media').joinpath('LED1.png'))
-        self.LED2_path = str(r_path.with_name('media').joinpath('LED2.png'))
-        self.LED3_path = str(r_path.with_name('media').joinpath('LED3.png'))
-        self.LED4_path = str(r_path.with_name('media').joinpath('LED4.png'))
-        self.LED5_path = str(r_path.with_name('media').joinpath('LED5.png'))
-        self.LED6_path = str(r_path.with_name('media').joinpath('LED6.png'))
-        self.LED7_path = str(r_path.with_name('media').joinpath('LED7.png'))
-        self.LED8_path = str(r_path.with_name('media').joinpath('LED8.png'))
-        self.LED9_path = str(r_path.with_name('media').joinpath('LED9.png'))
+        self.ico_path = str(resource_path('media') / 'cat.ico')
+        self.smileface_path = str(resource_path('media') / 'smileface.svg')
+        self.clickface_path = str(resource_path('media') / 'clickface.svg')
+        self.lostface_path = str(resource_path('media') / 'lostface.svg')
+        self.winface_path = str(resource_path('media') / 'winface.svg')
+        self.smilefacedown_path = str(resource_path('media') / 'smilefacedown.svg')
+        self.LED0_path = str(resource_path('media') / 'LED0.png')
+        self.LED1_path = str(resource_path('media') / 'LED1.png')
+        self.LED2_path = str(resource_path('media') / 'LED2.png')
+        self.LED3_path = str(resource_path('media') / 'LED3.png')
+        self.LED4_path = str(resource_path('media') / 'LED4.png')
+        self.LED5_path = str(resource_path('media') / 'LED5.png')
+        self.LED6_path = str(resource_path('media') / 'LED6.png')
+        self.LED7_path = str(resource_path('media') / 'LED7.png')
+        self.LED8_path = str(resource_path('media') / 'LED8.png')
+        self.LED9_path = str(resource_path('media') / 'LED9.png')
 
 
         self.mainWindow.setWindowIcon(QIcon(self.ico_path))
@@ -447,7 +456,7 @@ def trans_language(self, language = ""):
             language = self.language
         app = QApplication.instance()
         if language != "zh_CN":
-            self.trans.load(str(self.r_path.with_name(language + '.qm')))
+            self.trans.load(str(resource_path(language + '.qm')))
             app.installTranslator(self.trans)
             self.retranslateUi(self.mainWindow)
             self.score_board_manager.retranslateUi(self.score_board_manager.ui.QWidget)
@@ -566,15 +575,15 @@ def set_country_flag(self, country = None):
         if country not in country_name:
             country = country.capitalize()
         if country not in country_name:
-            file_path = self.r_path.with_name('media') / (country.lower() + ".svg")
+            file_path = resource_path('media') / (country.lower() + ".svg")
             if os.path.exists(file_path):
                 flag_name = file_path
             else:
                 self.label_flag.clear()
                 self.label_flag.update()
                 return
         else:
-            flag_name = self.r_path.with_name('media') / (country_name[country] + ".svg")
+            flag_name = resource_path('media') / (country_name[country] + ".svg")
         pixmap = QPixmap(str(flag_name)).scaled(51, 31)
         self.label_flag.setPixmap(pixmap)
         self.label_flag.update()

src/ui/uiComponents.py

@@ -267,9 +267,6 @@ def __init__(self, countries, parent=None):
             QComboBox QAbstractItemView {
                 text-align: center;
             }
-            QComboBox {
-                qproperty-alignment: 'AlignCenter';
-            }
         """)
 
     def _on_text_edited(self, text):