fix: 修复更新包解压位置错误

Author: Shasnow

SRAFrontend/App.axaml.cs

@@ -79,7 +79,8 @@ private static void ConfigureServices(IServiceCollection services)
             var announcementService = provider.GetRequiredService<AnnouncementService>();
             var settingsService = provider.GetRequiredService<SettingsService>();
             var updateService = provider.GetRequiredService<UpdateService>();
-            return new MainWindowViewModel(pages, toastManager, announcementService, settingsService, updateService);
+            var logger = provider.GetRequiredService<ILogger<MainWindowViewModel>>();
+            return new MainWindowViewModel(pages, toastManager, announcementService, settingsService, updateService, logger);
         });
         services.AddTransient<HomePageViewModel>();
         services.AddTransient<TaskPageViewModel>();

SRAFrontend/Services/UpdateService.cs

@@ -63,6 +63,17 @@ public string GetErrorMessage(int code)
         return await response.Content.ReadFromJsonAsync<VersionResponse>();
     }
 
+    /// <summary>
+    /// 异步下载更新包
+    /// </summary>
+    /// <param name="versionResponse">版本响应模型</param>
+    /// <param name="downloadChannel">下载渠道</param>
+    /// <param name="statusProgress">下载状态回调</param>
+    /// <param name="proxies">代理列表</param>
+    /// <param name="cancellationToken">取消下载Token</param>
+    /// <returns>更新文件的路径</returns>
+    /// <exception cref="InvalidOperationException">下载地址无效或下载失败</exception>
+    /// <exception cref="Exception"></exception>
     public async Task<string> DownloadUpdateAsync(
         VersionResponse versionResponse,
         int downloadChannel,

SRAFrontend/ViewModels/MainWindowViewModel.cs

@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Markdown.Avalonia;
+using Microsoft.Extensions.Logging;
 using SRAFrontend.Controls;
-using SRAFrontend.Localization;
 using SRAFrontend.Models;
 using SRAFrontend.Services;
 using SRAFrontend.utilities;
@@ -25,27 +24,27 @@ public partial class MainWindowViewModel : ViewModelBase
     private readonly AnnouncementService _announcementService;
     private readonly SettingsService _settingsService;
     private readonly UpdateService _updateService;
+    private readonly ILogger _logger;
 
     [ObservableProperty] private string _lightModeText =
         SukiTheme.GetInstance().ActiveBaseTheme.ToString() == "Light" ? "\uE472" : "\uE330";
 
     [ObservableProperty] private bool _titleBarVisible = true;
 
     public MainWindowViewModel(IEnumerable<PageViewModel> pages, ISukiToastManager toastManager,
-        AnnouncementService announcementService, SettingsService settingsService, UpdateService updateService)
+        AnnouncementService announcementService, SettingsService settingsService, UpdateService updateService, ILogger<MainWindowViewModel> logger)
     {
         _announcementService = announcementService;
         Pages = new AvaloniaList<PageViewModel>(pages);
         ToastManager = toastManager;
         _settingsService = settingsService;
         _updateService = updateService;
+        _logger = logger;
         _ = CheckForUpdates();
     }
 
     public ISukiToastManager ToastManager { get; init; }
 
-    public string Greeting { get; } = Resources.GreetingText;
-
     public IAvaloniaReadOnlyList<PageViewModel> Pages { get; }
 
     public void SwitchLightMode()
@@ -154,18 +153,25 @@ private async Task DownloadUpdateAsync(VersionResponse versionResponse)
         }
         catch (Exception e)
         {
-            Console.WriteLine(e);
+            _logger.LogError(e, "Error downloading update");
+            ToastManager.Dismiss(toast);
+            ToastManager.CreateToast()
+                .WithTitle("Update Failed")
+                .WithContent($"Failed to download update: {e.Message}")
+                .Dismiss().After(TimeSpan.FromSeconds(5))
+                .Dismiss().ByClicking()
+                .Queue();
             return;
         }
 
         ToastManager.Dismiss(toast);
         ToastManager.CreateToast()
             .WithTitle("Download Complete")
-            .WithContent("Update package will be unzip within 3 seconds.")
+            .WithContent($"Update package will be unzip to {Environment.CurrentDirectory} within 3 seconds.")
             .Dismiss().After(TimeSpan.FromSeconds(3))
             .Dismiss().ByClicking()
             .Queue();
         await Task.Delay(3000);
-        UnzipUtil.Unzip(result, Path.GetDirectoryName(Environment.CurrentDirectory)!);
+        UnzipUtil.Unzip(result, Environment.CurrentDirectory);
     }
 }