From 7348a87a20119ec0a76d111e2f867d80d93ac853 Mon Sep 17 00:00:00 2001
From: DLmaster <DLmaster_361@163.com>
Date: Mon, 30 Dec 2024 22:11:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=81=E7=A8=8B=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/python-app.yml | 28 ++++++++++++++--------------
 app/utils/package.py             | 12 +++++-------
 update_info.txt                  | 10 ----------
 3 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 update_info.txt

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index c5b0d5a..8b14e97 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -77,9 +77,9 @@ jobs:
       - name: Read version
         id: read_version
         run: |
-          $MAIN_VERSION=(Get-Content -Path "update_info.txt" -TotalCount 1).Trim()
+          $MAIN_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 1).Trim()
           "AUTO_MAA_version=$MAIN_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
-          $UPDATER_VERSION=(Get-Content -Path "update_info.txt" -TotalCount 2 | Select-Object -Index 1).Trim()
+          $UPDATER_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 2 | Select-Object -Index 1).Trim()
           "updater_version=$UPDATER_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
       - name: Create Zip
         id: create_zip
@@ -93,11 +93,11 @@ jobs:
           path: |
             AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
             Updater_${{ env.updater_version }}.zip
-      - name: Upload Update_Info Artifact
+      - name: Upload Version_Info Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: update_info
-          path: update_info.txt
+          name: version_info
+          path: version_info.txt
   publish_release:
     name: Publish release
     needs: build_AUTO_MAA
@@ -111,15 +111,15 @@ jobs:
           pattern: AUTO_MAA_*
           merge-multiple: true
           path: artifacts
-      - name: Download Update_Info
+      - name: Download Version_Info
         uses: actions/download-artifact@v4
         with:
-          name: update_info
+          name: version_info
           path: ./
       - name: Check if release exists
         id: check_if_release_exists
         run: |
-          release_id=$(gh release view $(sed 's/\r$//g' <(head -n 1 update_info.txt)) --json id --jq .id || true)
+          release_id=$(gh release view $(sed 's/\r$//g' <(head -n 1 version_info.txt)) --json id --jq .id || true)
           if [[ -z $release_id ]]; then
             echo "release_exists=false" >> $GITHUB_OUTPUT
           else
@@ -133,9 +133,9 @@ jobs:
         run: |
           set -xe
           shopt -s nullglob
-          NAME="$(sed 's/\r$//g' <(head -n 1 update_info.txt))"
-          TAGNAME="$(sed 's/\r$//g' <(head -n 1 update_info.txt))"
-          NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 update_info.txt))"
+          NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
+          TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
+          NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
           NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`"
           NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
           gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" artifacts/*
@@ -147,9 +147,9 @@ jobs:
         run: |
           set -xe
           shopt -s nullglob
-          NAME="$(sed 's/\r$//g' <(head -n 1 update_info.txt))"
-          TAGNAME="$(sed 's/\r$//g' <(head -n 1 update_info.txt))"
-          NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 update_info.txt))"
+          NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
+          TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
+          NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
           NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`"
           NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
           gh release delete "$TAGNAME" --yes
diff --git a/app/utils/package.py b/app/utils/package.py
index 060d047..cc8e593 100644
--- a/app/utils/package.py
+++ b/app/utils/package.py
@@ -52,9 +52,8 @@ if __name__ == "__main__":
         f" --product-version={version["main_version"]}"
         f" --file-description='AUTO_MAA Component'"
         f" --copyright='Copyright © 2024 DLmaster361'"
-        f" --assume-yes-for-downloads --show-progress"
-        f" --output-filename=AUTO_MAA --remove-output"
-        f" main.py",
+        f" --assume-yes-for-downloads --output-filename=AUTO_MAA"
+        f" --remove-output main.py",
         shell=True,
         capture_output=True,
         text=True,
@@ -87,9 +86,8 @@ if __name__ == "__main__":
         f" --product-version={version["updater_version"]}"
         f" --file-description='AUTO_MAA Component'"
         f" --copyright='Copyright © 2024 DLmaster361'"
-        f" --assume-yes-for-downloads --show-progress"
-        f" --output-filename=Updater --remove-output"
-        f" Updater.py",
+        f" --assume-yes-for-downloads --output-filename=Updater"
+        f" --remove-output Updater.py",
         shell=True,
         capture_output=True,
         text=True,
@@ -101,7 +99,7 @@ if __name__ == "__main__":
 
     os.remove(os.path.normpath("Updater.py"))
 
-    with open("update_info.txt", "w", encoding="utf-8") as f:
+    with open("version_info.txt", "w", encoding="utf-8") as f:
         print(
             f"{version_text(main_version_numb)}\n{version_text(updater_version_numb)}{version["announcement"]}",
             file=f,
diff --git a/update_info.txt b/update_info.txt
deleted file mode 100644
index a5556c9..0000000
--- a/update_info.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-v4.2.0
-v1.1.0
-## 新增功能
-- 提供完整打包代码
-## 修复BUG
-- 同步MAA`v5.11.1`的字段修改
-- 清除自动化中无效的整合流程
-## 程序优化
-- 调整项目结构，模块化各功能组件
-- 改用`nuitka`编译，压缩软件体积，提升运行速度