Use QtFileOpen

将读取已编译文本资源文件的功能交由 `QtFileOpen` 与 `PyQTextFileIo` 处理；
完善 `PyQTextFileIo` 的类型注解，使其通过 mypy 检查；

Author: muziing

src/py2exe_gui/Utilities/open_qfile.py

@@ -7,7 +7,7 @@
 import warnings
 from typing import Optional, Union
 
-from PySide6.QtCore import QFile, QIODevice
+from PySide6.QtCore import QByteArray, QFile, QIODevice
 
 
 class QtFileOpen:
@@ -91,29 +91,36 @@ def __init__(
         self._file.open(self.mode)
 
     @classmethod
-    def _parse_mode(cls, py_mode: str) -> QIODevice:
+    def _parse_mode(cls, py_mode: str) -> QIODevice.OpenModeFlag:
         """
         解析文件打开模式，将 Python open() 风格转换至 QIODevice.OpenModeFlag
         https://docs.python.org/zh-cn/3/library/functions.html#open
         https://doc.qt.io/qt-6/qiodevicebase.html#OpenModeFlag-enum
         :return: mode
         """
 
-        qt_mode: QIODevice = QIODevice.Text
+        qt_mode: QIODevice.OpenModeFlag = QIODevice.OpenModeFlag.Text
 
         # 暂不支持写入
         if "r" in py_mode and "+" not in py_mode:
-            qt_mode = qt_mode | QIODevice.ReadOnly
+            qt_mode = qt_mode | QIODevice.OpenModeFlag.ReadOnly
         elif "w" in py_mode:
-            qt_mode = qt_mode | QIODevice.WriteOnly
+            qt_mode = qt_mode | QIODevice.OpenModeFlag.WriteOnly
         elif "+" in py_mode:
-            qt_mode = qt_mode | QIODevice.ReadWrite
+            qt_mode = qt_mode | QIODevice.OpenModeFlag.ReadWrite
 
         if "x" in py_mode:
-            qt_mode = qt_mode | QIODevice.NewOnly
+            qt_mode = qt_mode | QIODevice.OpenModeFlag.NewOnly
 
         return qt_mode
 
+    @classmethod
+    def qba_to_str(cls, qba: QByteArray, encoding: str = locale.getencoding()) -> str:
+        """
+        将 QByteArray 转换为 str
+        """
+        return qba.data().decode(encoding=encoding)
+
     def readable(self) -> bool:
         """
         当前文件是否可读 \n
@@ -135,12 +142,13 @@ def read(self, size: int = -1) -> str:
 
         if size < 0 or size is None:
             # 读取文件，并将 QByteArray 转为 str
-            text = str(self._file.readAll(), encoding=self.encoding)
+            text = self.qba_to_str(self._file.readAll(), encoding=self.encoding)
         else:
             # 已知问题：性能太差
             # PySide6.QtCore.QIODevice.read(maxlen) 以字节而非字符方式计算长度，行为不一致
             # 而 QTextStream 对字符编码支持太差，许多编码并不支持
-            text = str(self._file.readAll(), encoding=self.encoding)[0:size]  # 性能太差
+            text_all = self.qba_to_str(self._file.readAll(), self.encoding)
+            text = text_all[0:size]  # 性能太差
 
         return text
 
@@ -166,7 +174,7 @@ def readline(self, size: int = -1, /) -> str:
             if size == 0:
                 return ""
             else:
-                line = str(self._file.readLine(), encoding=self.encoding)
+                line = self.qba_to_str(self._file.readLine(), self.encoding)
                 if size < 0:
                     return line
                 else:
@@ -185,7 +193,7 @@ def readlines(self, hint: int = -1, /) -> list[str]:
             raise OSError(f"File '{self._file.fileName()}' is not Readable.")
 
         if hint <= 0 or hint is None:
-            temp = str(self._file.readAll(), encoding=self.encoding)
+            temp = self.qba_to_str(self._file.readAll(), self.encoding)
             all_lines = temp.splitlines(keepends=True)
         else:
             all_lines = []

src/py2exe_gui/Widgets/dialog_widgets.py

@@ -3,10 +3,12 @@
 
 from typing import Optional
 
-from PySide6.QtCore import QFile, QIODevice, Qt
+from PySide6.QtCore import Qt
 from PySide6.QtGui import QPixmap
 from PySide6.QtWidgets import QFileDialog, QMessageBox, QWidget
 
+from ..Utilities import QtFileOpen
+
 
 class ScriptFileDlg(QFileDialog):
     """
@@ -79,10 +81,8 @@ def about_text(self) -> str:
         """
 
         # 因使用qrc/rcc系统，所以使用Qt风格读取文本文件
-        about_file = QFile(":/Texts/About_Text")
-        about_file.open(QIODevice.ReadOnly | QIODevice.Text)  # type: ignore
-        about_text = str(about_file.readAll(), encoding="utf-8")  # type: ignore
-        about_file.close()
+        with QtFileOpen(":/Texts/About_Text", encoding="utf-8") as about_file:
+            about_text = about_file.read()
 
         if about_text:
             self._about_text = about_text

src/py2exe_gui/Widgets/pyinstaller_option_widget.py

@@ -4,11 +4,11 @@
 import warnings
 
 import yaml
-from PySide6.QtCore import QFile, QIODevice
 from PySide6.QtGui import QPixmap
 from PySide6.QtWidgets import QHeaderView, QTableWidget, QTableWidgetItem
 
 from ..Constants import RUNTIME_INFO
+from ..Utilities import QtFileOpen
 
 
 def get_options() -> list[dict]:
@@ -17,10 +17,8 @@ def get_options() -> list[dict]:
     :return: 选项信息字典列表
     """
 
-    option_file = QFile(":/Texts/PyInstaller_Options")
-    option_file.open(QIODevice.ReadOnly | QIODevice.Text)  # type: ignore
-    option_file_text = str(option_file.readAll(), encoding="utf-8")  # type: ignore
-    option_file.close()
+    with QtFileOpen(":/Texts/PyInstaller_Options", encoding="utf-8") as option_file:
+        option_file_text = option_file.read()
 
     if option_file_text == "":
         warnings.warn("PyInstaller_Options 加载失败，检查资源文件", Warning, stacklevel=1)