Merge remote-tracking branch 'upstream/master'

Author: tinymins

!src-dist/plib/publish.py

@@ -157,7 +157,7 @@ def __build_addon(packet: str, addon: str, time_tag: str) -> None:
                     squishy.write(f'Module "{file_count}" "{rel_dist_file}"\n')
 
     # 调用squishy工具合并构建（使用minify full压缩级别）
-    os.popen('lua "./!src-dist/tools/react/squish" --minify-level=full').read()
+    utils.read_popen_output('lua "./!src-dist/tools/react/squish" --minify-level=full')
     # 删除临时生成的squishy配置文件
     os.remove("squishy")
 
@@ -276,17 +276,17 @@ def __get_version_info(packet: str, diff_ver: Optional[str] = None) -> Dict[str,
         utils.exit_with_message(f"读取Base.lua文件出错：{e}")
 
     # 获取当前最新提交短hash
-    current_hash: str = os.popen('git log -n 1 --pretty=format:"%h"').read().strip()
+    current_hash: str = utils.read_popen_output(
+        'git log -n 1 --pretty=format:"%h"'
+    ).strip()
     # 获取所有包含 release 信息的提交记录（以 SUCCESS|<hash>|release: <version> 格式保存）
-    commit_list: List[str] = (
-        os.popen('git log --grep release: --pretty=format:"SUCCESS|%h|%s"')
-        .read()
-        .split("\n")
-    )
+    commit_list: List[str] = utils.read_popen_output(
+        'git log --grep release: --pretty=format:"SUCCESS|%h|%s"'
+    ).split("\n")
     if diff_ver:
-        extra_commit: str = os.popen(
+        extra_commit: str = utils.read_popen_output(
             f'git log {diff_ver} -n 1 --pretty=format:"SUCCESS|%h|%s"'
-        ).read()
+        )
         commit_list += extra_commit.split("\n")
     commit_list = list(filter(lambda x: x and x.startswith("SUCCESS|"), commit_list))
 
@@ -443,8 +443,7 @@ def pathToModule(path: str) -> str:
         print("--------------------------------")
         print("文件变更列表：")
         filelist: List[str] = (
-            os.popen(f"git diff {base_hash} HEAD --name-status")
-            .read()
+            utils.read_popen_output(f"git diff {base_hash} HEAD --name-status")
             .strip()
             .split("\n")
         )
@@ -519,21 +518,16 @@ def __lint(packet: str, packet_path: str, diff_version: Optional[str] = None) ->
     start_hash = version_info.get("previous_hash") or ""
     if not start_hash:
         # 如果没有上一版本，则获取3个月内最老的commit的hash
-        start_hash = (
-            os.popen(
-                'git log --since="3 months ago" --format="%H" --reverse | head -n 1'
-            )
-            .read()
-            .strip()
-        )
+        start_hash = utils.read_popen_output(
+            'git log --since="3 months ago" --format="%H" --reverse | head -n 1'
+        ).strip()
         if not start_hash:
             # 如果3个月内没有commit，则获取最新的commit hash
-            start_hash = os.popen("git rev-parse HEAD").read().strip()
+            start_hash = utils.read_popen_output("git rev-parse HEAD").strip()
 
     # 获取从起始commit到当前的所有commit信息
     commits = (
-        os.popen(f'git log {start_hash}..HEAD --pretty=format:"%h|%s"')
-        .read()
+        utils.read_popen_output(f'git log {start_hash}..HEAD --pretty=format:"%h|%s"')
         .strip()
         .split("\n")
     )

!src-dist/plib/utils.py

@@ -6,6 +6,49 @@
 import zlib
 import sys
 from typing import NoReturn
+import subprocess
+
+
+def read_popen_output(command: str) -> str:
+    """
+    执行命令并读取输出。
+
+    参数：
+        command: 要执行的命令字符串
+    返回：
+        命令输出的字符串
+    """
+    try:
+        with subprocess.Popen(
+            command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        ) as process:
+            output, error = process.communicate()
+            if error:
+                raise RuntimeError(f"命令执行错误: {error.decode('utf-8')}")
+            return output.decode("utf-8")
+    except Exception as e:
+        exit_with_message(f"执行命令失败: {e}")
+
+
+def read_file(
+    file_path: str, primary_encoding: str = "gbk", fallback_encoding: str = "utf-8"
+) -> str:
+    """
+    尝试使用主要编码读取文件，如果失败则尝试使用备用编码。
+
+    参数：
+        file_path: 文件路径
+        primary_encoding: 首选编码（默认GBK）
+        fallback_encoding: 备用编码（默认UTF-8）
+    返回：
+        文件内容字符串
+    """
+    try:
+        with open(file_path, "r", encoding=primary_encoding) as f:
+            return f.read()
+    except UnicodeDecodeError:
+        with open(file_path, "r", encoding=fallback_encoding) as f:
+            return f.read()
 
 
 def get_file_crc(file_name: str) -> str:

!src-dist/release.py

@@ -27,7 +27,9 @@ def __get_release_commit_list() -> List[Dict[str, object]]:
     """
     commit_list: List[Dict[str, object]] = []
     # 执行 git log 命令，根据 'release:' 搜索包含版本信息的 commit
-    output: str = os.popen('git log --grep release: --pretty=format:"%h|%at|%s"').read()
+    output: str = utils.read_popen_output(
+        'git log --grep release: --pretty=format:"%h|%at|%s"'
+    )
     for commit in output.split("\n"):
         try:
             parts = commit.strip().split("|")
@@ -51,7 +53,7 @@ def __get_release_tag_list() -> List[Dict[str, str]]:
     返回字典列表，每个字典包括：版本号 version (str) 及完整标签名 name (str)
     """
     tag_list: List[Dict[str, str]] = []
-    tag_output: str = os.popen("git tag -l").read()
+    tag_output: str = utils.read_popen_output("git tag -l")
     for tag in tag_output.split("\n"):
         tag = tag.strip()
         try: