From e2e73a8937fd720fe973d697e146c87b1d7d9232 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Tue, 29 Oct 2024 17:19:37 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B5=84=E6=BA=90=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=B6=E5=BC=B9=E5=87=BA=E5=90=90=E5=8F=B8?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Models/ResourceUpdater.cs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/MaaWpfGui/Models/ResourceUpdater.cs b/src/MaaWpfGui/Models/ResourceUpdater.cs
index 9f188bae67..3b3bec41b8 100644
--- a/src/MaaWpfGui/Models/ResourceUpdater.cs
+++ b/src/MaaWpfGui/Models/ResourceUpdater.cs
@@ -93,11 +93,7 @@ namespace MaaWpfGui.Models
             };
             if (!string.IsNullOrEmpty(toastMessage))
             {
-                _ = Execute.OnUIThreadAsync(() =>
-                {
-                    using var toast = new ToastNotification(toastMessage);
-                    toast.Show();
-                });
+                ToastNotification.ShowDirect(toastMessage);
             }
         }
 
@@ -173,11 +169,7 @@ namespace MaaWpfGui.Models
 
             _versionUrl = url;
             _versionEtag = response.Headers.ETag?.Tag ?? string.Empty;
-            _ = Execute.OnUIThreadAsync(() =>
-            {
-                using var toast = new ToastNotification(LocalizationHelper.GetString("GameResourceUpdating"));
-                toast.Show();
-            });
+            ToastNotification.ShowDirect(LocalizationHelper.GetString("GameResourceUpdating"));
 
             return true;
         }
@@ -429,7 +421,14 @@ namespace MaaWpfGui.Models
         // 额外加一个从 github 下载完整包的方法，老的版本先留着，看看之后增量还能不能整了
         public static async Task<bool> UpdateFromGithubAsync()
         {
-            await DownloadFullPackageAsync("https://github.com/MaaAssistantArknights/MaaResource/archive/refs/heads/main.zip", "MaaResource.zip").ConfigureAwait(false);
+            ToastNotification.ShowDirect(LocalizationHelper.GetString("GameResourceUpdating"));
+            bool download = await DownloadFullPackageAsync("https://github.com/MaaAssistantArknights/MaaResource/archive/refs/heads/main.zip", "MaaResource.zip").ConfigureAwait(false);
+            if (!download)
+            {
+                ToastNotification.ShowDirect(LocalizationHelper.GetString("GameResourceFailed"));
+                return false;
+            }
+
             // 解压到 MaaResource 文件夹
             try
             {
@@ -443,6 +442,7 @@ namespace MaaWpfGui.Models
             catch (Exception e)
             {
                 _logger.Error("Failed to extract MaaResource.zip: " + e.Message);
+                ToastNotification.ShowDirect(LocalizationHelper.GetString("GameResourceFailed"));
                 return false;
             }
 
@@ -450,7 +450,7 @@ namespace MaaWpfGui.Models
             try
             {
                 string sourcePath = Path.Combine("MaaResource", "MaaResource-main");
-                string[] foldersToCopy = { "cache", "resource" };
+                string[] foldersToCopy = ["cache", "resource"];
 
                 foreach (var folder in foldersToCopy)
                 {
@@ -463,6 +463,7 @@ namespace MaaWpfGui.Models
             catch (Exception e)
             {
                 _logger.Error("Failed to copy folders: " + e.Message);
+                ToastNotification.ShowDirect(LocalizationHelper.GetString("GameResourceFailed"));
                 return false;
             }