From cd37d81d21acefbf65e4e7de2a3030fae35dd01c Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Wed, 24 Jul 2024 16:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test.yml                           |  6 ++++--
 .../main/java/io/legado/app/help/AppUpdateGitHub.kt  | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bc575ab41..e9ff51911 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -148,6 +148,10 @@ jobs:
           if-no-files-found: ignore
           path: ${{ github.workspace }}/mapping/mapping.txt
 
+      - name: Delete Pre-Release
+        if: env.type == 'release'
+        run: gh release delete beta -y --cleanup-tag
+
       - name: Publish Pre-Release
         if: env.type == 'release'
         uses: ncipollo/release-action@v1
@@ -156,8 +160,6 @@ jobs:
           tag: "beta"
           body: "此版本为测试版，可能存在不稳定情况，升级前请务必备份好数据。"
           prerelease: true
-          removeArtifacts: true
-          allowUpdates: true
           artifacts: ${{ github.workspace }}/app/build/outputs/apk/*/*/*.apk
 
   lanzou:
diff --git a/app/src/main/java/io/legado/app/help/AppUpdateGitHub.kt b/app/src/main/java/io/legado/app/help/AppUpdateGitHub.kt
index 42a80f404..8ff20d168 100644
--- a/app/src/main/java/io/legado/app/help/AppUpdateGitHub.kt
+++ b/app/src/main/java/io/legado/app/help/AppUpdateGitHub.kt
@@ -58,14 +58,14 @@ object AppUpdateGitHub : AppUpdate.AppUpdateInterface {
             }
             val rootDoc = jsonPath.parse(body)
             val path = "\$.assets[?(@.name =~ /legado_${appCtx.channel}_.*?apk\$/)]"
-            val assetsMap = rootDoc.read<List<Any>>(path)
-                .firstOrNull()
+            val name = rootDoc.readString("$.name")
                 ?: throw NoStackTraceException("获取新版本出错")
-            val assets = jsonPath.parse(assetsMap)
-            val name = assets.readString("$.name")
-                ?: throw NoStackTraceException("获取新版本出错")
-            val tagName = name.replace("legado_${appCtx.channel}_|\\.apk".toRegex(), "")
+            val tagName = name.replace("legado_${appCtx.channel}_", "")
             if (tagName > AppConst.appInfo.versionName) {
+                val assetsMap = rootDoc.read<List<Any>>(path)
+                    .firstOrNull()
+                    ?: throw NoStackTraceException("获取新版本出错")
+                val assets = jsonPath.parse(assetsMap)
                 val updateBody = rootDoc.readString("$.body")
                     ?: throw NoStackTraceException("获取新版本出错")
                 val downloadUrl = assets.readString("$.browser_download_url")