From 9c2b910dde89d01e0a5b23191d1fbfd718f0530b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn>
Date: Mon, 11 Aug 2025 13:55:47 +0800
Subject: [PATCH] Update assets.yml

---
 .github/workflows/assets.yml | 41 ++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
index 2c9a1f032..c90feaaf9 100644
--- a/.github/workflows/assets.yml
+++ b/.github/workflows/assets.yml
@@ -35,29 +35,34 @@ jobs:
           echo "Files copied to temp directory (before processing):"
           ls -la temp-b-repo/out/assets
           
-          # 生成Python脚本（逐行写入避免语法问题）
-          echo "import xml.etree.ElementTree as ET" > remove_xml_comments.py
+          # 安装lxml库（用于精确控制XML格式）
+          pip install lxml
+          
+          # 生成Python脚本（使用lxml删除注释并控制格式）
+          echo "from lxml import etree" > remove_xml_comments.py
           echo "import os" >> remove_xml_comments.py
           echo "" >> remove_xml_comments.py
           echo "def remove_comments_from_xml(file_path):" >> remove_xml_comments.py
           echo "    try:" >> remove_xml_comments.py
-          echo "        # 解析XML并保留注释" >> remove_xml_comments.py
-          echo "        parser = ET.XMLParser(target=ET.TreeBuilder(insert_comments=True))" >> remove_xml_comments.py
-          echo "        tree = ET.parse(file_path, parser=parser)" >> remove_xml_comments.py
+          echo "        # 解析XML并保留注释（禁用自动移除注释）" >> remove_xml_comments.py
+          echo "        parser = etree.XMLParser(remove_comments=False)" >> remove_xml_comments.py
+          echo "        tree = etree.parse(file_path, parser=parser)" >> remove_xml_comments.py
           echo "        root = tree.getroot()" >> remove_xml_comments.py
           echo "" >> remove_xml_comments.py
-          echo "        # 递归删除注释节点" >> remove_xml_comments.py
-          echo "        def remove_comments(element):" >> remove_xml_comments.py
-          echo "            for child in list(element):" >> remove_xml_comments.py
-          echo "                if child.tag is ET.Comment:" >> remove_xml_comments.py
-          echo "                    element.remove(child)" >> remove_xml_comments.py
-          echo "                else:" >> remove_xml_comments.py
-          echo "                    remove_comments(child)" >> remove_xml_comments.py
+          echo "        # 递归查找并删除所有注释节点" >> remove_xml_comments.py
+          echo "        for comment in root.xpath('//comment()'):" >> remove_xml_comments.py
+          echo "            parent = comment.getparent()" >> remove_xml_comments.py
+          echo "            if parent is not None:" >> remove_xml_comments.py
+          echo "                parent.remove(comment)" >> remove_xml_comments.py
           echo "" >> remove_xml_comments.py
-          echo "        remove_comments(root)" >> remove_xml_comments.py
-          echo "" >> remove_xml_comments.py
-          echo "        # 保存修改后的文件" >> remove_xml_comments.py
-          echo "        tree.write(file_path, encoding='utf-8', xml_declaration=True)" >> remove_xml_comments.py
+          echo "        # 保存修改后的文件，严格控制格式" >> remove_xml_comments.py
+          echo "        etree.ElementTree(root).write(" >> remove_xml_comments.py
+          echo "            file_path," >> remove_xml_comments.py
+          echo "            encoding='utf-8'," >> remove_xml_comments.py
+          echo "            xml_declaration=True," >> remove_xml_comments.py
+          echo "            pretty_print=False,  # 禁用自动格式化（避免额外空格）" >> remove_xml_comments.py
+          echo "            method='xml'  # 确保自闭合标签格式为 <tag/> 而非 <tag />" >> remove_xml_comments.py
+          echo "        )" >> remove_xml_comments.py
           echo "        print(f'Processed: {file_path}')" >> remove_xml_comments.py
           echo "    except Exception as e:" >> remove_xml_comments.py
           echo "        print(f'Error processing {file_path}: {e}')" >> remove_xml_comments.py
@@ -69,7 +74,7 @@ jobs:
           echo "            file_path = os.path.join(root_dir, file)" >> remove_xml_comments.py
           echo "            remove_comments_from_xml(file_path)" >> remove_xml_comments.py
           
-          # 运行Python脚本
+          # 运行Python脚本处理XML
           python remove_xml_comments.py
           
           echo "Files in temp directory after comment removal:"
@@ -78,7 +83,7 @@ jobs:
       - name: Push to Private B Repo
         env:
           B_REPO_TOKEN: ${{ secrets.B_REPO_TOKEN }}
-          B_REPO_URL: https://github.com/TO-teams/flash.git  # 已修正为github.com
+          B_REPO_URL: https://github.com/TO-teams/flash.git
           B_BRANCH: main
         run: |
           git config --global user.name "GitHub Actions"