From 3ce1cd520f853dd9db444aa45a7fe6c18413de3a Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:30:50 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BD=BF=E7=94=A8=E6=B5=B7=E5=A4=96?=
=?UTF-8?q?=E6=BA=90=E6=97=B6=E4=B9=9F=E9=80=9A=E8=BF=87=20mirrorc=20?=
=?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=98=AF=E5=90=A6=E4=B8=BA=E6=9C=80=E6=96=B0?=
=?UTF-8?q?=E8=B5=84=E6=BA=90=EF=BC=8C=E4=BD=86=E5=A6=82=E6=9E=9C=E4=B8=BA?=
=?UTF-8?q?=E5=85=B6=E4=BB=96=E8=BF=94=E5=9B=9E=E5=80=BC=E6=97=B6=E4=BB=8D?=
=?UTF-8?q?=E7=84=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/MaaWpfGui/Models/ResourceUpdater.cs | 13 +++++++++++--
.../VersionUpdateSettingsUserControlModel.cs | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/MaaWpfGui/Models/ResourceUpdater.cs b/src/MaaWpfGui/Models/ResourceUpdater.cs
index 811f71551c..b4da994d4e 100644
--- a/src/MaaWpfGui/Models/ResourceUpdater.cs
+++ b/src/MaaWpfGui/Models/ResourceUpdater.cs
@@ -482,7 +482,16 @@ namespace MaaWpfGui.Models
return true;
}
- // 从 MirrorChyan 下载完整包
+ ///
+ /// 从 MirrorChyan 检查更新
+ ///
+ /// 返回一个 枚举值,指示更新检查的结果。
+ ///
+ /// - :已是最新版本。
+ /// - :有新版本。
+ /// - :网络错误。
+ /// - :其他错误。
+ ///
public static async Task<(CheckUpdateRetT Ret, string? UpdateUrl)> CheckFromMirrorChyanAsync()
{
// https://mirrorc.top/api/resources/MaaResource/latest?current_version=<当前版本日期,从 version.json 里拿时间戳>&cdk=&sp_id=<唯一识别码>
@@ -642,7 +651,7 @@ namespace MaaWpfGui.Models
/// 返回一个 枚举值,指示更新检查和下载的结果。
///
/// - :已是最新版本。
- /// - :检查成功。(海外源不会自动下载)
+ /// - :有新版本。(海外源不会自动下载)
/// - :下载成功。
/// - :网络错误。
/// - :其他错误。
diff --git a/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
index c1c36b641b..24f0f5b697 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
@@ -413,7 +413,7 @@ public class VersionUpdateSettingsUserControlModel : PropertyChangedBase
ToastNotification.ShowDirect(toastMessage);
}
- if (ret != VersionUpdateViewModel.CheckUpdateRetT.OK)
+ if (ret == VersionUpdateViewModel.CheckUpdateRetT.AlreadyLatest)
{
SettingsViewModel.VersionUpdateSettings.IsCheckingForUpdates = false;
return;
@@ -422,7 +422,7 @@ public class VersionUpdateSettingsUserControlModel : PropertyChangedBase
bool success = UpdateSource switch
{
"Github" => await ResourceUpdater.UpdateFromGithubAsync(),
- "MirrorChyan" => await ResourceUpdater.DownloadFromMirrorChyanAsync(uri),
+ "MirrorChyan" => (ret == VersionUpdateViewModel.CheckUpdateRetT.OK) && await ResourceUpdater.DownloadFromMirrorChyanAsync(uri),
_ => await ResourceUpdater.UpdateFromGithubAsync(),
};