CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:自动更新

Browse Source
This commit is contained in:
CJKmkp
2026-05-01 19:11:59 +08:00
parent 8c37b91b5b
commit 8383002b5c
2 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Helpers/AutoUpdateHelper.cs
+32 -2
View File
@@ -1050,8 +1050,19 @@ namespace Ink_Canvas.Helpers
} }
// 依次尝试每个线路组 // 依次尝试每个线路组
CancellationToken groupLoopToken;
lock (_activeDownloadLock)
{
groupLoopToken = _activeDownloadCts?.Token ?? CancellationToken.None;
}
foreach (var group in groups) foreach (var group in groups)
{ {
if (groupLoopToken.IsCancellationRequested)
{
LogHelper.WriteLogToFile("AutoUpdate | 用户已取消，停止尝试后续线路组");
break;
}
string url = string.Format(group.DownloadUrlFormat, version); string url = string.Format(group.DownloadUrlFormat, version);
url = AppendX64SuffixBeforeZipExtension(url); url = AppendX64SuffixBeforeZipExtension(url);
// 智教联盟需要先获取真实下载地址 // 智教联盟需要先获取真实下载地址
@@ -1077,6 +1088,12 @@ namespace Ink_Canvas.Helpers
bool downloadSuccess = await DownloadFile(url, zipFilePath, progressCallback); bool downloadSuccess = await DownloadFile(url, zipFilePath, progressCallback);
if (groupLoopToken.IsCancellationRequested)
{
LogHelper.WriteLogToFile("AutoUpdate | 用户已取消，停止尝试后续线路组");
break;
}
if (downloadSuccess) if (downloadSuccess)
{ {
SaveDownloadStatus(true); SaveDownloadStatus(true);
@@ -1294,8 +1311,20 @@ namespace Ink_Canvas.Helpers
success = true; success = true;
LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载成功"); LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载成功");
} }
catch (Exception ex) when (ex is HttpRequestException || ex is IOException || ex is TaskCanceledException) catch (Exception ex) when (ex is HttpRequestException || ex is IOException || ex is TaskCanceledException || ex is OperationCanceledException)
{ {
// 用户主动取消：不再重试
if (externalToken.IsCancellationRequested)
{
LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载已被用户取消", LogHelper.LogType.Warning);
if (File.Exists(tempPath))
{
try { File.Delete(tempPath); } catch { }
}
cts.Cancel();
return;
}
LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载失败，第{retry + 1}次: {ex.Message}", LogHelper.LogType.Warning); LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载失败，第{retry + 1}次: {ex.Message}", LogHelper.LogType.Warning);
progressCallback?.Invoke(0, $"分块{block.Index}下载失败，第{retry + 1}次: {ex.Message}"); progressCallback?.Invoke(0, $"分块{block.Index}下载失败，第{retry + 1}次: {ex.Message}");
@@ -1306,7 +1335,8 @@ namespace Ink_Canvas.Helpers
} }
// 增加重试间隔，避免频繁重试 // 增加重试间隔，避免频繁重试
await Task.Delay(2000 * (retry + 1)); try { await Task.Delay(2000 * (retry + 1), externalToken); }
catch (OperationCanceledException) { cts.Cancel(); return; }
} }
} }
if (success) if (success)
Ink Canvas/Windows/SettingsViews/Pages/UpdatePage.xaml.cs
+21 -11
View File
@@ -467,26 +467,36 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
{ {
ChangelogViewer.Markdown = "正在加载更新日志..."; ChangelogViewer.Markdown = "正在加载更新日志...";
// 优先尝试从 GitHub API 获取最新 Release 的 body // 优先尝试从 GitHub API 获取最新 Release 的 body（带超时，失败则回退到镜像）
try try
{ {
var releases = await AutoUpdateHelper.GetAllGithubReleases(SettingsManager.Settings.Startup.UpdateChannel); var apiTask = AutoUpdateHelper.GetAllGithubReleases(SettingsManager.Settings.Startup.UpdateChannel);
var latest = releases? var completed = await System.Threading.Tasks.Task.WhenAny(apiTask, System.Threading.Tasks.Task.Delay(TimeSpan.FromSeconds(8)));
.OrderByDescending(r => ParseVersionForSort(r.version)) if (completed == apiTask)
.Select(r => (Tuple<string, string, string>)Tuple.Create(r.version, r.downloadUrl, r.releaseNotes))
.FirstOrDefault();
if (latest != null && !string.IsNullOrWhiteSpace(latest.Item3))
{ {
ChangelogViewer.Markdown = latest.Item3; var releases = await apiTask;
return; var latest = releases?
.OrderByDescending(r => ParseVersionForSort(r.version))
.Select(r => (Tuple<string, string, string>)Tuple.Create(r.version, r.downloadUrl, r.releaseNotes))
.FirstOrDefault();
if (latest != null && !string.IsNullOrWhiteSpace(latest.Item3))
{
ChangelogViewer.Markdown = latest.Item3;
return;
}
LogHelper.WriteLogToFile("UpdatePage | GitHub API 未返回可用的更新日志，回退到镜像", LogHelper.LogType.Warning);
}
else
{
LogHelper.WriteLogToFile("UpdatePage | GitHub API 获取更新日志超时，回退到镜像", LogHelper.LogType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.WriteLogToFile($"UpdatePage | GitHub API 获取更新日志失败，回退到镜像源: {ex.Message}", LogHelper.LogType.Warning); LogHelper.WriteLogToFile($"UpdatePage | GitHub API 获取更新日志失败，回退到镜像: {ex.Message}", LogHelper.LogType.Warning);
} }
// 回退到镜像源 // 回退到镜像源 UpdateLog.md
string md = await AutoUpdateHelper.GetUpdateLog(SettingsManager.Settings.Startup.UpdateChannel); string md = await AutoUpdateHelper.GetUpdateLog(SettingsManager.Settings.Startup.UpdateChannel);
ChangelogViewer.Markdown = string.IsNullOrEmpty(md) ? "暂无更新日志。" : md; ChangelogViewer.Markdown = string.IsNullOrEmpty(md) ? "暂无更新日志。" : md;
} }