impl #1355

src/Snap.Hutao/Snap.Hutao/Control/Extension/FrameworkElementExtension.cs

@@ -28,21 +28,4 @@ internal static class FrameworkElementExtension
         frameworkElement.IsRightTapEnabled = false;
         frameworkElement.IsTabStop = false;
     }
-
-    public static void InitializeDataContext<TDataContext>(this FrameworkElement frameworkElement, IServiceProvider? serviceProvider = default)
-        where TDataContext : class
-    {
-        IServiceProvider service = serviceProvider ?? Ioc.Default;
-        try
-        {
-            frameworkElement.DataContext = service.GetRequiredService<TDataContext>();
-        }
-        catch (Exception ex)
-        {
-
-            ILogger? logger = service.GetRequiredService(typeof(ILogger<>).MakeGenericType([frameworkElement.GetType()])) as ILogger;
-            logger?.LogError(ex, "Failed to initialize DataContext");
-            throw;
-        }
-    }
 }

src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs

@@ -35,7 +35,7 @@ internal sealed class CachedImage : Implementation.ImageEx
 
         try
         {
-            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
+            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
             string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
             token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
             return new BitmapImage(file.ToUri()); // BitmapImage initialize with a uri will increase image quality and loading speed.

src/Snap.Hutao/Snap.Hutao/Control/Panel/HorizontalEqualPanel.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using System.Runtime.InteropServices;
 using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;
@@ -19,14 +18,13 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size MeasureOverride(Size availableSize)
     {
-        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
-        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
+        foreach (UIElement child in Children)
         {
             // ScrollViewer will always return an Infinity Size, we should use ActualWidth for this situation.
             double availableWidth = double.IsInfinity(availableSize.Width) ? ActualWidth : availableSize.Width;
-            double childAvailableWidth = (availableWidth + Spacing) / visibleChildren.Count;
+            double childAvailableWidth = (availableWidth + Spacing) / Children.Count;
             double childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
-            visibleChild.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
+            child.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
         }
 
         return base.MeasureOverride(availableSize);
@@ -34,14 +32,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
-        double availableItemWidth = (finalSize.Width - (Spacing * (visibleChildren.Count - 1))) / visibleChildren.Count;
+        int itemCount = Children.Count;
+        double availableItemWidth = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
         double actualItemWidth = Math.Max(MinItemWidth, availableItemWidth);
 
         double offset = 0;
-        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
+        foreach (UIElement child in Children)
         {
-            visibleChild.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
+            child.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
             offset += actualItemWidth + Spacing;
         }
 
@@ -51,8 +49,7 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
     private static void OnLoaded(object sender, RoutedEventArgs e)
     {
         HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
-        int vivibleChildrenCount = panel.Children.Count(child => child.Visibility is Visibility.Visible);
-        panel.MinWidth = (panel.MinItemWidth * vivibleChildrenCount) + (panel.Spacing * (vivibleChildrenCount - 1));
+        panel.MinWidth = (panel.MinItemWidth * panel.Children.Count) + (panel.Spacing * (panel.Children.Count - 1));
     }
 
     private static void OnSizeChanged(object sender, SizeChangedEventArgs e)

src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs

@@ -15,7 +15,7 @@ internal class ScopedPage : Page
 {
     private readonly RoutedEventHandler unloadEventHandler;
     private readonly CancellationTokenSource viewCancellationTokenSource = new();
-    private readonly IServiceScope pageScope;
+    private readonly IServiceScope currentScope;
 
     private bool inFrame = true;
 
@@ -23,7 +23,7 @@ internal class ScopedPage : Page
     {
         unloadEventHandler = OnUnloaded;
         Unloaded += unloadEventHandler;
-        pageScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
+        currentScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
     }
 
     public async ValueTask NotifyRecipientAsync(INavigationData extra)
@@ -44,17 +44,9 @@ internal class ScopedPage : Page
     protected void InitializeWith<TViewModel>()
         where TViewModel : class, IViewModel
     {
-        try
-        {
-            IViewModel viewModel = pageScope.ServiceProvider.GetRequiredService<TViewModel>();
-            viewModel.CancellationToken = viewCancellationTokenSource.Token;
-            DataContext = viewModel;
-        }
-        catch (Exception ex)
-        {
-            pageScope.ServiceProvider.GetRequiredService<ILogger<ScopedPage>>().LogError(ex, "Failed to initialize view model.");
-            throw;
-        }
+        IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
+        viewModel.CancellationToken = viewCancellationTokenSource.Token;
+        DataContext = viewModel;
     }
 
     /// <inheritdoc/>
@@ -103,7 +95,7 @@ internal class ScopedPage : Page
                 viewModel.IsViewDisposed = true;
 
                 // Dispose the scope
-                pageScope.Dispose();
+                currentScope.Dispose();
             }
         }
     }

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocConfiguration.cs

@@ -33,17 +33,17 @@ internal static class IocConfiguration
         return services
             .AddTransient(typeof(Database.ScopedDbCurrent<,>))
             .AddTransient(typeof(Database.ScopedDbCurrent<,,>))
-            .AddDbContextPool<AppDbContext>(AddDbContextCore);
+            .AddDbContext<AppDbContext>(AddDbContextCore);
     }
 
-    private static void AddDbContextCore(IServiceProvider serviceProvider, DbContextOptionsBuilder builder)
+    private static void AddDbContextCore(IServiceProvider provider, DbContextOptionsBuilder builder)
     {
-        RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
+        RuntimeOptions runtimeOptions = provider.GetRequiredService<RuntimeOptions>();
         string dbFile = System.IO.Path.Combine(runtimeOptions.DataFolder, "Userdata.db");
         string sqlConnectionString = $"Data Source={dbFile}";
 
         // Temporarily create a context
-        using (AppDbContext context = AppDbContext.Create(serviceProvider, sqlConnectionString))
+        using (AppDbContext context = AppDbContext.Create(sqlConnectionString))
         {
             if (context.Database.GetPendingMigrations().Any())
             {

src/Snap.Hutao/Snap.Hutao/Core/Diagnostics/MeasureExecutionToken.cs

@@ -1,7 +1,5 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
-using Snap.Hutao.Core.Logging;
-
 namespace Snap.Hutao.Core.Diagnostics;
 
 internal readonly struct MeasureExecutionToken : IDisposable
@@ -19,6 +17,6 @@ internal readonly struct MeasureExecutionToken : IDisposable
 
     public void Dispose()
     {
-        logger.LogColorizedDebug(("{Caller} toke {Time} ms", ConsoleColor.Gray), (callerName, ConsoleColor.Yellow), (stopwatch.GetElapsedTime().TotalMilliseconds, ConsoleColor.DarkGreen));
+        logger.LogDebug("{Caller} toke {Time} ms", callerName, stopwatch.GetElapsedTime().TotalMilliseconds);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoException.cs

@@ -5,43 +5,52 @@ namespace Snap.Hutao.Core.ExceptionService;
 
 internal sealed class HutaoException : Exception
 {
-    public HutaoException(string message, Exception? innerException)
+    public HutaoException(HutaoExceptionKind kind, string message, Exception? innerException)
+        : this(message, innerException)
+    {
+        Kind = kind;
+    }
+
+    private HutaoException(string message, Exception? innerException)
         : base($"{message}\n{innerException?.Message}", innerException)
     {
     }
 
+    public HutaoExceptionKind Kind { get; private set; }
+
     [DoesNotReturn]
-    public static HutaoException Throw(string message, Exception? innerException = default)
+    public static HutaoException Throw(HutaoExceptionKind kind, string message, Exception? innerException = default)
     {
-        throw new HutaoException(message, innerException);
+        throw new HutaoException(kind, message, innerException);
     }
 
-    public static void ThrowIf(bool condition, string message, Exception? innerException = default)
+    public static void ThrowIf(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
     {
         if (condition)
         {
-            throw new HutaoException(message, innerException);
+            throw new HutaoException(kind, message, innerException);
         }
     }
 
-    public static void ThrowIfNot(bool condition, string message, Exception? innerException = default)
+    public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
     {
         if (!condition)
         {
-            throw new HutaoException(message, innerException);
+            throw new HutaoException(kind, message, innerException);
         }
     }
 
     [DoesNotReturn]
     public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
     {
-        throw new HutaoException(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id), innerException);
+        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
+        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
     }
 
     [DoesNotReturn]
     public static HutaoException UserdataCorrupted(string message, Exception? innerException = default)
     {
-        throw new HutaoException(message, innerException);
+        throw new HutaoException(HutaoExceptionKind.UserdataCorrupted, message, innerException);
     }
 
     [DoesNotReturn]
@@ -51,12 +60,6 @@ internal sealed class HutaoException : Exception
         throw new InvalidCastException(message, innerException);
     }
 
-    [DoesNotReturn]
-    public static NotSupportedException NotSupported(string? message = default, Exception? innerException = default)
-    {
-        throw new NotSupportedException(message, innerException);
-    }
-
     [DoesNotReturn]
     public static OperationCanceledException OperationCanceled(string message, Exception? innerException = default)
     {

src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs

@@ -1,13 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Win32.Foundation;
-using Snap.Hutao.Win32.System.Com;
-using Snap.Hutao.Win32.UI.Shell;
 using System.IO;
-using static Snap.Hutao.Win32.Macros;
-using static Snap.Hutao.Win32.Ole32;
-using static Snap.Hutao.Win32.Shell32;
 
 namespace Snap.Hutao.Core.IO;
 
@@ -45,57 +39,4 @@ internal static class FileOperation
         File.Move(sourceFileName, destFileName, false);
         return true;
     }
-
-    public static unsafe bool UnsafeMove(string sourceFileName, string destFileName)
-    {
-        bool result = false;
-
-        if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
-        {
-            if (SUCCEEDED(SHCreateItemFromParsingName(sourceFileName, default, in IShellItem.IID, out IShellItem* pSourceShellItem)))
-            {
-                if (SUCCEEDED(SHCreateItemFromParsingName(destFileName, default, in IShellItem.IID, out IShellItem* pDestShellItem)))
-                {
-                    pFileOperation->MoveItem(pSourceShellItem, pDestShellItem, default, default);
-
-                    if (SUCCEEDED(pFileOperation->PerformOperations()))
-                    {
-                        result = true;
-                    }
-
-                    pDestShellItem->Release();
-                }
-
-                pSourceShellItem->Release();
-            }
-
-            pFileOperation->Release();
-        }
-
-        return result;
-    }
-
-    public static unsafe bool UnsafeDelete(string path)
-    {
-        bool result = false;
-
-        if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
-        {
-            if (SUCCEEDED(SHCreateItemFromParsingName(path, default, in IShellItem.IID, out IShellItem* pShellItem)))
-            {
-                pFileOperation->DeleteItem(pShellItem, default);
-
-                if (SUCCEEDED(pFileOperation->PerformOperations()))
-                {
-                    result = true;
-                }
-
-                pShellItem->Release();
-            }
-
-            pFileOperation->Release();
-        }
-
-        return result;
-    }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/Hash.cs

@@ -10,7 +10,7 @@ internal static class Hash
 {
     public static string SHA1HexString(string input)
     {
-        return HashCore(System.Convert.ToHexString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
+        return HashCore(BitConverter.ToString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
     }
 
     private static TResult HashCore<TInput, TResult>(Func<byte[], TResult> resultConverter, Func<byte[], byte[]> hashMethod, Func<TInput, byte[]> bytesConverter, TInput input)

src/Snap.Hutao/Snap.Hutao/Core/IO/StreamReaderWriter.cs

@@ -1,40 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using System.IO;
-
-namespace Snap.Hutao.Core.IO;
-
-internal sealed class StreamReaderWriter : IDisposable
-{
-    private readonly StreamReader reader;
-    private readonly StreamWriter writer;
-
-    public StreamReaderWriter(StreamReader reader, StreamWriter writer)
-    {
-        this.reader = reader;
-        this.writer = writer;
-    }
-
-    public StreamReader Reader { get => reader; }
-
-    public StreamWriter Writer { get => writer; }
-
-    /// <inheritdoc cref="StreamReader.ReadLineAsync(CancellationToken)"/>
-    public ValueTask<string?> ReadLineAsync(CancellationToken token)
-    {
-        return reader.ReadLineAsync(token);
-    }
-
-    /// <inheritdoc cref="StreamWriter.WriteAsync(string?)"/>
-    public Task WriteAsync(string value)
-    {
-        return writer.WriteAsync(value);
-    }
-
-    public void Dispose()
-    {
-        writer.Dispose();
-        reader.Dispose();
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/IO/TempFile.cs

@@ -29,7 +29,7 @@ internal readonly struct TempFile : IDisposable
         }
         catch (UnauthorizedAccessException ex)
         {
-            HutaoException.Throw(SH.CoreIOTempFileCreateFail, ex);
+            HutaoException.Throw(HutaoExceptionKind.FileSystemCreateFileInsufficientPermissions, SH.CoreIOTempFileCreateFail, ex);
         }
 
         if (delete)

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PrivateNamedPipeServer.cs

@@ -49,7 +49,7 @@ internal sealed partial class PrivateNamedPipeServer : IDisposable
     {
         byte[] content = new byte[header->ContentLength];
         serverStream.ReadAtLeast(content, header->ContentLength, false);
-        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
+        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, HutaoExceptionKind.PrivateNamedPipeContentHashIncorrect, "PipePacket Content Hash incorrect");
         return content;
     }
 

src/Snap.Hutao/Snap.Hutao/Core/Logging/LogArgument.cs

@@ -21,11 +21,6 @@ internal readonly struct LogArgument
         return new(argument);
     }
 
-    public static implicit operator LogArgument(double argument)
-    {
-        return new(argument);
-    }
-
     public static implicit operator LogArgument((object? Argument, ConsoleColor Foreground) tuple)
     {
         return new(tuple.Argument, tuple.Foreground);

src/Snap.Hutao/Snap.Hutao/Core/Shell/ShellLinkInterop.cs

@@ -21,27 +21,22 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
     public async ValueTask<bool> TryCreateDesktopShoutcutForElevatedLaunchAsync()
     {
         string targetLogoPath = Path.Combine(runtimeOptions.DataFolder, "ShellLinkLogo.ico");
-        string elevatedLauncherPath = Path.Combine(runtimeOptions.DataFolder, "Snap.Hutao.Elevated.Launcher.exe");
 
         try
         {
             Uri sourceLogoUri = "ms-appx:///Assets/Logo.ico".ToUri();
             StorageFile iconFile = await StorageFile.GetFileFromApplicationUriAsync(sourceLogoUri);
             await iconFile.OverwriteCopyAsync(targetLogoPath).ConfigureAwait(false);
-
-            Uri elevatedLauncherUri = "ms-appx:///Snap.Hutao.Elevated.Launcher.exe".ToUri();
-            StorageFile launcherFile = await StorageFile.GetFileFromApplicationUriAsync(elevatedLauncherUri);
-            await launcherFile.OverwriteCopyAsync(elevatedLauncherPath).ConfigureAwait(false);
         }
         catch
         {
             return false;
         }
 
-        return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath, elevatedLauncherPath);
+        return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath);
     }
 
-    private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath, string elevatedLauncherPath)
+    private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath)
     {
         bool result = false;
 
@@ -49,11 +44,17 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
         HRESULT hr = CoCreateInstance(in ShellLink.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IShellLinkW.IID, out IShellLinkW* pShellLink);
         if (SUCCEEDED(hr))
         {
-            pShellLink->SetPath(elevatedLauncherPath);
-            pShellLink->SetArguments(runtimeOptions.FamilyName);
+            pShellLink->SetPath($"shell:AppsFolder\\{runtimeOptions.FamilyName}!App");
             pShellLink->SetShowCmd(SHOW_WINDOW_CMD.SW_NORMAL);
             pShellLink->SetIconLocation(targetLogoPath, 0);
 
+            if (SUCCEEDED(pShellLink->QueryInterface(in IShellLinkDataList.IID, out IShellLinkDataList* pShellLinkDataList)))
+            {
+                pShellLinkDataList->GetFlags(out uint flags);
+                pShellLinkDataList->SetFlags(flags | (uint)SHELL_LINK_DATA_FLAGS.SLDF_RUNAS_USER);
+                pShellLinkDataList->Release();
+            }
+
             if (SUCCEEDED(pShellLink->QueryInterface(in IPersistFile.IID, out IPersistFile* pPersistFile)))
             {
                 string desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);

src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs

@@ -118,6 +118,14 @@ internal static partial class EnumerableExtension
         collection.RemoveAt(collection.Count - 1);
     }
 
+    /// <summary>
+    /// 转换到新类型的列表
+    /// </summary>
+    /// <typeparam name="TSource">原始类型</typeparam>
+    /// <typeparam name="TResult">新类型</typeparam>
+    /// <param name="list">列表</param>
+    /// <param name="selector">选择器</param>
+    /// <returns>新类型的列表</returns>
     [Pure]
     public static List<TResult> SelectList<TSource, TResult>(this List<TSource> list, Func<TSource, TResult> selector)
     {

src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Windowing;
 using Snap.Hutao.ViewModel.Game;
 using Snap.Hutao.Win32.UI.WindowsAndMessaging;
@@ -36,7 +35,7 @@ internal sealed partial class LaunchGameWindow : Window, IDisposable, IWindowOpt
         scope = serviceProvider.CreateScope();
         windowOptions = new(this, DragableGrid, new(MaxWidth, MaxHeight));
         this.InitializeController(serviceProvider);
-        RootGrid.InitializeDataContext<LaunchGameViewModel>(scope.ServiceProvider);
+        RootGrid.DataContext = scope.ServiceProvider.GetRequiredService<LaunchGameViewModel>();
     }
 
     /// <inheritdoc/>

src/Snap.Hutao/Snap.Hutao/Model/Entity/Abstraction/IAppDbEntity.cs

@@ -5,5 +5,5 @@ namespace Snap.Hutao.Model.Entity.Abstraction;
 
 internal interface IAppDbEntity
 {
-    Guid InnerId { get; }
+    Guid InnerId { get; set; }
 }

src/Snap.Hutao/Snap.Hutao/Model/Entity/Abstraction/IAppDbEntityHasArchive.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Model.Entity.Abstraction;
-
-internal interface IAppDbEntityHasArchive : IAppDbEntity
-{
-    Guid ArchiveId { get; }
-}

src/Snap.Hutao/Snap.Hutao/Model/Entity/Achievement.cs

@@ -16,7 +16,7 @@ namespace Snap.Hutao.Model.Entity;
 [HighQuality]
 [Table("achievements")]
 [SuppressMessage("", "SA1124")]
-internal sealed class Achievement : IAppDbEntityHasArchive,
+internal sealed class Achievement : IAppDbEntity,
     IEquatable<Achievement>,
     IDbMappingForeignKeyFrom<Achievement, AchievementId>,
     IDbMappingForeignKeyFrom<Achievement, UIAFItem>

src/Snap.Hutao/Snap.Hutao/Model/Entity/Database/AppDbContext.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Model.Entity.Configuration;
 using System.Diagnostics;
@@ -25,8 +24,18 @@ internal sealed class AppDbContext : DbContext
     public AppDbContext(DbContextOptions<AppDbContext> options)
         : base(options)
     {
-        logger = this.GetService<ILogger<AppDbContext>>();
-        logger?.LogColorizedInformation("{Name}[{Id}] {Action}", nameof(AppDbContext), (ContextId, ConsoleColor.DarkCyan), ("created", ConsoleColor.Green));
+    }
+
+    /// <summary>
+    /// 构造一个新的应用程序数据库上下文
+    /// </summary>
+    /// <param name="options">选项</param>
+    /// <param name="logger">日志器</param>
+    public AppDbContext(DbContextOptions<AppDbContext> options, ILogger<AppDbContext> logger)
+        : this(options)
+    {
+        this.logger = logger;
+        logger.LogColorizedInformation("{Name}[{Id}] {Action}", nameof(AppDbContext), (ContextId, ConsoleColor.DarkCyan), ("created", ConsoleColor.Green));
     }
 
     public DbSet<SettingEntry> Settings { get; set; } = default!;
@@ -65,14 +74,14 @@ internal sealed class AppDbContext : DbContext
 
     public DbSet<SpiralAbyssEntry> SpiralAbysses { get; set; } = default!;
 
-    public static AppDbContext Create(IServiceProvider serviceProvider, string sqlConnectionString)
+    /// <summary>
+    /// 构造一个临时的应用程序数据库上下文
+    /// </summary>
+    /// <param name="sqlConnectionString">连接字符串</param>
+    /// <returns>应用程序数据库上下文</returns>
+    public static AppDbContext Create(string sqlConnectionString)
     {
-        DbContextOptions<AppDbContext> options = new DbContextOptionsBuilder<AppDbContext>()
-            .UseApplicationServiceProvider(serviceProvider)
-            .UseSqlite(sqlConnectionString)
-            .Options;
-
-        return new(options);
+        return new(new DbContextOptionsBuilder<AppDbContext>().UseSqlite(sqlConnectionString).Options);
     }
 
     /// <inheritdoc/>

src/Snap.Hutao/Snap.Hutao/Model/Entity/Database/AppDbContextDesignTimeFactory.cs

@@ -18,7 +18,7 @@ internal sealed class AppDbContextDesignTimeFactory : IDesignTimeDbContextFactor
 #if DEBUG
         // TODO: replace with your own database file path.
         string userdataDbName = @"D:\Hutao\Userdata.db";
-        return AppDbContext.Create(default!, $"Data Source={userdataDbName}");
+        return AppDbContext.Create($"Data Source={userdataDbName}");
 #else
         throw Must.NeverHappen();
 #endif

src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs

@@ -16,13 +16,10 @@ internal sealed partial class SettingEntry
     public const string ElementTheme = "ElementTheme";
     public const string BackgroundImageType = "BackgroundImageType";
 
-    public const string IsAutoUploadGachaLogEnabled = "IsAutoUploadGachaLogEnabled";
-    public const string IsAutoUploadSpiralAbyssRecordEnabled = "IsAutoUploadSpiralAbyssRecordEnabled";
-
     public const string AnnouncementRegion = "AnnouncementRegion";
 
     public const string IsEmptyHistoryWishVisible = "IsEmptyHistoryWishVisible";
-    public const string IsUnobtainedWishItemVisible = "IsUnobtainedWishItemVisible";
+    public const string IsNeverHeldStatisticsItemVisible = "IsNeverHeldStatisticsItemVisible";
 
     public const string GeetestCustomCompositeUrl = "GeetestCustomCompositeUrl";
 

src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/QuestType.cs

@@ -1,16 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Model.Intrinsic;
-
-internal enum QuestType
-{
-    AQ,
-    FQ,
-    LQ,
-    EQ,
-    DQ,
-    IQ,
-    VQ,
-    WQ,
-}

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs

@@ -11,6 +11,11 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 [HighQuality]
 internal sealed class AvatarNameCardPicConverter : ValueConverter<Avatar.Avatar?, Uri>
 {
+    /// <summary>
+    /// 从角色转换到名片
+    /// </summary>
+    /// <param name="avatar">角色</param>
+    /// <returns>名片</returns>
     public static Uri AvatarToUri(Avatar.Avatar? avatar)
     {
         if (avatar is null)

src/Snap.Hutao/Snap.Hutao/Program.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using Snap.Hutao.Core;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using WinRT;

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx

@@ -2922,19 +2922,13 @@
     <value>Weapon WIKI</value>
   </data>
   <data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
-    <value>(?:〓Event Duration〓|〓Quest Start Time〓).*?Permanently.*?Version.*?(\d\.\d).*?update</value>
+    <value>(?:〓Event Duration〓|〓Quest Start Time〓).*?\d\.\dthe Version update(?:after|)Permanently available</value>
   </data>
   <data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
-    <value>〓Event Duration〓.*?Available throughout the entirety of Version (\d\.\d)</value>
+    <value>〓Event Duration〓.*?\d\.\d Available throughout the entirety of Version</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓Event Duration〓|Event Wish Duration|【Availability Duration】|〓Discount Period〓).*?After.*?(\d\.\d).*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
-    <value>Dear.*?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
-    <value>Version \d\.\d Update Maintenance Preview</value>
+    <value>(?:〓Event Duration〓|Event Wish Duration|【Availability Duration】|〓Discount Period〓).*?(\d\.\dAfter the Version update).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓Update Maintenance Duration〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx

@@ -2922,19 +2922,13 @@
     <value>Senjata WIKI</value>
   </data>
   <data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
-    <value>(?:〓Durasi Event〓|〓Waktu Mulai Misi〓).*?(\d\.\d)the Version update(?:after|)Selamanya Tersedia</value>
+    <value>(?:〓Durasi Event〓|〓Waktu Mulai Misi〓).*?\d\.\dthe Version update(?:after|)Selamanya Tersedia</value>
   </data>
   <data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
-    <value>〓Durasi Event〓.*?(\d\.\d) Tersedia selama versi ini</value>
+    <value>〓Durasi Event〓.*?\d\.\d Tersedia selama versi ini</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓Waktu Acara〓|Waktu Menginginkan|【Waktu Peluncuran】|〓Waktu Diskon〓).*?(\d\.\d) Setelah Pembaruan Versi.*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
-    <value>将于&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;进行版本更新维护</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
-    <value>\d\.\d版本更新维护预告</value>
+    <value>(?:〓Waktu Acara〓|Waktu Menginginkan|【Waktu Peluncuran】|〓Waktu Diskon〓).*?(\d\.\d Setelah Pembaruan Versi).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓Durasi Pemeliharaan Pembaruan.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx

@@ -2922,25 +2922,19 @@
     <value>武器一覧</value>
   </data>
   <data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
-    <value>(?:〓イベント期間〓|〓任務開(?:始|放)時間〓).*?(\d\.\d).*?開放</value>
+    <value>(?:〓イベント期間〓|〓任務開始時間〓).*?\d\.\dバージョンアップ(?:完了|)後常設オープン</value>
   </data>
   <data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
-    <value>〓イベント期間〓.*?(\d\.\d)バージョン</value>
+    <value>〓イベント期間〓.*?\d\.\d当バージョン期間オープン</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓イベント期間〓|祈願期間|【開始日時】).*?(\d\.\d)バージョンアップ.*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
-    <value>親愛.*?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
-    <value>Ver\.\d\.\dバージョンアップのお知らせ</value>
+    <value>(?:〓イベント期間〓|祈願期間|【開始日時】).*?(\d\.\dバージョンアップ完了後).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓メンテナンス時間〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTitle" xml:space="preserve">
-    <value>Ver\.\d\.\d.*?正式リリース</value>
+    <value>Ver.\d\.\d.+正式リリース</value>
   </data>
   <data name="WebAnnouncementTimeDaysBeginFormat" xml:space="preserve">
     <value>{0} 日後に開始</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx

@@ -2922,19 +2922,13 @@
     <value>무기 자료</value>
   </data>
   <data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
-    <value>(?:〓活动时间〓|〓任务开放时间〓).*?(\d\.\d)版本更新(?:完成|)后永久开放</value>
+    <value>(?:〓活动时间〓|〓任务开放时间〓).*?\d\.\d版本更新(?:完成|)后永久开放</value>
   </data>
   <data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
-    <value>〓活动时间〓.*?(\d\.\d)版本期间持续开放</value>
+    <value>〓活动时间〓.*?\d\.\d版本期间持续开放</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d)版本更新后.*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
-    <value>将于&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;进行版本更新维护</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
-    <value>\d\.\d版本更新维护预告</value>
+    <value>(?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓更新时间〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx

@@ -2922,19 +2922,13 @@
     <value>Wiki de armas</value>
   </data>
   <data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
-    <value>(?:〓Duração do evento〓|〓Hora de início da missão〓).*?(\d\.\d)a atualização da versão(?:after|)Disponível permanentemente</value>
+    <value>(?:〓Duração do evento〓|〓Hora de início da missão〓).*?\d\.\da atualização da versão(?:after|)Disponível permanentemente</value>
   </data>
   <data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
-    <value>〓Duração do evento〓.*?(\d\.\d) Disponível em toda as versões</value>
+    <value>〓Duração do evento〓.*?\d\.\d Disponível em toda as versões</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓Duração do evento〓|Duração da oração do evento|【Duração da disponibilidade】).*?(\d\.\d)Após a atualização da versão.*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
-    <value>将于&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;进行版本更新维护</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
-    <value>\d\.\d版本更新维护预告</value>
+    <value>(?:〓Duração do evento〓|Duração da oração do evento|【Duração da disponibilidade】).*?(\d\.\dApós a atualização da versão).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓Duração da manutenção da atualização.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx

@@ -1361,9 +1361,6 @@
   <data name="ViewDialogSettingDeleteUserDataTitle" xml:space="preserve">
     <value>是否永久删除用户数据</value>
   </data>
-  <data name="ViewDialogUpdatePackageDownloadUpdatelogLinkContent" xml:space="preserve">
-    <value>查看更新日志</value>
-  </data>
   <data name="ViewDialogUserDocumentAction" xml:space="preserve">
     <value>立即前往</value>
   </data>
@@ -1724,21 +1721,12 @@
   <data name="ViewModelSettingGeetestCustomUrlSucceed" xml:space="preserve">
     <value>无感验证复合 Url 配置成功</value>
   </data>
-  <data name="ViewModelSettingResetStaticResourceProgress" xml:space="preserve">
-    <value>正在重置图片资源</value>
-  </data>
   <data name="ViewModelSettingSetDataFolderSuccess" xml:space="preserve">
     <value>设置数据目录成功，重启以应用更改</value>
   </data>
   <data name="ViewModelSettingSetGamePathDatabaseFailedTitle" xml:space="preserve">
     <value>保存游戏路径失败</value>
   </data>
-  <data name="ViewModelSpiralAbyssUploadRecordHomaNotLoginContent" xml:space="preserve">
-    <value>当前未登录胡桃账号，上传深渊数据无法获赠胡桃云时长</value>
-  </data>
-  <data name="ViewModelSpiralAbyssUploadRecordHomaNotLoginTitle" xml:space="preserve">
-    <value>上传深渊数据</value>
-  </data>
   <data name="ViewModelUserAdded" xml:space="preserve">
     <value>用户 [{0}] 添加成功</value>
   </data>
@@ -2588,24 +2576,6 @@
   <data name="ViewpageSettingHomeHeader" xml:space="preserve">
     <value>主页</value>
   </data>
-  <data name="ViewPageSettingHutaoCloudAutoUploadDescription" xml:space="preserve">
-    <value>登录胡桃通行证后自动上传至胡桃云</value>
-  </data>
-  <data name="ViewPageSettingHutaoCloudAutoUploadHeader" xml:space="preserve">
-    <value>自动上传</value>
-  </data>
-  <data name="ViewPageSettingHutaoCloudGachaLogAutoUploadDescription" xml:space="preserve">
-    <value>刷新祈愿记录后自动上传至胡桃云，需要有效的胡桃云服务</value>
-  </data>
-  <data name="ViewPageSettingHutaoCloudGachaLogAutoUploadHeader" xml:space="preserve">
-    <value>自动上传祈愿记录</value>
-  </data>
-  <data name="ViewPageSettingHutaoCloudSpiralAbyssAutoUploadDescription" xml:space="preserve">
-    <value>刷新深境螺旋数据后自动上传至胡桃云</value>
-  </data>
-  <data name="ViewPageSettingHutaoCloudSpiralAbyssAutoUploadHeader" xml:space="preserve">
-    <value>自动上传深境螺旋数据</value>
-  </data>
   <data name="ViewPageSettingHutaoPassportDangerZoneDescription" xml:space="preserve">
     <value>三思而后行</value>
   </data>
@@ -2666,6 +2636,12 @@
   <data name="ViewPageSettingKeyShortcutHeader" xml:space="preserve">
     <value>快捷键</value>
   </data>
+  <data name="ViewPageSettingNeverHeldItemVisibleDescription" xml:space="preserve">
+    <value>在祈愿记录页面显示或隐藏未持有过的角色或武器</value>
+  </data>
+  <data name="ViewPageSettingNeverHeldItemVisibleHeader" xml:space="preserve">
+    <value>未持有过的角色或武器</value>
+  </data>
   <data name="ViewPageSettingOfficialSiteNavigate" xml:space="preserve">
     <value>前往官网</value>
   </data>
@@ -2732,12 +2708,6 @@
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>贡献翻译</value>
   </data>
-  <data name="ViewPageSettingUnobtainedWishItemVisibleDescription" xml:space="preserve">
-    <value>在祈愿记录页面角色与武器页签显示未抽取到的祈愿物品</value>
-  </data>
-  <data name="ViewPageSettingUnobtainedWishItemVisibleHeader" xml:space="preserve">
-    <value>未抽取到的祈愿物品</value>
-  </data>
   <data name="ViewPageSettingUpdateCheckAction" xml:space="preserve">
     <value>前往商店</value>
   </data>
@@ -2919,7 +2889,7 @@
     <value>上传数据</value>
   </data>
   <data name="ViewTitileUpdatePackageDownloadContent" xml:space="preserve">
-    <value>是否立即下载？</value>
+    <value>是否立即下载</value>
   </data>
   <data name="ViewTitileUpdatePackageDownloadFailedMessage" xml:space="preserve">
     <value>下载更新失败</value>
@@ -3018,19 +2988,13 @@
     <value>武器资料</value>
   </data>
   <data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
-    <value>(?:〓活动时间〓|〓任务开放时间〓).*?(\d\.\d)版本更新(?:完成|)后永久开放</value>
+    <value>(?:〓活动时间〓|〓任务开放时间〓).*?\d\.\d版本更新(?:完成|)后永久开放</value>
   </data>
   <data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
-    <value>〓活动时间〓.*?(\d\.\d)版本期间持续开放</value>
+    <value>〓活动时间〓.*?\d\.\d版本期间持续开放</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d)版本更新后.*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
-    <value>将于&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;进行版本更新维护</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
-    <value>\d\.\d版本更新维护预告</value>
+    <value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓更新时间〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx

@@ -2922,19 +2922,13 @@
     <value>武器资料</value>
   </data>
   <data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
-    <value>(?:〓活动时间〓|〓任务开放时间〓).*?(\d\.\d)版本更新(?:完成|)后永久开放</value>
+    <value>(?:〓活动时间〓|〓任务开放时间〓).*?\d\.\d版本更新(?:完成|)后永久开放</value>
   </data>
   <data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
-    <value>〓活动时间〓.*?(\d\.\d)版本期间持续开放</value>
+    <value>〓活动时间〓.*?\d\.\d版本期间持续开放</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d)版本更新后.*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
-    <value>将于&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;进行版本更新维护</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
-    <value>\d\.\d版本更新维护预告</value>
+    <value>(?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓更新时间〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx

@@ -2922,19 +2922,13 @@
     <value>武器資料</value>
   </data>
   <data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
-    <value>(?:〓活動時間〓|〓任務開放時間〓).*?(\d\.\d)版本更新(?:完成|)後永久開放</value>
+    <value>(?:〓活動時間〓|〓任務開放時間〓).*?\d\.\d版本更新(?:完成|)後永久開放</value>
   </data>
   <data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
-    <value>〓活動時間〓.*?(\d\.\d)版本期間持續開放</value>
+    <value>〓活動時間〓.*?\d\.\d版本期間持續開放</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓活動時間〓|祈願時間|【上架時間】|〓折扣時間〓).*?(\d\.\d).*?版本更新後.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
-    <value>親愛.*?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
-  </data>
-  <data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
-    <value>\d\.\d版本更新維護預告</value>
+    <value>(?:〓活動時間〓|祈願時間|【上架時間】|〓折扣時間〓).*?(\d\.\d版本更新後).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓更新時間〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/AppDbServiceAppDbEntityExtension.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.EntityFrameworkCore;
 using Snap.Hutao.Core.Database;
 using Snap.Hutao.Model.Entity.Abstraction;
 
@@ -20,16 +19,4 @@ internal static class AppDbServiceAppDbEntityExtension
     {
         return service.ExecuteAsync((dbset, token) => dbset.ExecuteDeleteWhereAsync(e => e.InnerId == entity.InnerId, token), token);
     }
-
-    public static List<TEntity> ListByArchiveId<TEntity>(this IAppDbService<TEntity> service, Guid archiveId)
-        where TEntity : class, IAppDbEntityHasArchive
-    {
-        return service.Query(query => query.Where(e => e.ArchiveId == archiveId).ToList());
-    }
-
-    public static ValueTask<List<TEntity>> ListByArchiveIdAsync<TEntity>(this IAppDbService<TEntity> service, Guid archiveId, CancellationToken token = default)
-        where TEntity : class, IAppDbEntityHasArchive
-    {
-        return service.QueryAsync((query, token) => query.Where(e => e.ArchiveId == archiveId).ToListAsync(token), token);
-    }
 }

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/AppDbServiceCollectionExtension.cs

@@ -1,47 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.EntityFrameworkCore;
-using System.Collections.ObjectModel;
-using System.Linq.Expressions;
-
-namespace Snap.Hutao.Service.Abstraction;
-
-internal static class AppDbServiceCollectionExtension
-{
-    public static List<TEntity> List<TEntity>(this IAppDbService<TEntity> service)
-        where TEntity : class
-    {
-        return service.Query(query => query.ToList());
-    }
-
-    public static List<TEntity> List<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
-        where TEntity : class
-    {
-        return service.Query(query => query.Where(predicate).ToList());
-    }
-
-    public static ValueTask<List<TEntity>> ListAsync<TEntity>(this IAppDbService<TEntity> service, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.QueryAsync((query, token) => query.ToListAsync(token), token);
-    }
-
-    public static ValueTask<List<TEntity>> ListAsync<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.QueryAsync((query, token) => query.Where(predicate).ToListAsync(token), token);
-    }
-
-    public static ObservableCollection<TEntity> ObservableCollection<TEntity>(this IAppDbService<TEntity> service)
-        where TEntity : class
-    {
-        return service.Query(query => query.ToObservableCollection());
-    }
-
-    public static ObservableCollection<TEntity> ObservableCollection<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
-        where TEntity : class
-    {
-        return service.Query(query => query.Where(predicate).ToObservableCollection());
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/AppDbServiceExtension.cs

@@ -84,6 +84,18 @@ internal static class AppDbServiceExtension
         return service.ExecuteAsync((dbset, token) => dbset.AddRangeAndSaveAsync(entities, token), token);
     }
 
+    public static TEntity Single<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
+        where TEntity : class
+    {
+        return service.Execute(dbset => dbset.AsNoTracking().Single(predicate));
+    }
+
+    public static ValueTask<TEntity> SingleAsync<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate, CancellationToken token = default)
+        where TEntity : class
+    {
+        return service.ExecuteAsync((dbset, token) => dbset.AsNoTracking().SingleAsync(predicate, token), token);
+    }
+
     public static TResult Query<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, TResult> func)
         where TEntity : class
     {
@@ -114,18 +126,6 @@ internal static class AppDbServiceExtension
         return service.ExecuteAsync((dbset, token) => func(dbset.AsNoTracking(), token), token);
     }
 
-    public static TEntity Single<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
-        where TEntity : class
-    {
-        return service.Query(query => query.Single(predicate));
-    }
-
-    public static ValueTask<TEntity> SingleAsync<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.QueryAsync((query, token) => query.SingleAsync(predicate, token), token);
-    }
-
     public static int Update<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
         where TEntity : class
     {

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementDbService.cs

@@ -11,6 +11,9 @@ using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
 
 namespace Snap.Hutao.Service.Achievement;
 
+/// <summary>
+/// 成就数据库服务
+/// </summary>
 [ConstructorGenerated]
 [Injection(InjectAs.Singleton, typeof(IAchievementDbService))]
 internal sealed partial class AchievementDbService : IAchievementDbService
@@ -76,7 +79,7 @@ internal sealed partial class AchievementDbService : IAchievementDbService
 
     public ObservableCollection<AchievementArchive> GetAchievementArchiveCollection()
     {
-        return this.ObservableCollection<AchievementArchive>();
+        return this.Query<AchievementArchive, ObservableCollection<AchievementArchive>>(query => query.ToObservableCollection());
     }
 
     public async ValueTask RemoveAchievementArchiveAsync(AchievementArchive archive, CancellationToken token = default)
@@ -87,21 +90,25 @@ internal sealed partial class AchievementDbService : IAchievementDbService
 
     public List<EntityAchievement> GetAchievementListByArchiveId(Guid archiveId)
     {
-        return this.ListByArchiveId<EntityAchievement>(archiveId);
+        return this.Query<EntityAchievement, List<EntityAchievement>>(query => [.. query.Where(a => a.ArchiveId == archiveId)]);
     }
 
     public ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId, CancellationToken token = default)
     {
-        return this.ListByArchiveIdAsync<EntityAchievement>(archiveId, token);
+        return this.QueryAsync<EntityAchievement, List<EntityAchievement>>(
+            (query, token) => query
+                .Where(a => a.ArchiveId == archiveId)
+                .ToListAsync(token),
+            token);
     }
 
     public List<AchievementArchive> GetAchievementArchiveList()
     {
-        return this.List<AchievementArchive>();
+        return this.Query<AchievementArchive, List<AchievementArchive>>(query => [.. query]);
     }
 
-    public ValueTask<List<AchievementArchive>> GetAchievementArchiveListAsync(CancellationToken token = default)
+    public async ValueTask<List<AchievementArchive>> GetAchievementArchiveListAsync(CancellationToken token = default)
     {
-        return this.ListAsync<AchievementArchive>(token);
+        return await this.QueryAsync<AchievementArchive, List<AchievementArchive>>(query => query.ToListAsync()).ConfigureAwait(false);
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Archive.cs

@@ -0,0 +1,79 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.Database;
+using Snap.Hutao.Model.Entity;
+using System.Collections.ObjectModel;
+
+namespace Snap.Hutao.Service.Achievement;
+
+/// <summary>
+/// 集合部分
+/// </summary>
+internal sealed partial class AchievementService
+{
+    private ObservableCollection<AchievementArchive>? archiveCollection;
+
+    /// <inheritdoc/>
+    public AchievementArchive? CurrentArchive
+    {
+        get => dbCurrent.Current;
+        set => dbCurrent.Current = value;
+    }
+
+    /// <inheritdoc/>
+    public ObservableCollection<AchievementArchive> ArchiveCollection
+    {
+        get
+        {
+            if (archiveCollection is null)
+            {
+                archiveCollection = achievementDbService.GetAchievementArchiveCollection();
+                CurrentArchive = archiveCollection.SelectedOrDefault();
+            }
+
+            return archiveCollection;
+        }
+    }
+
+    /// <inheritdoc/>
+    public async ValueTask<ArchiveAddResult> AddArchiveAsync(AchievementArchive newArchive)
+    {
+        if (string.IsNullOrWhiteSpace(newArchive.Name))
+        {
+            return ArchiveAddResult.InvalidName;
+        }
+
+        ArgumentNullException.ThrowIfNull(archiveCollection);
+
+        // 查找是否有相同的名称
+        if (archiveCollection.Any(a => a.Name == newArchive.Name))
+        {
+            return ArchiveAddResult.AlreadyExists;
+        }
+
+        // Sync cache
+        await taskContext.SwitchToMainThreadAsync();
+        archiveCollection.Add(newArchive);
+
+        // Sync database
+        await taskContext.SwitchToBackgroundAsync();
+        CurrentArchive = newArchive;
+
+        return ArchiveAddResult.Added;
+    }
+
+    /// <inheritdoc/>
+    public async ValueTask RemoveArchiveAsync(AchievementArchive archive)
+    {
+        ArgumentNullException.ThrowIfNull(archiveCollection);
+
+        // Sync cache
+        await taskContext.SwitchToMainThreadAsync();
+        archiveCollection.Remove(archive);
+
+        // Sync database
+        await taskContext.SwitchToBackgroundAsync();
+        await achievementDbService.RemoveAchievementArchiveAsync(archive).ConfigureAwait(false);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Interchange.cs

@@ -0,0 +1,64 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Entity;
+using Snap.Hutao.Model.InterChange.Achievement;
+using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
+
+namespace Snap.Hutao.Service.Achievement;
+
+/// <summary>
+/// 数据交换部分
+/// </summary>
+internal sealed partial class AchievementService
+{
+    /// <inheritdoc/>
+    public async ValueTask<ImportResult> ImportFromUIAFAsync(AchievementArchive archive, List<UIAFItem> list, ImportStrategy strategy)
+    {
+        await taskContext.SwitchToBackgroundAsync();
+
+        Guid archiveId = archive.InnerId;
+
+        switch (strategy)
+        {
+            case ImportStrategy.AggressiveMerge:
+                {
+                    IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
+                    return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, true);
+                }
+
+            case ImportStrategy.LazyMerge:
+                {
+                    IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
+                    return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, false);
+                }
+
+            case ImportStrategy.Overwrite:
+                {
+                    IEnumerable<EntityAchievement> orederedUIAF = list
+                        .Select(uiaf => EntityAchievement.From(archiveId, uiaf))
+                        .OrderBy(a => a.Id);
+                    return achievementDbBulkOperation.Overwrite(archiveId, orederedUIAF);
+                }
+
+            default:
+                throw Must.NeverHappen();
+        }
+    }
+
+    /// <inheritdoc/>
+    public async ValueTask<UIAF> ExportToUIAFAsync(AchievementArchive archive)
+    {
+        await taskContext.SwitchToBackgroundAsync();
+        List<EntityAchievement> entities = await achievementDbService
+            .GetAchievementListByArchiveIdAsync(archive.InnerId)
+            .ConfigureAwait(false);
+        List<UIAFItem> list = entities.SelectList(UIAFItem.From);
+
+        return new()
+        {
+            Info = UIAFInfo.From(runtimeOptions),
+            List = list,
+        };
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.cs

@@ -3,16 +3,17 @@
 
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.Database;
-using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Entity;
-using Snap.Hutao.Model.InterChange.Achievement;
 using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.ViewModel.Achievement;
-using System.Collections.ObjectModel;
 using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
+using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement;
 
 namespace Snap.Hutao.Service.Achievement;
 
+/// <summary>
+/// 成就服务
+/// </summary>
 [HighQuality]
 [ConstructorGenerated]
 [Injection(InjectAs.Scoped, typeof(IAchievementService))]
@@ -24,127 +25,21 @@ internal sealed partial class AchievementService : IAchievementService
     private readonly RuntimeOptions runtimeOptions;
     private readonly ITaskContext taskContext;
 
-    private ObservableCollection<AchievementArchive>? archiveCollection;
-
-    public AchievementArchive? CurrentArchive
-    {
-        get => dbCurrent.Current;
-        set => dbCurrent.Current = value;
-    }
-
-    public ObservableCollection<AchievementArchive> ArchiveCollection
-    {
-        get
-        {
-            if (archiveCollection is null)
-            {
-                archiveCollection = achievementDbService.GetAchievementArchiveCollection();
-                CurrentArchive = archiveCollection.SelectedOrDefault();
-            }
-
-            return archiveCollection;
-        }
-    }
-
-    public List<AchievementView> GetAchievementViewList(AchievementArchive archive, AchievementServiceMetadataContext context)
+    /// <inheritdoc/>
+    public List<AchievementView> GetAchievementViewList(AchievementArchive archive, List<MetadataAchievement> metadata)
     {
         Dictionary<AchievementId, EntityAchievement> entities = achievementDbService.GetAchievementMapByArchiveId(archive.InnerId);
 
-        return context.Achievements.SelectList(meta =>
+        return metadata.SelectList(meta =>
         {
             EntityAchievement entity = entities.GetValueOrDefault(meta.Id) ?? EntityAchievement.From(archive.InnerId, meta.Id);
             return new AchievementView(entity, meta);
         });
     }
 
+    /// <inheritdoc/>
     public void SaveAchievement(AchievementView achievement)
     {
         achievementDbService.OverwriteAchievement(achievement.Entity);
     }
-
-    public async ValueTask<ArchiveAddResultKind> AddArchiveAsync(AchievementArchive newArchive)
-    {
-        if (string.IsNullOrWhiteSpace(newArchive.Name))
-        {
-            return ArchiveAddResultKind.InvalidName;
-        }
-
-        ArgumentNullException.ThrowIfNull(archiveCollection);
-
-        if (archiveCollection.Any(a => a.Name == newArchive.Name))
-        {
-            return ArchiveAddResultKind.AlreadyExists;
-        }
-
-        // Sync cache
-        await taskContext.SwitchToMainThreadAsync();
-        archiveCollection.Add(newArchive);
-
-        // Sync database
-        await taskContext.SwitchToBackgroundAsync();
-        CurrentArchive = newArchive;
-
-        return ArchiveAddResultKind.Added;
-    }
-
-    public async ValueTask RemoveArchiveAsync(AchievementArchive archive)
-    {
-        ArgumentNullException.ThrowIfNull(archiveCollection);
-
-        // Sync cache
-        await taskContext.SwitchToMainThreadAsync();
-        archiveCollection.Remove(archive);
-
-        // Sync database
-        await taskContext.SwitchToBackgroundAsync();
-        await achievementDbService.RemoveAchievementArchiveAsync(archive).ConfigureAwait(false);
-    }
-
-    public async ValueTask<ImportResult> ImportFromUIAFAsync(AchievementArchive archive, List<UIAFItem> list, ImportStrategyKind strategy)
-    {
-        await taskContext.SwitchToBackgroundAsync();
-
-        Guid archiveId = archive.InnerId;
-
-        switch (strategy)
-        {
-            case ImportStrategyKind.AggressiveMerge:
-                {
-                    IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
-                    return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, true);
-                }
-
-            case ImportStrategyKind.LazyMerge:
-                {
-                    IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
-                    return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, false);
-                }
-
-            case ImportStrategyKind.Overwrite:
-                {
-                    IEnumerable<EntityAchievement> orederedUIAF = list
-                        .SelectList(uiaf => EntityAchievement.From(archiveId, uiaf))
-                        .SortBy(a => a.Id);
-                    return achievementDbBulkOperation.Overwrite(archiveId, orederedUIAF);
-                }
-
-            default:
-                throw HutaoException.NotSupported();
-        }
-    }
-
-    public async ValueTask<UIAF> ExportToUIAFAsync(AchievementArchive archive)
-    {
-        await taskContext.SwitchToBackgroundAsync();
-        List<EntityAchievement> entities = await achievementDbService
-            .GetAchievementListByArchiveIdAsync(archive.InnerId)
-            .ConfigureAwait(false);
-        List<UIAFItem> list = entities.SelectList(UIAFItem.From);
-
-        return new()
-        {
-            Info = UIAFInfo.From(runtimeOptions),
-            List = list,
-        };
-    }
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementServiceMetadataContext.cs

@@ -1,17 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
-using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement;
-
-namespace Snap.Hutao.Service.Achievement;
-
-internal sealed class AchievementServiceMetadataContext : IMetadataContext,
-    IMetadataListAchievementSource,
-    IMetadataDictionaryIdAchievementSource
-{
-    public List<MetadataAchievement> Achievements { get; set; } = default!;
-
-    public Dictionary<AchievementId, MetadataAchievement> IdAchievementMap { get; set; } = default!;
-}

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs

@@ -13,34 +13,32 @@ namespace Snap.Hutao.Service.Achievement;
 [Injection(InjectAs.Scoped, typeof(IAchievementStatisticsService))]
 internal sealed partial class AchievementStatisticsService : IAchievementStatisticsService
 {
-    private const int AchievementCardTakeCount = 2;
-
     private readonly IAchievementDbService achievementDbService;
     private readonly ITaskContext taskContext;
 
     /// <inheritdoc/>
-    public async ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(AchievementServiceMetadataContext context, CancellationToken token = default)
+    public async ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(Dictionary<AchievementId, MetadataAchievement> achievementMap)
     {
         await taskContext.SwitchToBackgroundAsync();
 
         List<AchievementStatistics> results = [];
-        foreach (AchievementArchive archive in await achievementDbService.GetAchievementArchiveListAsync(token).ConfigureAwait(false))
+        foreach (AchievementArchive archive in await achievementDbService.GetAchievementArchiveListAsync().ConfigureAwait(false))
         {
             int finishedCount = await achievementDbService
-                .GetFinishedAchievementCountByArchiveIdAsync(archive.InnerId, token)
+                .GetFinishedAchievementCountByArchiveIdAsync(archive.InnerId)
                 .ConfigureAwait(false);
 
-            int totalCount = context.IdAchievementMap.Count;
+            int totalCount = achievementMap.Count;
 
             List<EntityAchievement> achievements = await achievementDbService
-                .GetLatestFinishedAchievementListByArchiveIdAsync(archive.InnerId, AchievementCardTakeCount, token)
+                .GetLatestFinishedAchievementListByArchiveIdAsync(archive.InnerId, 2)
                 .ConfigureAwait(false);
 
             results.Add(new()
             {
                 DisplayName = archive.Name,
                 FinishDescription = AchievementStatistics.Format(finishedCount, totalCount, out _),
-                Achievements = achievements.SelectList(entity => new AchievementView(entity, context.IdAchievementMap[entity.Id])),
+                Achievements = achievements.SelectList(entity => new AchievementView(entity, achievementMap[entity.Id])),
             });
         }
 

src/Snap.Hutao/Snap.Hutao/Service/Achievement/ArchiveAddResult.cs

@@ -7,7 +7,7 @@ namespace Snap.Hutao.Service.Achievement;
 /// 存档添加结果
 /// </summary>
 [HighQuality]
-internal enum ArchiveAddResultKind
+internal enum ArchiveAddResult
 {
     /// <summary>
     /// 添加成功

src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementService.cs

@@ -32,7 +32,13 @@ internal interface IAchievementService
     /// <returns>UIAF</returns>
     ValueTask<UIAF> ExportToUIAFAsync(EntityArchive selectedArchive);
 
-    List<AchievementView> GetAchievementViewList(EntityArchive archive, AchievementServiceMetadataContext context);
+    /// <summary>
+    /// 获取整合的成就
+    /// </summary>
+    /// <param name="archive">用户</param>
+    /// <param name="metadata">元数据</param>
+    /// <returns>整合的成就</returns>
+    List<AchievementView> GetAchievementViewList(EntityArchive archive, List<MetadataAchievement> metadata);
 
     /// <summary>
     /// 异步导入UIAF数据
@@ -41,7 +47,7 @@ internal interface IAchievementService
     /// <param name="list">UIAF数据</param>
     /// <param name="strategy">选项</param>
     /// <returns>导入结果</returns>
-    ValueTask<ImportResult> ImportFromUIAFAsync(EntityArchive archive, List<UIAFItem> list, ImportStrategyKind strategy);
+    ValueTask<ImportResult> ImportFromUIAFAsync(EntityArchive archive, List<UIAFItem> list, ImportStrategy strategy);
 
     /// <summary>
     /// 异步移除存档
@@ -61,5 +67,5 @@ internal interface IAchievementService
     /// </summary>
     /// <param name="newArchive">新存档</param>
     /// <returns>存档添加结果</returns>
-    ValueTask<ArchiveAddResultKind> AddArchiveAsync(EntityArchive newArchive);
+    ValueTask<ArchiveAddResult> AddArchiveAsync(EntityArchive newArchive);
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementStatisticsService.cs

@@ -9,5 +9,5 @@ namespace Snap.Hutao.Service.Achievement;
 
 internal interface IAchievementStatisticsService
 {
-    ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(AchievementServiceMetadataContext context, CancellationToken token = default);
+    ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(Dictionary<AchievementId, MetadataAchievement> achievementMap);
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/ImportStrategy.cs

@@ -7,7 +7,7 @@ namespace Snap.Hutao.Service.Achievement;
 /// 导入策略
 /// </summary>
 [HighQuality]
-internal enum ImportStrategyKind
+internal enum ImportStrategy
 {
     /// <summary>
     /// 贪婪合并

src/Snap.Hutao/Snap.Hutao/Service/Announcement/AnnouncementService.cs

@@ -7,7 +7,6 @@ using Snap.Hutao.Service.Announcement;
 using Snap.Hutao.Web.Hoyolab;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
 using Snap.Hutao.Web.Response;
-using System.Collections.Specialized;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -18,15 +17,16 @@ namespace Snap.Hutao.Service;
 /// <inheritdoc/>
 [HighQuality]
 [ConstructorGenerated]
-[Injection(InjectAs.Scoped, typeof(IAnnouncementService))]
+[Injection(InjectAs.Transient, typeof(IAnnouncementService))]
 internal sealed partial class AnnouncementService : IAnnouncementService
 {
     private static readonly string CacheKey = $"{nameof(AnnouncementService)}.Cache.{nameof(AnnouncementWrapper)}";
 
-    private readonly IServiceScopeFactory serviceScopeFactory;
+    private readonly AnnouncementClient announcementClient;
     private readonly ITaskContext taskContext;
     private readonly IMemoryCache memoryCache;
 
+    /// <inheritdoc/>
     public async ValueTask<AnnouncementWrapper> GetAnnouncementWrapperAsync(string languageCode, Region region, CancellationToken cancellationToken = default)
     {
         // 缓存中存在记录，直接返回
@@ -36,37 +36,29 @@ internal sealed partial class AnnouncementService : IAnnouncementService
         }
 
         await taskContext.SwitchToBackgroundAsync();
+        Response<AnnouncementWrapper> announcementWrapperResponse = await announcementClient
+            .GetAnnouncementsAsync(languageCode, region, cancellationToken)
+            .ConfigureAwait(false);
 
-        List<AnnouncementContent>? contents;
-        AnnouncementWrapper wrapper;
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
+        if (!announcementWrapperResponse.IsOk())
         {
-            AnnouncementClient announcementClient = scope.ServiceProvider.GetRequiredService<AnnouncementClient>();
-
-            Response<AnnouncementWrapper> announcementWrapperResponse = await announcementClient
-                .GetAnnouncementsAsync(languageCode, region, cancellationToken)
-                .ConfigureAwait(false);
-
-            if (!announcementWrapperResponse.IsOk())
-            {
-                return default!;
-            }
-
-            wrapper = announcementWrapperResponse.Data;
-
-            Response<ListWrapper<AnnouncementContent>> announcementContentResponse = await announcementClient
-                .GetAnnouncementContentsAsync(languageCode, region, cancellationToken)
-                .ConfigureAwait(false);
-
-            if (!announcementContentResponse.IsOk())
-            {
-                return default!;
-            }
-
-            contents = announcementContentResponse.Data.List;
+            return default!;
         }
 
-        Dictionary<int, string> contentMap = contents.ToDictionary(id => id.AnnId, content => content.Content);
+        AnnouncementWrapper wrapper = announcementWrapperResponse.Data;
+        Response<ListWrapper<AnnouncementContent>> announcementContentResponse = await announcementClient
+            .GetAnnouncementContentsAsync(languageCode, region, cancellationToken)
+            .ConfigureAwait(false);
+
+        if (!announcementContentResponse.IsOk())
+        {
+            return default!;
+        }
+
+        List<AnnouncementContent> contents = announcementContentResponse.Data.List;
+
+        Dictionary<int, string> contentMap = contents
+            .ToDictionary(id => id.AnnId, content => content.Content);
 
         // 将活动公告置于前方
         wrapper.List.Reverse();
@@ -83,7 +75,8 @@ internal sealed partial class AnnouncementService : IAnnouncementService
         {
             foreach (ref readonly WebAnnouncement item in CollectionsMarshal.AsSpan(listWrapper.List))
             {
-                item.Content = contentMap.GetValueOrDefault(item.AnnId, string.Empty);
+                contentMap.TryGetValue(item.AnnId, out string? rawContent);
+                item.Content = rawContent ?? string.Empty;
             }
         }
 
@@ -111,68 +104,39 @@ internal sealed partial class AnnouncementService : IAnnouncementService
             .Single(wrapper => wrapper.TypeId == 1)
             .List;
 
-        // 游戏公告
-        List<WebAnnouncement> announcements = announcementListWrappers
-            .Single(wrapper => wrapper.TypeId == 2)
-            .List;
-
-        Dictionary<string, DateTimeOffset> versionStartTimes = [];
-
         // 更新公告
-        if (announcements.SingleOrDefault(ann => AnnouncementRegex.VersionUpdateTitleRegex.IsMatch(ann.Title)) is { } versionUpdate)
-        {
-            if (AnnouncementRegex.VersionUpdateTimeRegex.Match(versionUpdate.Content) is not { Success: true } versionUpdateMatch)
-            {
-                return;
-            }
+        WebAnnouncement versionUpdate = announcementListWrappers
+            .Single(wrapper => wrapper.TypeId == 2)
+            .List
+            .Single(ann => AnnouncementRegex.VersionUpdateTitleRegex.IsMatch(ann.Title));
 
-            DateTimeOffset versionUpdateTime = UnsafeDateTimeOffset.ParseDateTime(versionUpdateMatch.Groups[1].ValueSpan, offset);
-            versionStartTimes.TryAdd(VersionRegex().Match(versionUpdate.Title).Groups[1].Value, versionUpdateTime);
+        if (AnnouncementRegex.VersionUpdateTimeRegex.Match(versionUpdate.Content) is not { Success: true } versionMatch)
+        {
+            return;
         }
 
-        // 更新预告
-        if (announcements.SingleOrDefault(ann => AnnouncementRegex.VersionUpdatePreviewTitleRegex.IsMatch(ann.Title)) is { } versionUpdatePreview)
-        {
-            if (AnnouncementRegex.VersionUpdatePreviewTimeRegex.Match(versionUpdatePreview.Content) is not { Success: true } versionUpdatePreviewMatch)
-            {
-                return;
-            }
-
-            DateTimeOffset versionUpdatePreviewTime = UnsafeDateTimeOffset.ParseDateTime(versionUpdatePreviewMatch.Groups[1].ValueSpan, offset);
-            versionStartTimes.TryAdd(VersionRegex().Match(versionUpdatePreview.Title).Groups[1].Value, versionUpdatePreviewTime);
-        }
+        DateTimeOffset versionUpdateTime = UnsafeDateTimeOffset.ParseDateTime(versionMatch.Groups[1].ValueSpan, offset);
 
         foreach (ref readonly WebAnnouncement announcement in CollectionsMarshal.AsSpan(activities))
         {
-            DateTimeOffset versionStartTime;
-
             if (AnnouncementRegex.PermanentActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } permanent)
             {
-                if (versionStartTimes.TryGetValue(permanent.Groups[1].Value, out versionStartTime))
-                {
-                    announcement.StartTime = versionStartTime;
-                    continue;
-                }
+                announcement.StartTime = versionUpdateTime;
+                continue;
             }
 
             if (AnnouncementRegex.PersistentActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } persistent)
             {
-                if (versionStartTimes.TryGetValue(persistent.Groups[1].Value, out versionStartTime))
-                {
-                    announcement.StartTime = versionStartTime;
-                    announcement.EndTime = versionStartTime + TimeSpan.FromDays(42);
-                    continue;
-                }
+                announcement.StartTime = versionUpdateTime;
+                announcement.EndTime = versionUpdateTime + TimeSpan.FromDays(42);
+                continue;
             }
 
             if (AnnouncementRegex.TransientActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } transient)
             {
-                if (versionStartTimes.TryGetValue(transient.Groups[1].Value, out versionStartTime))
-                {
-                    announcement.StartTime = versionStartTime;
-                    announcement.EndTime = UnsafeDateTimeOffset.ParseDateTime(transient.Groups[2].ValueSpan, offset);
-                    continue;
-                }
+                announcement.StartTime = versionUpdateTime;
+                announcement.EndTime = UnsafeDateTimeOffset.ParseDateTime(transient.Groups[2].ValueSpan, offset);
+                continue;
             }
 
             MatchCollection matches = AnnouncementRegex.XmlTimeTagRegex().Matches(announcement.Content);
@@ -207,7 +171,4 @@ internal sealed partial class AnnouncementService : IAnnouncementService
             announcement.EndTime = max;
         }
     }
-
-    [GeneratedRegex("(\\d\\.\\d)")]
-    private static partial Regex VersionRegex();
 }

src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs

@@ -15,38 +15,24 @@ namespace Snap.Hutao.Service;
 [Injection(InjectAs.Singleton)]
 internal sealed partial class AppOptions : DbStoreOptions
 {
-    private bool? isAutoUploadGachaLogEnabled;
-    private bool? isAutoUploadSpiralAbyssRecordEnabled;
+    private bool? isNeverHeldStatisticsItemVisible;
     private bool? isEmptyHistoryWishVisible;
-    private bool? isUnobtainedWishItemVisible;
     private BackdropType? backdropType;
     private ElementTheme? elementTheme;
     private BackgroundImageType? backgroundImageType;
     private Region? region;
     private string? geetestCustomCompositeUrl;
 
-    public bool IsAutoUploadGachaLogEnabled
-    {
-        get => GetOption(ref isAutoUploadGachaLogEnabled, SettingEntry.IsAutoUploadGachaLogEnabled, false);
-        set => SetOption(ref isAutoUploadGachaLogEnabled, SettingEntry.IsAutoUploadGachaLogEnabled, value);
-    }
-
-    public bool IsAutoUploadSpiralAbyssRecordEnabled
-    {
-        get => GetOption(ref isAutoUploadSpiralAbyssRecordEnabled, SettingEntry.IsAutoUploadSpiralAbyssRecordEnabled, false);
-        set => SetOption(ref isAutoUploadSpiralAbyssRecordEnabled, SettingEntry.IsAutoUploadSpiralAbyssRecordEnabled, value);
-    }
-
     public bool IsEmptyHistoryWishVisible
     {
-        get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, false);
+        get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible);
         set => SetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, value);
     }
 
-    public bool IsUnobtainedWishItemVisible
+    public bool IsNeverHeldStatisticsItemVisible
     {
-        get => GetOption(ref isUnobtainedWishItemVisible, SettingEntry.IsUnobtainedWishItemVisible, false);
-        set => SetOption(ref isUnobtainedWishItemVisible, SettingEntry.IsUnobtainedWishItemVisible, value);
+        get => GetOption(ref isNeverHeldStatisticsItemVisible, SettingEntry.IsNeverHeldStatisticsItemVisible);
+        set => SetOption(ref isNeverHeldStatisticsItemVisible, SettingEntry.IsNeverHeldStatisticsItemVisible, value);
     }
 
     public List<NameValue<BackdropType>> BackdropTypes { get; } = CollectionsNameValue.FromEnum<BackdropType>(type => type >= 0);

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs

@@ -12,9 +12,7 @@ using Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate;
 using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord;
 using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar;
 using Snap.Hutao.Web.Response;
-using System.Reflection.Emit;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using CalculateAvatar = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.Avatar;
 using EnkaAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo;
 using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo;
@@ -23,6 +21,9 @@ using RecordPlayerInfo = Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.PlayerInfo;
 
 namespace Snap.Hutao.Service.AvatarInfo;
 
+/// <summary>
+/// 角色信息数据库操作
+/// </summary>
 [HighQuality]
 [ConstructorGenerated]
 [Injection(InjectAs.Singleton)]
@@ -31,10 +32,18 @@ internal sealed partial class AvatarInfoDbBulkOperation
     private readonly IServiceProvider serviceProvider;
     private readonly IAvatarInfoDbService avatarInfoDbService;
 
-    public async ValueTask<List<EntityAvatarInfo>> UpdateDbAvatarInfosByShowcaseAsync(string uid, IEnumerable<EnkaAvatarInfo> webInfos, CancellationToken token)
+    /// <summary>
+    /// 更新数据库角色信息
+    /// </summary>
+    /// <param name="uid">uid</param>
+    /// <param name="webInfos">Enka信息</param>
+    /// <param name="token">取消令牌</param>
+    /// <returns>角色列表</returns>
+    public List<EntityAvatarInfo> UpdateDbAvatarInfosByShowcase(string uid, IEnumerable<EnkaAvatarInfo> webInfos, CancellationToken token)
     {
-        List<EntityAvatarInfo> dbInfos = await avatarInfoDbService.GetAvatarInfoListByUidAsync(uid).ConfigureAwait(false);
-        EnsureItemsAvatarIdUnique(ref dbInfos, uid, out Dictionary<AvatarId, EntityAvatarInfo> dbInfoMap);
+        token.ThrowIfCancellationRequested();
+        List<EntityAvatarInfo> dbInfos = avatarInfoDbService.GetAvatarInfoListByUid(uid);
+        EnsureItemsAvatarIdDistinct(ref dbInfos, uid);
 
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
@@ -47,19 +56,28 @@ internal sealed partial class AvatarInfoDbBulkOperation
                     continue;
                 }
 
-                EntityAvatarInfo? entity = dbInfoMap.GetValueOrDefault(webInfo.AvatarId);
+                token.ThrowIfCancellationRequested();
+                EntityAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == webInfo.AvatarId);
                 AddOrUpdateAvatarInfo(entity, uid, appDbContext, webInfo);
             }
 
-            return await avatarInfoDbService.GetAvatarInfoListByUidAsync(uid).ConfigureAwait(false);
+            token.ThrowIfCancellationRequested();
+            return avatarInfoDbService.GetAvatarInfoListByUid(uid);
         }
     }
 
+    /// <summary>
+    /// 米游社我的角色方式 更新数据库角色信息
+    /// </summary>
+    /// <param name="userAndUid">用户与角色</param>
+    /// <param name="token">取消令牌</param>
+    /// <returns>角色列表</returns>
     public async ValueTask<List<EntityAvatarInfo>> UpdateDbAvatarInfosByGameRecordCharacterAsync(UserAndUid userAndUid, CancellationToken token)
     {
+        token.ThrowIfCancellationRequested();
         string uid = userAndUid.Uid.Value;
         List<EntityAvatarInfo> dbInfos = await avatarInfoDbService.GetAvatarInfoListByUidAsync(uid).ConfigureAwait(false);
-        EnsureItemsAvatarIdUnique(ref dbInfos, uid, out Dictionary<AvatarId, EntityAvatarInfo> dbInfoMap);
+        EnsureItemsAvatarIdDistinct(ref dbInfos, uid);
 
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
@@ -72,47 +90,51 @@ internal sealed partial class AvatarInfoDbBulkOperation
                 .GetPlayerInfoAsync(userAndUid, token)
                 .ConfigureAwait(false);
 
-            if (!playerInfoResponse.IsOk())
+            if (playerInfoResponse.IsOk())
             {
-                goto Return;
-            }
+                Response<CharacterWrapper> charactersResponse = await gameRecordClient
+                    .GetCharactersAsync(userAndUid, playerInfoResponse.Data, token)
+                    .ConfigureAwait(false);
 
-            Response<CharacterWrapper> charactersResponse = await gameRecordClient
-                .GetCharactersAsync(userAndUid, playerInfoResponse.Data, token)
-                .ConfigureAwait(false);
+                token.ThrowIfCancellationRequested();
 
-            if (!charactersResponse.IsOk())
-            {
-                goto Return;
-            }
-
-            List<RecordCharacter> characters = charactersResponse.Data.Avatars;
-
-            GameRecordCharacterAvatarInfoTransformer transformer = serviceProvider
-                .GetRequiredService<GameRecordCharacterAvatarInfoTransformer>();
-
-            foreach (RecordCharacter character in characters)
-            {
-                if (AvatarIds.IsPlayer(character.Id))
+                if (charactersResponse.IsOk())
                 {
-                    continue;
-                }
+                    List<RecordCharacter> characters = charactersResponse.Data.Avatars;
 
-                EntityAvatarInfo? entity = dbInfoMap.GetValueOrDefault(character.Id);
-                AddOrUpdateAvatarInfo(entity, character.Id, uid, appDbContext, transformer, character);
+                    GameRecordCharacterAvatarInfoTransformer transformer = serviceProvider
+                        .GetRequiredService<GameRecordCharacterAvatarInfoTransformer>();
+
+                    foreach (RecordCharacter character in characters)
+                    {
+                        if (AvatarIds.IsPlayer(character.Id))
+                        {
+                            continue;
+                        }
+
+                        token.ThrowIfCancellationRequested();
+                        EntityAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == character.Id);
+                        AddOrUpdateAvatarInfo(entity, character.Id, uid, appDbContext, transformer, character);
+                    }
+                }
             }
         }
 
-    Return:
         return await avatarInfoDbService.GetAvatarInfoListByUidAsync(uid).ConfigureAwait(false);
     }
 
+    /// <summary>
+    /// 米游社养成计算方式 更新数据库角色信息
+    /// </summary>
+    /// <param name="userAndUid">用户与角色</param>
+    /// <param name="token">取消令牌</param>
+    /// <returns>角色列表</returns>
     public async ValueTask<List<EntityAvatarInfo>> UpdateDbAvatarInfosByCalculateAvatarDetailAsync(UserAndUid userAndUid, CancellationToken token)
     {
         token.ThrowIfCancellationRequested();
         string uid = userAndUid.Uid.Value;
         List<EntityAvatarInfo> dbInfos = await avatarInfoDbService.GetAvatarInfoListByUidAsync(uid).ConfigureAwait(false);
-        EnsureItemsAvatarIdUnique(ref dbInfos, uid, out Dictionary<AvatarId, EntityAvatarInfo> dbInfoMap);
+        EnsureItemsAvatarIdDistinct(ref dbInfos, uid);
 
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
@@ -133,6 +155,8 @@ internal sealed partial class AvatarInfoDbBulkOperation
                     continue;
                 }
 
+                token.ThrowIfCancellationRequested();
+
                 Response<AvatarDetail> detailAvatarResponse = await calculateClient
                     .GetAvatarDetailAsync(userAndUid, avatar, token)
                     .ConfigureAwait(false);
@@ -142,7 +166,8 @@ internal sealed partial class AvatarInfoDbBulkOperation
                     continue;
                 }
 
-                EntityAvatarInfo? entity = dbInfoMap.GetValueOrDefault(avatar.Id);
+                token.ThrowIfCancellationRequested();
+                EntityAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == avatar.Id);
                 AddOrUpdateAvatarInfo(entity, avatar.Id, uid, appDbContext, transformer, detailAvatarResponse.Data);
             }
         }
@@ -156,14 +181,15 @@ internal sealed partial class AvatarInfoDbBulkOperation
         if (entity is null)
         {
             entity = EntityAvatarInfo.From(uid, webInfo);
+            entity.ShowcaseRefreshTime = DateTimeOffset.UtcNow;
+            appDbContext.AvatarInfos.AddAndSave(entity);
         }
         else
         {
             entity.Info = webInfo;
+            entity.ShowcaseRefreshTime = DateTimeOffset.UtcNow;
+            appDbContext.AvatarInfos.UpdateAndSave(entity);
         }
-
-        entity.ShowcaseRefreshTime = DateTimeOffset.UtcNow;
-        appDbContext.AvatarInfos.UpdateAndSave(entity);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -174,16 +200,17 @@ internal sealed partial class AvatarInfoDbBulkOperation
             EnkaAvatarInfo avatarInfo = new() { AvatarId = avatarId };
             transformer.Transform(ref avatarInfo, source);
             entity = EntityAvatarInfo.From(uid, avatarInfo);
+            entity.CalculatorRefreshTime = DateTimeOffset.UtcNow;
+            appDbContext.AvatarInfos.AddAndSave(entity);
         }
         else
         {
             EnkaAvatarInfo avatarInfo = entity.Info;
             transformer.Transform(ref avatarInfo, source);
             entity.Info = avatarInfo;
+            entity.CalculatorRefreshTime = DateTimeOffset.UtcNow;
+            appDbContext.AvatarInfos.UpdateAndSave(entity);
         }
-
-        entity.CalculatorRefreshTime = DateTimeOffset.UtcNow;
-        appDbContext.AvatarInfos.UpdateAndSave(entity);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -194,29 +221,29 @@ internal sealed partial class AvatarInfoDbBulkOperation
             EnkaAvatarInfo avatarInfo = new() { AvatarId = avatarId };
             transformer.Transform(ref avatarInfo, source);
             entity = EntityAvatarInfo.From(uid, avatarInfo);
+            entity.GameRecordRefreshTime = DateTimeOffset.UtcNow;
+            appDbContext.AvatarInfos.AddAndSave(entity);
         }
         else
         {
             EnkaAvatarInfo avatarInfo = entity.Info;
             transformer.Transform(ref avatarInfo, source);
             entity.Info = avatarInfo;
+            entity.GameRecordRefreshTime = DateTimeOffset.UtcNow;
+            appDbContext.AvatarInfos.UpdateAndSave(entity);
         }
-
-        entity.GameRecordRefreshTime = DateTimeOffset.UtcNow;
-        appDbContext.AvatarInfos.UpdateAndSave(entity);
     }
 
-    private void EnsureItemsAvatarIdUnique(ref List<EntityAvatarInfo> dbInfos, string uid, out Dictionary<AvatarId, EntityAvatarInfo> dbInfoMap)
+    private void EnsureItemsAvatarIdDistinct(ref List<EntityAvatarInfo> dbInfos, string uid)
     {
-        dbInfoMap = [];
-        foreach (ref readonly EntityAvatarInfo info in CollectionsMarshal.AsSpan(dbInfos))
+        int distinctCount = dbInfos.Select(info => info.Info.AvatarId).ToHashSet().Count;
+
+        // Avatars are actually less than the list told us.
+        // This means that there are duplicate items.
+        if (distinctCount < dbInfos.Count)
         {
-            if (!dbInfoMap.TryAdd(info.Info.AvatarId, info))
-            {
-                avatarInfoDbService.RemoveAvatarInfoRangeByUid(uid);
-                dbInfoMap.Clear();
-                dbInfos.Clear();
-            }
+            avatarInfoDbService.RemoveAvatarInfoRangeByUid(uid);
+            dbInfos = [];
         }
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs

@@ -4,7 +4,6 @@
 using Microsoft.EntityFrameworkCore;
 using Snap.Hutao.Core.Database;
 using Snap.Hutao.Model.Entity.Database;
-using Snap.Hutao.Service.Abstraction;
 using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo;
 
 namespace Snap.Hutao.Service.AvatarInfo;
@@ -15,25 +14,44 @@ internal sealed partial class AvatarInfoDbService : IAvatarInfoDbService
 {
     private readonly IServiceProvider serviceProvider;
 
-    public IServiceProvider ServiceProvider { get => serviceProvider; }
-
     public List<EntityAvatarInfo> GetAvatarInfoListByUid(string uid)
     {
-        return this.List(i => i.Uid == uid);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            IQueryable<EntityAvatarInfo> result = appDbContext.AvatarInfos.AsNoTracking().Where(i => i.Uid == uid);
+            return [.. result];
+        }
     }
 
-    public ValueTask<List<EntityAvatarInfo>> GetAvatarInfoListByUidAsync(string uid, CancellationToken token = default)
+    public async ValueTask<List<EntityAvatarInfo>> GetAvatarInfoListByUidAsync(string uid)
     {
-        return this.ListAsync(i => i.Uid == uid, token);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            return await appDbContext.AvatarInfos
+                .AsNoTracking()
+                .Where(i => i.Uid == uid)
+                .ToListAsync()
+                .ConfigureAwait(false);
+        }
     }
 
     public void RemoveAvatarInfoRangeByUid(string uid)
     {
-        this.Execute(dbset => dbset.Where(i => i.Uid == uid).ExecuteDelete());
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            appDbContext.AvatarInfos.ExecuteDeleteWhere(i => i.Uid == uid);
+        }
     }
 
-    public async ValueTask RemoveAvatarInfoRangeByUidAsync(string uid, CancellationToken token = default)
+    public async ValueTask RemoveAvatarInfoRangeByUidAsync(string uid)
     {
-        await this.ExecuteAsync((dbset, token) => dbset.Where(i => i.Uid == uid).ExecuteDeleteAsync(token), token).ConfigureAwait(false);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            await appDbContext.AvatarInfos.ExecuteDeleteWhereAsync(i => i.Uid == uid).ConfigureAwait(false);
+        }
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs

@@ -13,6 +13,9 @@ using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo;
 
 namespace Snap.Hutao.Service.AvatarInfo;
 
+/// <summary>
+/// 角色信息服务
+/// </summary>
 [HighQuality]
 [ConstructorGenerated]
 [Injection(InjectAs.Scoped, typeof(IAvatarInfoService))]
@@ -20,76 +23,77 @@ internal sealed partial class AvatarInfoService : IAvatarInfoService
 {
     private readonly AvatarInfoDbBulkOperation avatarInfoDbBulkOperation;
     private readonly IAvatarInfoDbService avatarInfoDbService;
-    private readonly IServiceScopeFactory serviceScopeFactory;
     private readonly ILogger<AvatarInfoService> logger;
     private readonly IMetadataService metadataService;
     private readonly ISummaryFactory summaryFactory;
+    private readonly EnkaClient enkaClient;
 
+    /// <inheritdoc/>
     public async ValueTask<ValueResult<RefreshResult, Summary?>> GetSummaryAsync(UserAndUid userAndUid, RefreshOption refreshOption, CancellationToken token = default)
     {
-        if (!await metadataService.InitializeAsync().ConfigureAwait(false))
+        if (await metadataService.InitializeAsync().ConfigureAwait(false))
+        {
+            token.ThrowIfCancellationRequested();
+
+            switch (refreshOption)
+            {
+                case RefreshOption.RequestFromEnkaAPI:
+                    {
+                        EnkaResponse? resp = await GetEnkaResponseAsync(userAndUid.Uid, token).ConfigureAwait(false);
+                        token.ThrowIfCancellationRequested();
+                        if (resp is null)
+                        {
+                            return new(RefreshResult.APIUnavailable, default);
+                        }
+
+                        if (!string.IsNullOrEmpty(resp.Message))
+                        {
+                            return new(RefreshResult.StatusCodeNotSucceed, new Summary { Message = resp.Message });
+                        }
+
+                        if (!resp.IsValid)
+                        {
+                            return new(RefreshResult.ShowcaseNotOpen, default);
+                        }
+
+                        List<EntityAvatarInfo> list = avatarInfoDbBulkOperation.UpdateDbAvatarInfosByShowcase(userAndUid.Uid.Value, resp.AvatarInfoList, token);
+                        Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false);
+                        return new(RefreshResult.Ok, summary);
+                    }
+
+                case RefreshOption.RequestFromHoyolabGameRecord:
+                    {
+                        List<EntityAvatarInfo> list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByGameRecordCharacterAsync(userAndUid, token).ConfigureAwait(false);
+                        Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false);
+                        return new(RefreshResult.Ok, summary);
+                    }
+
+                case RefreshOption.RequestFromHoyolabCalculate:
+                    {
+                        List<EntityAvatarInfo> list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByCalculateAvatarDetailAsync(userAndUid, token).ConfigureAwait(false);
+                        Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false);
+                        return new(RefreshResult.Ok, summary);
+                    }
+
+                default:
+                    {
+                        List<EntityAvatarInfo> list = await avatarInfoDbService.GetAvatarInfoListByUidAsync(userAndUid.Uid.Value).ConfigureAwait(false);
+                        Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false);
+                        token.ThrowIfCancellationRequested();
+                        return new(RefreshResult.Ok, summary.Avatars.Count == 0 ? null : summary);
+                    }
+            }
+        }
+        else
         {
             return new(RefreshResult.MetadataNotInitialized, null);
         }
-
-        switch (refreshOption)
-        {
-            case RefreshOption.RequestFromEnkaAPI:
-                {
-                    EnkaResponse? resp = await GetEnkaResponseAsync(userAndUid.Uid, token).ConfigureAwait(false);
-
-                    if (resp is null)
-                    {
-                        return new(RefreshResult.APIUnavailable, default);
-                    }
-
-                    if (!string.IsNullOrEmpty(resp.Message))
-                    {
-                        return new(RefreshResult.StatusCodeNotSucceed, new Summary { Message = resp.Message });
-                    }
-
-                    if (!resp.IsValid)
-                    {
-                        return new(RefreshResult.ShowcaseNotOpen, default);
-                    }
-
-                    List<EntityAvatarInfo> list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByShowcaseAsync(userAndUid.Uid.Value, resp.AvatarInfoList, token).ConfigureAwait(false);
-                    Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false);
-                    return new(RefreshResult.Ok, summary);
-                }
-
-            case RefreshOption.RequestFromHoyolabGameRecord:
-                {
-                    List<EntityAvatarInfo> list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByGameRecordCharacterAsync(userAndUid, token).ConfigureAwait(false);
-                    Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false);
-                    return new(RefreshResult.Ok, summary);
-                }
-
-            case RefreshOption.RequestFromHoyolabCalculate:
-                {
-                    List<EntityAvatarInfo> list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByCalculateAvatarDetailAsync(userAndUid, token).ConfigureAwait(false);
-                    Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false);
-                    return new(RefreshResult.Ok, summary);
-                }
-
-            default:
-                {
-                    List<EntityAvatarInfo> list = await avatarInfoDbService.GetAvatarInfoListByUidAsync(userAndUid.Uid.Value, token).ConfigureAwait(false);
-                    Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false);
-                    return new(RefreshResult.Ok, summary.Avatars.Count == 0 ? null : summary);
-                }
-        }
     }
 
     private async ValueTask<EnkaResponse?> GetEnkaResponseAsync(PlayerUid uid, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
-        {
-            EnkaClient enkaClient = scope.ServiceProvider.GetRequiredService<EnkaClient>();
-
-            return await enkaClient.GetForwardDataAsync(uid, token).ConfigureAwait(false)
-                ?? await enkaClient.GetDataAsync(uid, token).ConfigureAwait(false);
-        }
+        return await enkaClient.GetForwardDataAsync(uid, token).ConfigureAwait(false)
+            ?? await enkaClient.GetDataAsync(uid, token).ConfigureAwait(false);
     }
 
     private async ValueTask<Summary> GetSummaryCoreAsync(IEnumerable<EntityAvatarInfo> avatarInfos, CancellationToken token)

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/AvatarViewBuilder.cs

@@ -1,13 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal sealed class AvatarViewBuilder : IAvatarViewBuilder
-{
-    public AvatarView View { get; } = new();
-
-    public float Score { get => View.Score; set => View.Score = value; }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/AvatarViewBuilderExtension.cs

@@ -1,242 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction.Extension;
-using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata.Avatar;
-using Snap.Hutao.Model.Metadata.Converter;
-using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal static class AvatarViewBuilderExtension
-{
-    public static TBuilder SetCostumeIconOrDefault<TBuilder>(this TBuilder builder, Web.Enka.Model.AvatarInfo avatarInfo, Avatar avatar)
-        where TBuilder : IAvatarViewBuilder
-    {
-        if (avatarInfo.CostumeId.TryGetValue(out CostumeId id))
-        {
-            Costume costume = avatar.Costumes.Single(c => c.Id == id);
-
-            // Set to costume icon
-            builder.View.Icon = AvatarIconConverter.IconNameToUri(costume.FrontIcon);
-            builder.View.SideIcon = AvatarIconConverter.IconNameToUri(costume.SideIcon);
-        }
-        else
-        {
-            builder.View.Icon = AvatarIconConverter.IconNameToUri(avatar.Icon);
-            builder.View.SideIcon = AvatarIconConverter.IconNameToUri(avatar.SideIcon);
-        }
-
-        return builder;
-    }
-
-    public static TBuilder SetCalculatorRefreshTimeFormat<TBuilder>(this TBuilder builder, DateTimeOffset refreshTime, Func<object?, string> format, string defaultValue)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetCalculatorRefreshTimeFormat(refreshTime == DateTimeOffsetExtension.DatebaseDefaultTime ? defaultValue : format(refreshTime.ToLocalTime()));
-    }
-
-    public static TBuilder SetCalculatorRefreshTimeFormat<TBuilder>(this TBuilder builder, string calculatorRefreshTimeFormat)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.CalculatorRefreshTimeFormat = calculatorRefreshTimeFormat);
-    }
-
-    public static TBuilder SetConstellations<TBuilder>(this TBuilder builder, List<Skill> talents, List<SkillId>? talentIds)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetConstellations(CreateConstellations(talents, talentIds.EmptyIfNull()));
-
-        static List<ConstellationView> CreateConstellations(List<Skill> talents, List<SkillId> talentIds)
-        {
-            // TODO: use builder here
-            return talents.SelectList(talent => new ViewModel.AvatarProperty.ConstellationView()
-            {
-                Name = talent.Name,
-                Icon = SkillIconConverter.IconNameToUri(talent.Icon),
-                Description = talent.Description,
-                IsActivated = talentIds.Contains(talent.Id),
-            });
-        }
-    }
-
-    public static TBuilder SetConstellations<TBuilder>(this TBuilder builder, List<ConstellationView> constellations)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Constellations = constellations);
-    }
-
-    public static TBuilder SetCritScore<TBuilder>(this TBuilder builder, Dictionary<FightProperty, float>? fightPropMap)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetCritScore(ScoreCrit(fightPropMap));
-
-        static float ScoreCrit(Dictionary<FightProperty, float>? fightPropMap)
-        {
-            if (fightPropMap.IsNullOrEmpty())
-            {
-                return 0F;
-            }
-
-            float cr = fightPropMap[FightProperty.FIGHT_PROP_CRITICAL];
-            float cd = fightPropMap[FightProperty.FIGHT_PROP_CRITICAL_HURT];
-
-            return 100 * ((cr * 2) + cd);
-        }
-    }
-
-    public static TBuilder SetCritScore<TBuilder>(this TBuilder builder, float critScore)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.CritScore = critScore);
-    }
-
-    public static TBuilder SetElement<TBuilder>(this TBuilder builder, ElementType element)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Element = element);
-    }
-
-    public static TBuilder SetFetterLevel<TBuilder>(this TBuilder builder, FetterLevel? level)
-        where TBuilder : IAvatarViewBuilder
-    {
-        if (level.TryGetValue(out FetterLevel value))
-        {
-            return builder.Configure(b => b.View.FetterLevel = value);
-        }
-
-        return builder;
-    }
-
-    public static TBuilder SetFetterLevel<TBuilder>(this TBuilder builder, uint level)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.FetterLevel = level);
-    }
-
-    public static TBuilder SetGameRecordRefreshTimeFormat<TBuilder>(this TBuilder builder, DateTimeOffset refreshTime, Func<object?, string> format, string defaultValue)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetGameRecordRefreshTimeFormat(refreshTime == DateTimeOffsetExtension.DatebaseDefaultTime ? defaultValue : format(refreshTime.ToLocalTime()));
-    }
-
-    public static TBuilder SetGameRecordRefreshTimeFormat<TBuilder>(this TBuilder builder, string gameRecordRefreshTimeFormat)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.GameRecordRefreshTimeFormat = gameRecordRefreshTimeFormat);
-    }
-
-    public static TBuilder SetId<TBuilder>(this TBuilder builder, AvatarId id)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Id = id);
-    }
-
-    public static TBuilder SetLevelNumber<TBuilder>(this TBuilder builder, uint? levelNumber)
-        where TBuilder : IAvatarViewBuilder
-    {
-        if (levelNumber.TryGetValue(out uint value))
-        {
-            return builder.Configure(b => b.View.LevelNumber = value);
-        }
-
-        return builder;
-    }
-
-    public static TBuilder SetName<TBuilder>(this TBuilder builder, string name)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Name = name);
-    }
-
-    public static TBuilder SetNameCard<TBuilder>(this TBuilder builder, Uri nameCard)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.NameCard = nameCard);
-    }
-
-    public static TBuilder SetProperties<TBuilder>(this TBuilder builder, List<AvatarProperty> properties)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Properties = properties);
-    }
-
-    public static TBuilder SetQuality<TBuilder>(this TBuilder builder, QualityType quality)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Quality = quality);
-    }
-
-    public static TBuilder SetReliquaries<TBuilder>(this TBuilder builder, List<ReliquaryView> reliquaries)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Reliquaries = reliquaries);
-    }
-
-    public static TBuilder SetShowcaseRefreshTimeFormat<TBuilder>(this TBuilder builder, DateTimeOffset refreshTime, Func<object?, string> format, string defaultValue)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetShowcaseRefreshTimeFormat(refreshTime == DateTimeOffsetExtension.DatebaseDefaultTime ? defaultValue : format(refreshTime.ToLocalTime()));
-    }
-
-    public static TBuilder SetShowcaseRefreshTimeFormat<TBuilder>(this TBuilder builder, string showcaseRefreshTimeFormat)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.ShowcaseRefreshTimeFormat = showcaseRefreshTimeFormat);
-    }
-
-    public static TBuilder SetSkills<TBuilder>(this TBuilder builder, Dictionary<SkillId, SkillLevel>? skillLevelMap, Dictionary<SkillGroupId, SkillLevel>? proudSkillExtraLevelMap, List<ProudableSkill> proudSkills)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetSkills(CreateSkills(skillLevelMap, proudSkillExtraLevelMap, proudSkills));
-
-        static List<SkillView> CreateSkills(Dictionary<SkillId, SkillLevel>? skillLevelMap, Dictionary<SkillGroupId, SkillLevel>? proudSkillExtraLevelMap, List<ProudableSkill> proudSkills)
-        {
-            if (skillLevelMap.IsNullOrEmpty())
-            {
-                return [];
-            }
-
-            Dictionary<SkillId, SkillLevel> skillExtraLeveledMap = new(skillLevelMap);
-
-            if (proudSkillExtraLevelMap is not null)
-            {
-                foreach ((SkillGroupId groupId, SkillLevel extraLevel) in proudSkillExtraLevelMap)
-                {
-                    skillExtraLeveledMap.IncreaseValue(proudSkills.Single(p => p.GroupId == groupId).Id, extraLevel);
-                }
-            }
-
-            return proudSkills.SelectList(proudableSkill =>
-            {
-                SkillId skillId = proudableSkill.Id;
-
-                // TODO: use builder here
-                return new SkillView()
-                {
-                    Name = proudableSkill.Name,
-                    Icon = SkillIconConverter.IconNameToUri(proudableSkill.Icon),
-                    Description = proudableSkill.Description,
-
-                    GroupId = proudableSkill.GroupId,
-                    LevelNumber = skillLevelMap[skillId],
-                    Info = DescriptionsParametersDescriptor.Convert(proudableSkill.Proud, skillExtraLeveledMap[skillId]),
-                };
-            });
-        }
-    }
-
-    public static TBuilder SetSkills<TBuilder>(this TBuilder builder, List<SkillView> skills)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Skills = skills);
-    }
-
-    public static TBuilder SetWeapon<TBuilder>(this TBuilder builder, WeaponView? weapon)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.View.Weapon = weapon);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/EquipViewBuilderExtension.cs

@@ -1,33 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction.Extension;
-using Snap.Hutao.Model;
-using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal static class EquipViewBuilderExtension
-{
-    public static TBuilder SetLevel<TBuilder, T>(this TBuilder builder, string level)
-        where TBuilder : IEquipViewBuilder<T>
-        where T : EquipView
-    {
-        return builder.Configure(b => b.View.Level = level);
-    }
-
-    public static TBuilder SetQuality<TBuilder, T>(this TBuilder builder, QualityType quality)
-        where TBuilder : IEquipViewBuilder<T>
-        where T : EquipView
-    {
-        return builder.Configure(b => b.View.Quality = quality);
-    }
-
-    public static TBuilder SetMainProperty<TBuilder, T>(this TBuilder builder, NameValue<string> mainProperty)
-        where TBuilder : IEquipViewBuilder<T>
-        where T : EquipView
-    {
-        return builder.Configure(b => b.View.MainProperty = mainProperty);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/IAvatarViewBuilder.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction;
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal interface IAvatarViewBuilder : IBuilder, IScoreAccess
-{
-    AvatarView View { get; }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/IEquipViewBuilder.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal interface IEquipViewBuilder<T> : INameIconDescriptionBuilder<T>
-    where T : EquipView
-{
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/INameIconDescriptionBuilder.cs

@@ -1,13 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction;
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal interface INameIconDescriptionBuilder<T> : IBuilder
-    where T : NameIconDescription
-{
-    T View { get; }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/IReliquaryViewBuilder.cs

@@ -1,10 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal interface IReliquaryViewBuilder : IEquipViewBuilder<ReliquaryView>, IScoreAccess
-{
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/IScoreAccess.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal interface IScoreAccess
-{
-    float Score { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/IWeaponViewBuilder.cs

@@ -1,10 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal interface IWeaponViewBuilder : IEquipViewBuilder<WeaponView>
-{
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/NameIconDescriptionBuilderExtension.cs

@@ -1,33 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction.Extension;
-using Snap.Hutao.Model;
-using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal static class NameIconDescriptionBuilderExtension
-{
-    public static TBuilder SetDescription<TBuilder, T>(this TBuilder builder, string description)
-        where TBuilder : INameIconDescriptionBuilder<T>
-        where T : NameIconDescription
-    {
-        return builder.Configure(b => b.View.Description = description);
-    }
-
-    public static TBuilder SetIcon<TBuilder, T>(this TBuilder builder, Uri icon)
-        where TBuilder : INameIconDescriptionBuilder<T>
-        where T : NameIconDescription
-    {
-        return builder.Configure(b => b.View.Icon = icon);
-    }
-
-    public static TBuilder SetName<TBuilder, T>(this TBuilder builder, string name)
-        where TBuilder : INameIconDescriptionBuilder<T>
-        where T : NameIconDescription
-    {
-        return builder.Configure(b => b.View.Name = name);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/ReliquaryViewBuilder.cs

@@ -1,13 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal sealed class ReliquaryViewBuilder : IReliquaryViewBuilder
-{
-    public ReliquaryView View { get; } = new();
-
-    public float Score { get => View.Score; set => View.Score = value; }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/ReliquaryViewBuilderExtension.cs

@@ -1,66 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction.Extension;
-using Snap.Hutao.Model;
-using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal static class ReliquaryViewBuilderExtension
-{
-    public static TBuilder SetComposedSubProperties<TBuilder>(this TBuilder builder, List<ReliquaryComposedSubProperty> composedSubProperties)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.Configure(b => b.View.ComposedSubProperties = composedSubProperties);
-    }
-
-    public static TBuilder SetDescription<TBuilder>(this TBuilder builder, string description)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.SetDescription<TBuilder, ReliquaryView>(description);
-    }
-
-    public static TBuilder SetIcon<TBuilder>(this TBuilder builder, Uri icon)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.SetIcon<TBuilder, ReliquaryView>(icon);
-    }
-
-    public static TBuilder SetLevel<TBuilder>(this TBuilder builder, string level)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.SetLevel<TBuilder, ReliquaryView>(level);
-    }
-
-    public static TBuilder SetMainProperty<TBuilder>(this TBuilder builder, NameValue<string> mainProperty)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.SetMainProperty<TBuilder, ReliquaryView>(mainProperty);
-    }
-
-    public static TBuilder SetName<TBuilder>(this TBuilder builder, string name)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.SetName<TBuilder, ReliquaryView>(name);
-    }
-
-    public static TBuilder SetPrimarySubProperties<TBuilder>(this TBuilder builder, List<ReliquarySubProperty> primarySubProperties)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.Configure(b => b.View.PrimarySubProperties = primarySubProperties);
-    }
-
-    public static TBuilder SetQuality<TBuilder>(this TBuilder builder, QualityType quality)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.SetQuality<TBuilder, ReliquaryView>(quality);
-    }
-
-    public static TBuilder SetSecondarySubProperties<TBuilder>(this TBuilder builder, List<ReliquarySubProperty> secondarySubProperties)
-        where TBuilder : IReliquaryViewBuilder
-    {
-        return builder.Configure(b => b.View.SecondarySubProperties = secondarySubProperties);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/ScoreAccessExtension.cs

@@ -1,16 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction;
-using Snap.Hutao.Core.Abstraction.Extension;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal static class ScoreAccessExtension
-{
-    public static TBuilder SetScore<TBuilder>(this TBuilder builder, float score)
-        where TBuilder : IBuilder, IScoreAccess
-    {
-        return builder.Configure(b => b.Score = score);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/WeaponViewBuilder.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal sealed class WeaponViewBuilder : IWeaponViewBuilder
-{
-    public WeaponView View { get; } = new();
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/WeaponViewBuilderExtension.cs

@@ -1,99 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction.Extension;
-using Snap.Hutao.Model;
-using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata.Converter;
-using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.ViewModel.AvatarProperty;
-using Snap.Hutao.Web.Enka.Model;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal static class WeaponViewBuilderExtension
-{
-    public static TBuilder SetAffixLevelNumber<TBuilder>(this TBuilder builder, uint affixLevelNumber)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.Configure(b => b.View.AffixLevelNumber = affixLevelNumber);
-    }
-
-    public static TBuilder SetAffixDescription<TBuilder>(this TBuilder builder, string? affixDescription)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.Configure(b => b.View.AffixDescription = affixDescription ?? string.Empty);
-    }
-
-    public static TBuilder SetAffixName<TBuilder>(this TBuilder builder, string? affixName)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.Configure(b => b.View.AffixName = affixName ?? string.Empty);
-    }
-
-    public static TBuilder SetDescription<TBuilder>(this TBuilder builder, string description)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.SetDescription<TBuilder, WeaponView>(description);
-    }
-
-    public static TBuilder SetIcon<TBuilder>(this TBuilder builder, Uri icon)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.SetIcon<TBuilder, WeaponView>(icon);
-    }
-
-    public static TBuilder SetId<TBuilder>(this TBuilder builder, WeaponId id)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.Configure(b => b.View.Id = id);
-    }
-
-    public static TBuilder SetLevel<TBuilder>(this TBuilder builder, string level)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.SetLevel<TBuilder, WeaponView>(level);
-    }
-
-    public static TBuilder SetLevelNumber<TBuilder>(this TBuilder builder, uint levelNumber)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.Configure(b => b.View.LevelNumber = levelNumber);
-    }
-
-    public static TBuilder SetMainProperty<TBuilder>(this TBuilder builder, WeaponStat? mainStat)
-    where TBuilder : IWeaponViewBuilder
-    {
-        return builder.SetMainProperty(mainStat is not null ? FightPropertyFormat.ToNameValue(mainStat.AppendPropId, mainStat.StatValue) : NameValueDefaults.String);
-    }
-
-    public static TBuilder SetMainProperty<TBuilder>(this TBuilder builder, NameValue<string> mainProperty)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.SetMainProperty<TBuilder, WeaponView>(mainProperty);
-    }
-
-    public static TBuilder SetName<TBuilder>(this TBuilder builder, string name)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.SetName<TBuilder, WeaponView>(name);
-    }
-
-    public static TBuilder SetQuality<TBuilder>(this TBuilder builder, QualityType quality)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.SetQuality<TBuilder, WeaponView>(quality);
-    }
-
-    public static TBuilder SetSubProperty<TBuilder>(this TBuilder builder, NameDescription subProperty)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.Configure(b => b.View.SubProperty = subProperty);
-    }
-
-    public static TBuilder SetWeaponType<TBuilder>(this TBuilder builder, WeaponType weaponType)
-        where TBuilder : IWeaponViewBuilder
-    {
-        return builder.Configure(b => b.View.WeaponType = weaponType);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/ISummaryFactory.cs

@@ -5,8 +5,17 @@ using Snap.Hutao.ViewModel.AvatarProperty;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
+/// <summary>
+/// 简述工厂
+/// </summary>
 [HighQuality]
 internal interface ISummaryFactory
 {
+    /// <summary>
+    /// 异步创建简述对象
+    /// </summary>
+    /// <param name="avatarInfos">角色列表</param>
+    /// <param name="token">取消令牌</param>
+    /// <returns>简述对象</returns>
     ValueTask<Summary> CreateAsync(IEnumerable<Model.Entity.AvatarInfo> avatarInfos, CancellationToken token);
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryAvatarFactory.cs

@@ -5,17 +5,21 @@ using Snap.Hutao.Model;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Intrinsic.Format;
 using Snap.Hutao.Model.Metadata.Converter;
-using Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-using Snap.Hutao.ViewModel.AvatarProperty;
+using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.Web.Enka.Model;
-using System.Runtime.InteropServices;
 using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo;
 using MetadataAvatar = Snap.Hutao.Model.Metadata.Avatar.Avatar;
 using MetadataWeapon = Snap.Hutao.Model.Metadata.Weapon.Weapon;
 using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo;
+using PropertyAvatar = Snap.Hutao.ViewModel.AvatarProperty.AvatarView;
+using PropertyReliquary = Snap.Hutao.ViewModel.AvatarProperty.ReliquaryView;
+using PropertyWeapon = Snap.Hutao.ViewModel.AvatarProperty.WeaponView;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
+/// <summary>
+/// 单个角色工厂
+/// </summary>
 [HighQuality]
 internal sealed class SummaryAvatarFactory
 {
@@ -23,11 +27,16 @@ internal sealed class SummaryAvatarFactory
     private readonly DateTimeOffset showcaseRefreshTime;
     private readonly DateTimeOffset gameRecordRefreshTime;
     private readonly DateTimeOffset calculatorRefreshTime;
-    private readonly SummaryFactoryMetadataContext context;
+    private readonly SummaryMetadataContext metadataContext;
 
-    public SummaryAvatarFactory(SummaryFactoryMetadataContext context, EntityAvatarInfo avatarInfo)
+    /// <summary>
+    /// 构造一个新的角色工厂
+    /// </summary>
+    /// <param name="metadataContext">元数据上下文</param>
+    /// <param name="avatarInfo">角色信息</param>
+    public SummaryAvatarFactory(SummaryMetadataContext metadataContext, EntityAvatarInfo avatarInfo)
     {
-        this.context = context;
+        this.metadataContext = metadataContext;
         this.avatarInfo = avatarInfo.Info;
 
         showcaseRefreshTime = avatarInfo.ShowcaseRefreshTime;
@@ -35,51 +44,84 @@ internal sealed class SummaryAvatarFactory
         calculatorRefreshTime = avatarInfo.CalculatorRefreshTime;
     }
 
-    public static AvatarView Create(SummaryFactoryMetadataContext context, EntityAvatarInfo avatarInfo)
-    {
-        return new SummaryAvatarFactory(context, avatarInfo).Create();
-    }
-
-    public AvatarView Create()
+    /// <summary>
+    /// 创建角色
+    /// </summary>
+    /// <returns>角色</returns>
+    public PropertyAvatar Create()
     {
         ReliquaryAndWeapon reliquaryAndWeapon = ProcessEquip(avatarInfo.EquipList.EmptyIfNull());
-        MetadataAvatar avatar = context.IdAvatarMap[avatarInfo.AvatarId];
+        MetadataAvatar avatar = metadataContext.IdAvatarMap[avatarInfo.AvatarId];
 
-        AvatarView propertyAvatar = new AvatarViewBuilder()
-            .SetId(avatar.Id)
-            .SetName(avatar.Name)
-            .SetQuality(avatar.Quality)
-            .SetNameCard(AvatarNameCardPicConverter.AvatarToUri(avatar))
-            .SetElement(ElementNameIconConverter.ElementNameToElementType(avatar.FetterInfo.VisionBefore))
-            .SetConstellations(avatar.SkillDepot.Talents, avatarInfo.TalentIdList)
-            .SetSkills(avatarInfo.SkillLevelMap, avatarInfo.ProudSkillExtraLevelMap, avatar.SkillDepot.CompositeSkillsNoInherents())
-            .SetFetterLevel(avatarInfo.FetterInfo?.ExpLevel)
-            .SetProperties(SummaryAvatarProperties.Create(avatarInfo.FightPropMap))
-            .SetCritScore(avatarInfo.FightPropMap)
-            .SetLevelNumber(avatarInfo.PropMap?[PlayerProperty.PROP_LEVEL].Value)
-            .SetWeapon(reliquaryAndWeapon.Weapon)
-            .SetReliquaries(reliquaryAndWeapon.Reliquaries)
-            .SetScore(reliquaryAndWeapon.Reliquaries.Sum(r => r.Score))
-            .SetShowcaseRefreshTimeFormat(showcaseRefreshTime, SH.FormatServiceAvatarInfoSummaryShowcaseRefreshTimeFormat, SH.ServiceAvatarInfoSummaryShowcaseNotRefreshed)
-            .SetGameRecordRefreshTimeFormat(gameRecordRefreshTime, SH.FormatServiceAvatarInfoSummaryGameRecordRefreshTimeFormat, SH.ServiceAvatarInfoSummaryGameRecordNotRefreshed)
-            .SetCalculatorRefreshTimeFormat(calculatorRefreshTime, SH.FormatServiceAvatarInfoSummaryCalculatorRefreshTimeFormat, SH.ServiceAvatarInfoSummaryCalculatorNotRefreshed)
-            .SetCostumeIconOrDefault(avatarInfo, avatar)
-            .View;
+        PropertyAvatar propertyAvatar = new()
+        {
+            // metadata part
+            Id = avatar.Id,
+            Name = avatar.Name,
+            Quality = avatar.Quality,
+            NameCard = AvatarNameCardPicConverter.AvatarToUri(avatar),
+            Element = ElementNameIconConverter.ElementNameToElementType(avatar.FetterInfo.VisionBefore),
 
+            // webinfo & metadata mixed part
+            Constellations = SummaryHelper.CreateConstellations(avatar.SkillDepot.Talents, avatarInfo.TalentIdList),
+            Skills = SummaryHelper.CreateSkills(avatarInfo.SkillLevelMap, avatarInfo.ProudSkillExtraLevelMap, avatar.SkillDepot.CompositeSkillsNoInherents()),
+
+            // webinfo part
+            FetterLevel = avatarInfo.FetterInfo?.ExpLevel ?? 0U,
+            Properties = SummaryAvatarProperties.Create(avatarInfo.FightPropMap),
+            CritScore = $"{SummaryHelper.ScoreCrit(avatarInfo.FightPropMap):F2}",
+            LevelNumber = avatarInfo.PropMap?[PlayerProperty.PROP_LEVEL].Value ?? 0U,
+
+            // processed webinfo part
+            Weapon = reliquaryAndWeapon.Weapon,
+            Reliquaries = reliquaryAndWeapon.Reliquaries,
+            Score = $"{reliquaryAndWeapon.Reliquaries.Sum(r => r.Score):F2}",
+
+            // times
+            ShowcaseRefreshTimeFormat = showcaseRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
+                ? SH.ServiceAvatarInfoSummaryShowcaseNotRefreshed
+                : SH.FormatServiceAvatarInfoSummaryShowcaseRefreshTimeFormat(showcaseRefreshTime.ToLocalTime()),
+            GameRecordRefreshTimeFormat = gameRecordRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
+                ? SH.ServiceAvatarInfoSummaryGameRecordNotRefreshed
+                : SH.FormatServiceAvatarInfoSummaryGameRecordRefreshTimeFormat(gameRecordRefreshTime.ToLocalTime()),
+            CalculatorRefreshTimeFormat = calculatorRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
+                ? SH.ServiceAvatarInfoSummaryCalculatorNotRefreshed
+                : SH.FormatServiceAvatarInfoSummaryCalculatorRefreshTimeFormat(calculatorRefreshTime.ToLocalTime()),
+        };
+
+        ApplyCostumeIconOrDefault(ref propertyAvatar, avatar);
         return propertyAvatar;
     }
 
+    private void ApplyCostumeIconOrDefault(ref PropertyAvatar propertyAvatar, MetadataAvatar avatar)
+    {
+        if (avatarInfo.CostumeId.TryGetValue(out CostumeId id))
+        {
+            Model.Metadata.Avatar.Costume costume = avatar.Costumes.Single(c => c.Id == id);
+
+            // Set to costume icon
+            propertyAvatar.Icon = AvatarIconConverter.IconNameToUri(costume.FrontIcon);
+            propertyAvatar.SideIcon = AvatarIconConverter.IconNameToUri(costume.SideIcon);
+        }
+        else
+        {
+            propertyAvatar.Icon = AvatarIconConverter.IconNameToUri(avatar.Icon);
+            propertyAvatar.SideIcon = AvatarIconConverter.IconNameToUri(avatar.SideIcon);
+        }
+    }
+
     private ReliquaryAndWeapon ProcessEquip(List<Equip> equipments)
     {
-        List<ReliquaryView> reliquaryList = [];
-        WeaponView? weapon = null;
+        List<PropertyReliquary> reliquaryList = [];
+        PropertyWeapon? weapon = null;
 
-        foreach (ref readonly Equip equip in CollectionsMarshal.AsSpan(equipments))
+        foreach (Equip equip in equipments)
         {
             switch (equip.Flat.ItemType)
             {
                 case ItemType.ITEM_RELIQUARY:
-                    reliquaryList.Add(SummaryReliquaryFactory.Create(context, avatarInfo, equip));
+                    SummaryReliquaryFactory summaryReliquaryFactory = new(metadataContext, avatarInfo, equip);
+                    reliquaryList.Add(summaryReliquaryFactory.CreateReliquary());
                     break;
                 case ItemType.ITEM_WEAPON:
                     weapon = CreateWeapon(equip);
@@ -90,9 +132,9 @@ internal sealed class SummaryAvatarFactory
         return new(reliquaryList, weapon);
     }
 
-    private WeaponView CreateWeapon(Equip equip)
+    private PropertyWeapon CreateWeapon(Equip equip)
     {
-        MetadataWeapon weapon = context.IdWeaponMap[equip.ItemId];
+        MetadataWeapon weapon = metadataContext.IdWeaponMap[equip.ItemId];
 
         // AffixMap can be null when it's a white weapon.
         ArgumentNullException.ThrowIfNull(equip.Weapon);
@@ -116,29 +158,34 @@ internal sealed class SummaryAvatarFactory
 
         ArgumentNullException.ThrowIfNull(equip.Weapon);
 
-        return new WeaponViewBuilder()
-            .SetName(weapon.Name)
-            .SetIcon(EquipIconConverter.IconNameToUri(weapon.Icon))
-            .SetDescription(weapon.Description)
-            .SetLevel($"Lv.{equip.Weapon.Level.Value}")
-            .SetQuality(weapon.Quality)
-            .SetMainProperty(mainStat)
-            .SetId(weapon.Id)
-            .SetLevelNumber(equip.Weapon.Level)
-            .SetSubProperty(subProperty)
-            .SetAffixLevelNumber(affixLevel + 1)
-            .SetAffixName(weapon.Affix?.Name)
-            .SetAffixDescription(weapon.Affix?.Descriptions.Single(a => a.Level == affixLevel).Description)
-            .SetWeaponType(weapon.WeaponType)
-            .View;
+        return new()
+        {
+            // NameIconDescription
+            Name = weapon.Name,
+            Icon = EquipIconConverter.IconNameToUri(weapon.Icon),
+            Description = weapon.Description,
+
+            // EquipBase
+            Level = $"Lv.{equip.Weapon.Level.Value}",
+            Quality = weapon.Quality,
+            MainProperty = mainStat is not null ? FightPropertyFormat.ToNameValue(mainStat.AppendPropId, mainStat.StatValue) : NameValueDefaults.String,
+
+            // Weapon
+            Id = weapon.Id,
+            LevelNumber = equip.Weapon.Level,
+            SubProperty = subProperty,
+            AffixLevelNumber = affixLevel + 1,
+            AffixName = weapon.Affix?.Name ?? string.Empty,
+            AffixDescription = weapon.Affix?.Descriptions.Single(a => a.Level == affixLevel).Description ?? string.Empty,
+        };
     }
 
     private readonly struct ReliquaryAndWeapon
     {
-        public readonly List<ReliquaryView> Reliquaries;
-        public readonly WeaponView? Weapon;
+        public readonly List<PropertyReliquary> Reliquaries;
+        public readonly PropertyWeapon? Weapon;
 
-        public ReliquaryAndWeapon(List<ReliquaryView> reliquaries, WeaponView? weapon)
+        public ReliquaryAndWeapon(List<PropertyReliquary> reliquaries, PropertyWeapon? weapon)
         {
             Reliquaries = reliquaries;
             Weapon = weapon;

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryAvatarProperties.cs

@@ -13,6 +13,11 @@ namespace Snap.Hutao.Service.AvatarInfo.Factory;
 [HighQuality]
 internal static class SummaryAvatarProperties
 {
+    /// <summary>
+    /// 创建角色属性
+    /// </summary>
+    /// <param name="fightPropMap">属性映射</param>
+    /// <returns>列表</returns>
     public static List<AvatarProperty> Create(Dictionary<FightProperty, float>? fightPropMap)
     {
         if (fightPropMap is null)
@@ -20,27 +25,32 @@ internal static class SummaryAvatarProperties
             return [];
         }
 
-        List<AvatarProperty> properties =
-        [
-            ToAvatarProperty(FightProperty.FIGHT_PROP_BASE_HP, fightPropMap),
-            ToAvatarProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, fightPropMap),
-            ToAvatarProperty(FightProperty.FIGHT_PROP_BASE_DEFENSE, fightPropMap),
-            FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_ELEMENT_MASTERY, fightPropMap),
-            FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_CRITICAL, fightPropMap),
-            FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_CRITICAL_HURT, fightPropMap),
-            FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, fightPropMap)
-        ];
+        AvatarProperty hpProp = ToAvatarProperty(FightProperty.FIGHT_PROP_BASE_HP, fightPropMap);
+        AvatarProperty atkProp = ToAvatarProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, fightPropMap);
+        AvatarProperty defProp = ToAvatarProperty(FightProperty.FIGHT_PROP_BASE_DEFENSE, fightPropMap);
+        AvatarProperty emProp = FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_ELEMENT_MASTERY, fightPropMap);
+        AvatarProperty critRateProp = FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_CRITICAL, fightPropMap);
+        AvatarProperty critDMGProp = FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_CRITICAL_HURT, fightPropMap);
+        AvatarProperty chargeEffProp = FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, fightPropMap);
+
+        List<AvatarProperty> properties = new(9) { hpProp, atkProp, defProp, emProp, critRateProp, critDMGProp, chargeEffProp };
 
         // 元素伤害
-        if (TryGetBonusFightProperty(fightPropMap, out FightProperty bonusProperty, out float value) && value > 0)
+        if (TryGetBonusFightProperty(fightPropMap, out FightProperty bonusProperty, out float value))
         {
-            properties.Add(FightPropertyFormat.ToAvatarProperty(bonusProperty, value));
+            if (value > 0)
+            {
+                properties.Add(FightPropertyFormat.ToAvatarProperty(bonusProperty, value));
+            }
         }
 
         // 物伤 可以和其他元素伤害并存，所以分别判断
-        if (fightPropMap.TryGetValue(FightProperty.FIGHT_PROP_PHYSICAL_ADD_HURT, out float addValue) && addValue > 0)
+        if (fightPropMap.TryGetValue(FightProperty.FIGHT_PROP_PHYSICAL_ADD_HURT, out float addValue))
         {
-            properties.Add(FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_PHYSICAL_ADD_HURT, addValue));
+            if (addValue > 0)
+            {
+                properties.Add(FightPropertyFormat.ToAvatarProperty(FightProperty.FIGHT_PROP_PHYSICAL_ADD_HURT, addValue));
+            }
         }
 
         return properties;

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs

@@ -3,7 +3,6 @@
 
 using Snap.Hutao.Model.Metadata;
 using Snap.Hutao.Service.Metadata;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.ViewModel.AvatarProperty;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
@@ -21,18 +20,22 @@ internal sealed partial class SummaryFactory : ISummaryFactory
     /// <inheritdoc/>
     public async ValueTask<Summary> CreateAsync(IEnumerable<Model.Entity.AvatarInfo> avatarInfos, CancellationToken token)
     {
-        SummaryFactoryMetadataContext context = await metadataService
-            .GetContextAsync<SummaryFactoryMetadataContext>(token)
-            .ConfigureAwait(false);
+        SummaryMetadataContext metadataContext = new()
+        {
+            IdAvatarMap = await metadataService.GetIdToAvatarMapAsync(token).ConfigureAwait(false),
+            IdWeaponMap = await metadataService.GetIdToWeaponMapAsync(token).ConfigureAwait(false),
+            IdReliquaryAffixWeightMap = await metadataService.GetIdToReliquaryAffixWeightMapAsync(token).ConfigureAwait(false),
+            IdReliquaryMainAffixMap = await metadataService.GetIdToReliquaryMainPropertyMapAsync(token).ConfigureAwait(false),
+            IdReliquarySubAffixMap = await metadataService.GetIdToReliquarySubAffixMapAsync(token).ConfigureAwait(false),
+            ReliquaryLevels = await metadataService.GetReliquaryLevelListAsync(token).ConfigureAwait(false),
+            Reliquaries = await metadataService.GetReliquaryListAsync(token).ConfigureAwait(false),
+        };
 
         IOrderedEnumerable<AvatarView> avatars = avatarInfos
             .Where(a => !AvatarIds.IsPlayer(a.Info.AvatarId))
-            .Select(a => SummaryAvatarFactory.Create(context, a))
-            .OrderByDescending(a => a.Quality)
-            .ThenByDescending(a => a.LevelNumber)
-            .ThenBy(a => a.Element)
-            .ThenBy(a => a.Weapon?.WeaponType)
-            .ThenByDescending(a => a.FetterLevel);
+            .Select(a => new SummaryAvatarFactory(metadataContext, a).Create())
+            .OrderByDescending(a => a.LevelNumber)
+            .ThenBy(a => a.Name);
 
         return new()
         {

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryHelper.cs

@@ -1,14 +1,85 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Core.ExceptionService;
+using Snap.Hutao.Model.Intrinsic;
+using Snap.Hutao.Model.Metadata.Avatar;
+using Snap.Hutao.Model.Metadata.Converter;
 using Snap.Hutao.Model.Primitive;
+using Snap.Hutao.ViewModel.AvatarProperty;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
+/// <summary>
+/// 简述帮助类
+/// </summary>
 [HighQuality]
 internal static class SummaryHelper
 {
+    /// <summary>
+    /// 创建命之座
+    /// </summary>
+    /// <param name="talents">全部命座</param>
+    /// <param name="talentIds">激活的命座列表</param>
+    /// <returns>命之座</returns>
+    public static List<ConstellationView> CreateConstellations(List<Skill> talents, List<SkillId>? talentIds)
+    {
+        talentIds ??= [];
+
+        return talents.SelectList(talent => new ConstellationView()
+        {
+            Name = talent.Name,
+            Icon = SkillIconConverter.IconNameToUri(talent.Icon),
+            Description = talent.Description,
+            IsActivated = talentIds.Contains(talent.Id),
+        });
+    }
+
+    /// <summary>
+    /// 创建技能组
+    /// </summary>
+    /// <param name="skillLevelMap">技能等级映射</param>
+    /// <param name="proudSkillExtraLevelMap">额外提升等级映射</param>
+    /// <param name="proudSkills">技能列表</param>
+    /// <returns>技能</returns>
+    public static List<SkillView> CreateSkills(Dictionary<SkillId, SkillLevel>? skillLevelMap, Dictionary<SkillGroupId, SkillLevel>? proudSkillExtraLevelMap, List<ProudableSkill> proudSkills)
+    {
+        if (skillLevelMap.IsNullOrEmpty())
+        {
+            return [];
+        }
+
+        Dictionary<SkillId, SkillLevel> skillExtraLeveledMap = new(skillLevelMap);
+
+        if (proudSkillExtraLevelMap is not null)
+        {
+            foreach ((SkillGroupId groupId, SkillLevel extraLevel) in proudSkillExtraLevelMap)
+            {
+                skillExtraLeveledMap.IncreaseValue(proudSkills.Single(p => p.GroupId == groupId).Id, extraLevel);
+            }
+        }
+
+        return proudSkills.SelectList(proudableSkill =>
+        {
+            SkillId skillId = proudableSkill.Id;
+
+            return new SkillView()
+            {
+                Name = proudableSkill.Name,
+                Icon = SkillIconConverter.IconNameToUri(proudableSkill.Icon),
+                Description = proudableSkill.Description,
+
+                GroupId = proudableSkill.GroupId,
+                LevelNumber = skillLevelMap[skillId],
+                Info = DescriptionsParametersDescriptor.Convert(proudableSkill.Proud, skillExtraLeveledMap[skillId]),
+            };
+        });
+    }
+
+    /// <summary>
+    /// 获取副属性对应的最大属性的Id
+    /// </summary>
+    /// <param name="appendId">属性Id</param>
+    /// <returns>最大属性Id</returns>
     public static ReliquarySubAffixId GetAffixMaxId(in ReliquarySubAffixId appendId)
     {
         // axxxxx -> a
@@ -20,13 +91,18 @@ internal static class SummaryHelper
             1 => 2,
             2 => 3,
             3 or 4 or 5 => 4,
-            _ => throw HutaoException.Throw($"不支持的 ReliquarySubAffixId: {appendId}"),
+            _ => throw Must.NeverHappen(),
         };
 
         // axxxxb -> axxxx -> axxxx0 -> axxxxm
         return ((appendId / 10) * 10) + max;
     }
 
+    /// <summary>
+    /// 获取百分比属性副词条分数
+    /// </summary>
+    /// <param name="appendId">id</param>
+    /// <returns>分数</returns>
     public static float GetPercentSubAffixScore(in ReliquarySubAffixId appendId)
     {
         // 圣遗物相同类型副词条强化档位一共为 4/3/2 档
@@ -53,7 +129,25 @@ internal static class SummaryHelper
             (1, 0) => 100F,
             (1, 1) => 80F,
 
-            _ => throw HutaoException.Throw($"Unexpected AppendId: {appendId} Delta: {delta}"),
+            _ => throw Must.NeverHappen($"Unexpected AppendId: {appendId.Value} Delta: {delta}"),
         };
     }
+
+    /// <summary>
+    /// 获取双爆评分
+    /// </summary>
+    /// <param name="fightPropMap">属性</param>
+    /// <returns>评分</returns>
+    public static float ScoreCrit(Dictionary<FightProperty, float>? fightPropMap)
+    {
+        if (fightPropMap.IsNullOrEmpty())
+        {
+            return 0F;
+        }
+
+        float cr = fightPropMap[FightProperty.FIGHT_PROP_CRITICAL];
+        float cd = fightPropMap[FightProperty.FIGHT_PROP_CRITICAL_HURT];
+
+        return 100 * ((cr * 2) + cd);
+    }
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryMetadataContext.cs

@@ -4,34 +4,51 @@
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Metadata.Reliquary;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using MetadataAvatar = Snap.Hutao.Model.Metadata.Avatar.Avatar;
 using MetadataReliquary = Snap.Hutao.Model.Metadata.Reliquary.Reliquary;
 using MetadataWeapon = Snap.Hutao.Model.Metadata.Weapon.Weapon;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
+/// <summary>
+/// 简述元数据上下文
+/// 包含了所有制造简述需要的元数据
+/// </summary>
 [HighQuality]
-internal sealed class SummaryFactoryMetadataContext : IMetadataContext,
-    IMetadataDictionaryIdAvatarSource,
-    IMetadataDictionaryIdWeaponSource,
-    IMetadataDictionaryIdReliquaryAffixWeightSource,
-    IMetadataDictionaryIdReliquaryMainPropertySource,
-    IMetadataDictionaryIdReliquarySubAffixSource,
-    IMetadataDictionaryIdReliquarySource,
-    IMetadataListReliquaryMainAffixLevelSource
+internal sealed class SummaryMetadataContext
 {
+    /// <summary>
+    /// 角色映射
+    /// </summary>
     public Dictionary<AvatarId, MetadataAvatar> IdAvatarMap { get; set; } = default!;
 
+    /// <summary>
+    /// 武器映射
+    /// </summary>
     public Dictionary<WeaponId, MetadataWeapon> IdWeaponMap { get; set; } = default!;
 
+    /// <summary>
+    /// 权重映射
+    /// </summary>
     public Dictionary<AvatarId, ReliquaryAffixWeight> IdReliquaryAffixWeightMap { get; set; } = default!;
 
-    public Dictionary<ReliquaryMainAffixId, FightProperty> IdReliquaryMainPropertyMap { get; set; } = default!;
+    /// <summary>
+    /// 圣遗物主属性映射
+    /// </summary>
+    public Dictionary<ReliquaryMainAffixId, FightProperty> IdReliquaryMainAffixMap { get; set; } = default!;
 
+    /// <summary>
+    /// 圣遗物副属性映射
+    /// </summary>
     public Dictionary<ReliquarySubAffixId, ReliquarySubAffix> IdReliquarySubAffixMap { get; set; } = default!;
 
-    public List<ReliquaryMainAffixLevel> ReliquaryMainAffixLevels { get; set; } = default!;
+    /// <summary>
+    /// 圣遗物等级
+    /// </summary>
+    public List<ReliquaryMainAffixLevel> ReliquaryLevels { get; set; } = default!;
 
-    public Dictionary<ReliquaryId, MetadataReliquary> IdReliquaryMap { get; set; } = default!;
+    /// <summary>
+    /// 圣遗物
+    /// </summary>
+    public List<MetadataReliquary> Reliquaries { get; set; } = default!;
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs

@@ -6,7 +6,6 @@ using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Metadata.Converter;
 using Snap.Hutao.Model.Metadata.Reliquary;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.AvatarInfo.Factory.Builder;
 using Snap.Hutao.ViewModel.AvatarProperty;
 using System.Runtime.InteropServices;
 using MetadataReliquary = Snap.Hutao.Model.Metadata.Reliquary.Reliquary;
@@ -14,63 +13,76 @@ using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
+/// <summary>
+/// 圣遗物工厂
+/// </summary>
 [HighQuality]
 internal sealed class SummaryReliquaryFactory
 {
-    private readonly SummaryFactoryMetadataContext metadataContext;
+    private readonly SummaryMetadataContext metadataContext;
     private readonly ModelAvatarInfo avatarInfo;
     private readonly Web.Enka.Model.Equip equip;
 
-    public SummaryReliquaryFactory(SummaryFactoryMetadataContext metadataContext, ModelAvatarInfo avatarInfo, Web.Enka.Model.Equip equip)
+    /// <summary>
+    /// 构造一个新的圣遗物工厂
+    /// </summary>
+    /// <param name="metadataContext">元数据上下文</param>
+    /// <param name="avatarInfo">角色信息</param>
+    /// <param name="equip">圣遗物</param>
+    public SummaryReliquaryFactory(SummaryMetadataContext metadataContext, ModelAvatarInfo avatarInfo, Web.Enka.Model.Equip equip)
     {
         this.metadataContext = metadataContext;
         this.avatarInfo = avatarInfo;
         this.equip = equip;
     }
 
-    public static ReliquaryView Create(SummaryFactoryMetadataContext metadataContext, ModelAvatarInfo avatarInfo, Web.Enka.Model.Equip equip)
+    /// <summary>
+    /// 构造圣遗物
+    /// </summary>
+    /// <returns>圣遗物</returns>
+    public ReliquaryView CreateReliquary()
     {
-        return new SummaryReliquaryFactory(metadataContext, avatarInfo, equip).Create();
-    }
-
-    public ReliquaryView Create()
-    {
-        MetadataReliquary reliquary = metadataContext.IdReliquaryMap[equip.ItemId];
+        MetadataReliquary reliquary = metadataContext.Reliquaries.Single(r => r.Ids.Contains(equip.ItemId));
 
         ArgumentNullException.ThrowIfNull(equip.Reliquary);
-        List<ReliquarySubProperty> subProperties = equip.Reliquary.AppendPropIdList.EmptyIfNull().SelectList(CreateSubProperty);
-
-        ReliquaryViewBuilder reliquaryViewBuilder = new ReliquaryViewBuilder()
-            .SetName(reliquary.Name)
-            .SetIcon(RelicIconConverter.IconNameToUri(reliquary.Icon))
-            .SetDescription(reliquary.Description)
-            .SetLevel($"+{equip.Reliquary.Level - 1U}")
-            .SetQuality(reliquary.RankLevel);
+        List<ReliquarySubProperty> subProperty = equip.Reliquary.AppendPropIdList.EmptyIfNull().SelectList(CreateSubProperty);
 
         int affixCount = GetSecondaryAffixCount(reliquary, equip.Reliquary);
 
-        if (subProperties.Count > 0)
+        ReliquaryView result = new()
         {
-            reliquaryViewBuilder
-                .SetPrimarySubProperties(subProperties.GetRange(..^affixCount))
-                .SetSecondarySubProperties(subProperties.GetRange(^affixCount..))
-                .SetComposedSubProperties(CreateComposedSubProperties(equip.Reliquary.AppendPropIdList));
+            // NameIconDescription
+            Name = reliquary.Name,
+            Icon = RelicIconConverter.IconNameToUri(reliquary.Icon),
+            Description = reliquary.Description,
 
-            ReliquaryMainAffixLevel relicLevel = metadataContext.ReliquaryMainAffixLevels.Single(r => r.Level == equip.Reliquary.Level && r.Rank == reliquary.RankLevel);
-            FightProperty property = metadataContext.IdReliquaryMainPropertyMap[equip.Reliquary.MainPropId];
+            // EquipBase
+            Level = $"+{equip.Reliquary.Level - 1U}",
+            Quality = reliquary.RankLevel,
+        };
 
-            reliquaryViewBuilder
-                .SetMainProperty(FightPropertyFormat.ToNameValue(property, relicLevel.PropertyMap[property]))
-                .SetScore(ScoreReliquary(property, reliquary, relicLevel, subProperties));
+        if (subProperty.Count > 0)
+        {
+            result.PrimarySubProperties = subProperty.GetRange(..^affixCount);
+            result.SecondarySubProperties = subProperty.GetRange(^affixCount..);
+
+            ArgumentNullException.ThrowIfNull(equip.Flat.ReliquarySubstats);
+            result.ComposedSubProperties = CreateComposedSubProperties(equip.Reliquary.AppendPropIdList);
+
+            ReliquaryMainAffixLevel relicLevel = metadataContext.ReliquaryLevels.Single(r => r.Level == equip.Reliquary.Level && r.Rank == reliquary.RankLevel);
+            FightProperty property = metadataContext.IdReliquaryMainAffixMap[equip.Reliquary.MainPropId];
+
+            result.MainProperty = FightPropertyFormat.ToNameValue(property, relicLevel.PropertyMap[property]);
+            result.Score = ScoreReliquary(property, reliquary, relicLevel, subProperty);
         }
 
-        return reliquaryViewBuilder.View;
+        return result;
     }
 
-    private static int GetSecondaryAffixCount(MetadataReliquary metaReliquary, Web.Enka.Model.Reliquary enkaReliquary)
+    private static int GetSecondaryAffixCount(MetadataReliquary reliquary, Web.Enka.Model.Reliquary enkaReliquary)
     {
         // 强化词条个数
-        return (metaReliquary.RankLevel, enkaReliquary.Level.Value) switch
+        return (reliquary.RankLevel, enkaReliquary.Level.Value) switch
         {
             (QualityType.QUALITY_ORANGE, > 20U) => 5,
             (QualityType.QUALITY_ORANGE, > 16U) => 4,
@@ -111,8 +123,18 @@ internal sealed class SummaryReliquaryFactory
             info.Value += subAffix.Value;
         }
 
-        HutaoException.ThrowIf(infos.Count > 4, "无效的圣遗物数据");
-        return infos.SelectList(info => info.ToReliquaryComposedSubProperty());
+        if (infos.Count > 4)
+        {
+            ThrowHelper.InvalidOperation("无效的圣遗物数据");
+        }
+
+        List<ReliquaryComposedSubProperty> results = [];
+        foreach (ref readonly SummaryReliquarySubPropertyCompositionInfo info in CollectionsMarshal.AsSpan(infos))
+        {
+            results.Add(info.ToReliquaryComposedSubProperty());
+        }
+
+        return results;
     }
 
     private float ScoreReliquary(FightProperty property, MetadataReliquary reliquary, ReliquaryMainAffixLevel relicLevel, List<ReliquarySubProperty> subProperties)
@@ -124,7 +146,7 @@ internal sealed class SummaryReliquaryFactory
             // 从喵插件抓取的圣遗物评分权重
             // 部分复杂的角色暂时使用了默认值
             ReliquaryAffixWeight affixWeight = metadataContext.IdReliquaryAffixWeightMap.GetValueOrDefault(avatarInfo.AvatarId, ReliquaryAffixWeight.Default);
-            ReliquaryMainAffixLevel? maxRelicLevel = metadataContext.ReliquaryMainAffixLevels.Where(r => r.Rank == reliquary.RankLevel).MaxBy(r => r.Level);
+            ReliquaryMainAffixLevel? maxRelicLevel = metadataContext.ReliquaryLevels.Where(r => r.Rank == reliquary.RankLevel).MaxBy(r => r.Level);
             ArgumentNullException.ThrowIfNull(maxRelicLevel);
 
             float percent = relicLevel.PropertyMap[property] / maxRelicLevel.PropertyMap[property];
@@ -148,42 +170,42 @@ internal sealed class SummaryReliquaryFactory
         FightProperty property = affix.Type;
 
         return new(property, FightPropertyFormat.FormatValue(property, affix.Value), ScoreSubAffix(appendPropId));
+    }
 
-        float ScoreSubAffix(in ReliquarySubAffixId appendId)
+    private float ScoreSubAffix(in ReliquarySubAffixId appendId)
+    {
+        ReliquarySubAffix affix = metadataContext.IdReliquarySubAffixMap[appendId];
+
+        ReliquaryAffixWeight affixWeight = metadataContext.IdReliquaryAffixWeightMap.GetValueOrDefault(avatarInfo.AvatarId, ReliquaryAffixWeight.Default);
+        float weight = affixWeight[affix.Type] / 100F;
+
+        // 数字词条，转换到等效百分比计算
+        if (affix.Type is FightProperty.FIGHT_PROP_HP or FightProperty.FIGHT_PROP_ATTACK or FightProperty.FIGHT_PROP_DEFENSE)
         {
-            ReliquarySubAffix affix = metadataContext.IdReliquarySubAffixMap[appendId];
+            // 等效百分比 [ 当前小字词条 / 角色基本属性 ]
+            float equalPercent = affix.Value / avatarInfo.FightPropMap[affix.Type - 1];
 
-            ReliquaryAffixWeight affixWeight = metadataContext.IdReliquaryAffixWeightMap.GetValueOrDefault(avatarInfo.AvatarId, ReliquaryAffixWeight.Default);
-            float weight = affixWeight[affix.Type] / 100F;
+            // 获取对应百分比词条权重
+            weight = affixWeight[affix.Type + 1] / 100F;
 
-            // 数字词条，转换到等效百分比计算
-            if (affix.Type is FightProperty.FIGHT_PROP_HP or FightProperty.FIGHT_PROP_ATTACK or FightProperty.FIGHT_PROP_DEFENSE)
-            {
-                // 等效百分比 [ 当前小字词条 / 角色基本属性 ]
-                float equalPercent = affix.Value / avatarInfo.FightPropMap[affix.Type - 1];
+            // 最大同属性百分比Id
+            // 第四五位是战斗属性位
+            // 小字的加成词条在十位加一后即变换为百分比词条
+            ReliquarySubAffixId maxPercentAffixId = SummaryHelper.GetAffixMaxId(appendId + 10U);
 
-                // 获取对应百分比词条权重
-                weight = affixWeight[affix.Type + 1] / 100F;
+            // 最大同属性百分比数值
+            ReliquarySubAffix maxPercentAffix = metadataContext.IdReliquarySubAffixMap[maxPercentAffixId];
+            Must.Argument(
+                maxPercentAffix.Type
+                is FightProperty.FIGHT_PROP_HP_PERCENT
+                or FightProperty.FIGHT_PROP_ATTACK_PERCENT
+                or FightProperty.FIGHT_PROP_DEFENSE_PERCENT,
+                "ReliquarySubAffix transform failed");
+            float equalScore = equalPercent / maxPercentAffix.Value;
 
-                // 最大同属性百分比Id
-                // 第四五位是战斗属性位
-                // 小字的加成词条在十位加一后即变换为百分比词条
-                ReliquarySubAffixId maxPercentAffixId = SummaryHelper.GetAffixMaxId(appendId + 10U);
-
-                // 最大同属性百分比数值
-                ReliquarySubAffix maxPercentAffix = metadataContext.IdReliquarySubAffixMap[maxPercentAffixId];
-                HutaoException.ThrowIfNot(
-                    maxPercentAffix.Type
-                    is FightProperty.FIGHT_PROP_HP_PERCENT
-                    or FightProperty.FIGHT_PROP_ATTACK_PERCENT
-                    or FightProperty.FIGHT_PROP_DEFENSE_PERCENT,
-                    "ReliquarySubAffix transform failed");
-                float equalScore = equalPercent / maxPercentAffix.Value;
-
-                return weight * equalScore * 100;
-            }
-
-            return weight * SummaryHelper.GetPercentSubAffixScore(appendId);
+            return weight * equalScore * 100;
         }
+
+        return weight * SummaryHelper.GetPercentSubAffixScore(appendId);
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/IAvatarInfoDbService.cs

@@ -1,18 +1,17 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Service.Abstraction;
 using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo;
 
 namespace Snap.Hutao.Service.AvatarInfo;
 
-internal interface IAvatarInfoDbService : IAppDbService<EntityAvatarInfo>
+internal interface IAvatarInfoDbService
 {
     void RemoveAvatarInfoRangeByUid(string uid);
 
     List<EntityAvatarInfo> GetAvatarInfoListByUid(string uid);
 
-    ValueTask<List<EntityAvatarInfo>> GetAvatarInfoListByUidAsync(string uid, CancellationToken token = default);
+    ValueTask<List<EntityAvatarInfo>> GetAvatarInfoListByUidAsync(string uid);
 
-    ValueTask RemoveAvatarInfoRangeByUidAsync(string uid, CancellationToken token = default);
+    ValueTask RemoveAvatarInfoRangeByUidAsync(string uid);
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Transformer/CalculateAvatarDetailAvatarInfoTransformer.cs

@@ -14,7 +14,7 @@ namespace Snap.Hutao.Service.AvatarInfo.Transformer;
 internal sealed class CalculateAvatarDetailAvatarInfoTransformer : IAvatarInfoTransformer<AvatarDetail>
 {
     /// <inheritdoc/>
-    public void Transform(ref readonly Web.Enka.Model.AvatarInfo avatarInfo, AvatarDetail source)
+    public void Transform(ref Web.Enka.Model.AvatarInfo avatarInfo, AvatarDetail source)
     {
         // update skills
         avatarInfo.SkillLevelMap = source.SkillList.ToDictionary(s => (SkillId)s.Id, s => (SkillLevel)s.LevelCurrent);

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Transformer/GameRecordCharacterAvatarInfoTransformer.cs

@@ -15,7 +15,7 @@ namespace Snap.Hutao.Service.AvatarInfo.Transformer;
 internal sealed class GameRecordCharacterAvatarInfoTransformer : IAvatarInfoTransformer<Character>
 {
     /// <inheritdoc/>
-    public void Transform(ref readonly Web.Enka.Model.AvatarInfo avatarInfo, Character source)
+    public void Transform(ref Web.Enka.Model.AvatarInfo avatarInfo, Character source)
     {
         // update fetter
         avatarInfo.FetterInfo ??= new();

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Transformer/IAvatarInfoTransformer.cs

@@ -15,5 +15,5 @@ internal interface IAvatarInfoTransformer<in TSource>
     /// </summary>
     /// <param name="avatarInfo">基底，角色Id必定存在</param>
     /// <param name="source">源</param>
-    void Transform(ref readonly Web.Enka.Model.AvatarInfo avatarInfo, TSource source);
+    void Transform(ref Web.Enka.Model.AvatarInfo avatarInfo, TSource source);
 }

src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs

@@ -46,17 +46,11 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient<U
         {
             DailyNoteEntry newEntry = DailyNoteEntry.From(userAndUid);
 
-            Web.Response.Response<WebDailyNote> dailyNoteResponse;
-            using (IServiceScope scope = serviceProvider.CreateScope())
-            {
-                IGameRecordClient gameRecordClient = scope.ServiceProvider
-                    .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
-                    .Create(PlayerUid.IsOversea(roleUid));
-
-                dailyNoteResponse = await gameRecordClient
-                    .GetDailyNoteAsync(userAndUid)
-                    .ConfigureAwait(false);
-            }
+            Web.Response.Response<WebDailyNote> dailyNoteResponse = await serviceProvider
+                .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
+                .Create(PlayerUid.IsOversea(roleUid))
+                .GetDailyNoteAsync(userAndUid)
+                .ConfigureAwait(false);
 
             if (dailyNoteResponse.IsOk())
             {
@@ -123,17 +117,11 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient<U
                 continue;
             }
 
-            Web.Response.Response<WebDailyNote> dailyNoteResponse;
-            using (IServiceScope scope = serviceProvider.CreateScope())
-            {
-                IGameRecordClient gameRecordClient = serviceProvider
-                    .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
-                    .Create(PlayerUid.IsOversea(entry.Uid));
-
-                dailyNoteResponse = await gameRecordClient
-                    .GetDailyNoteAsync(new(entry.User, entry.Uid))
-                    .ConfigureAwait(false);
-            }
+            Web.Response.Response<WebDailyNote> dailyNoteResponse = await serviceProvider
+                .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
+                .Create(PlayerUid.IsOversea(entry.Uid))
+                .GetDailyNoteAsync(new(entry.User, entry.Uid))
+                .ConfigureAwait(false);
 
             if (dailyNoteResponse.IsOk())
             {

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs

@@ -26,22 +26,15 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
 {
     private static readonly FrozenSet<uint> BlueStandardWeaponIdsSet = FrozenSet.ToFrozenSet(
     [
-        11301U, 11302U, 11306U,
-        12301U, 12302U, 12305U,
-        13303U,
-        14301U, 14302U, 14304U,
-        15301U, 15302U, 15304U
+        11301U, 11302U, 11306U, 12301U, 12302U, 12305U, 13303U, 14301U, 14302U, 14304U, 15301U, 15302U, 15304U
     ]);
 
     private static readonly FrozenSet<uint> PurpleStandardWeaponIdsSet = FrozenSet.ToFrozenSet(
     [
-        11401U, 11402U, 11403U, 11405U,
-        12401U, 12402U, 12403U, 12405U,
-        13401U, 13407U,
-        14401U, 14402U, 14403U, 14409U,
-        15401U, 15402U, 15403U, 15405U
+        11401U, 11402U, 11403U, 11405U, 12401U, 12402U, 12403U, 12405U, 13401U, 13407U, 14401U, 14402U, 14403U, 14409U, 15401U, 15402U, 15403U, 15405U
     ]);
 
+    private readonly IMetadataService metadataService;
     private readonly HomaGachaLogClient homaGachaLogClient;
     private readonly ITaskContext taskContext;
     private readonly AppOptions options;
@@ -52,7 +45,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         await taskContext.SwitchToBackgroundAsync();
 
         List<HistoryWishBuilder> historyWishBuilders = context.GachaEvents.SelectList(gachaEvent => new HistoryWishBuilder(gachaEvent, context));
-        return CreateCore(taskContext, homaGachaLogClient, items, historyWishBuilders, context, options);
+        return CreateCore(taskContext, homaGachaLogClient, items, historyWishBuilders, context, options.IsEmptyHistoryWishVisible, options.IsNeverHeldStatisticsItemVisible);
     }
 
     private static GachaStatistics CreateCore(
@@ -61,7 +54,8 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         List<Model.Entity.GachaItem> items,
         List<HistoryWishBuilder> historyWishBuilders,
         in GachaLogServiceMetadataContext context,
-        AppOptions appOptions)
+        bool isEmptyHistoryWishVisible,
+        bool isNeverHeldStatisticsItemVisible)
     {
         TypedWishSummaryBuilderContext standardContext = TypedWishSummaryBuilderContext.StandardWish(taskContext, gachaLogClient);
         TypedWishSummaryBuilder standardWishBuilder = new(standardContext);
@@ -81,7 +75,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         Dictionary<Weapon, int> purpleWeaponCounter = [];
         Dictionary<Weapon, int> blueWeaponCounter = [];
 
-        if (appOptions.IsUnobtainedWishItemVisible)
+        if (isNeverHeldStatisticsItemVisible)
         {
             orangeAvatarCounter = context.IdAvatarMap.Values
                 .Where(avatar => avatar.Quality == QualityType.QUALITY_ORANGE)
@@ -206,7 +200,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         {
             // history
             HistoryWishes = historyWishBuilders
-                .Where(b => appOptions.IsEmptyHistoryWishVisible || (!b.IsEmpty))
+                .Where(b => isEmptyHistoryWishVisible || (!b.IsEmpty))
                 .OrderByDescending(builder => builder.From)
                 .ThenBy(builder => builder.ConfigType, GachaTypeComparer.Shared)
                 .Select(builder => builder.ToHistoryWish())

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/HutaoStatisticsFactory.cs

@@ -19,7 +19,7 @@ internal sealed class HutaoStatisticsFactory
     private readonly GachaEvent avatarEvent;
     private readonly GachaEvent avatarEvent2;
     private readonly GachaEvent weaponEvent;
-    private readonly GachaEvent? chronicledEvent;
+    private readonly GachaEvent chronicledEvent;
 
     public HutaoStatisticsFactory(in HutaoStatisticsFactoryMetadataContext context)
     {
@@ -32,7 +32,7 @@ internal sealed class HutaoStatisticsFactory
         avatarEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityAvatar);
         avatarEvent2 = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.SpecialActivityAvatar);
         weaponEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityWeapon);
-        chronicledEvent = context.GachaEvents.SingleOrDefault(g => g.From < now && g.To > now && g.Type == GachaType.ActivityCity);
+        chronicledEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityCity);
     }
 
     public HutaoStatistics Create(GachaEventStatistics raw)
@@ -42,7 +42,7 @@ internal sealed class HutaoStatisticsFactory
             AvatarEvent = CreateWishSummary(avatarEvent, raw.AvatarEvent),
             AvatarEvent2 = CreateWishSummary(avatarEvent2, raw.AvatarEvent2),
             WeaponEvent = CreateWishSummary(weaponEvent, raw.WeaponEvent),
-            Chronicled = chronicledEvent is null ? null : CreateWishSummary(chronicledEvent, raw.Chronicled),
+            Chronicled = CreateWishSummary(chronicledEvent, raw.Chronicled),
         };
     }
 

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsAddress.cs

@@ -19,12 +19,12 @@ internal static class GameFpsAddress
     public static unsafe void UnsafeFindFpsAddress(GameFpsUnlockerContext state, in RequiredGameModule requiredGameModule)
     {
         bool readOk = UnsafeReadModulesMemory(state.GameProcess, requiredGameModule, out VirtualMemory localMemory);
-        HutaoException.ThrowIfNot(readOk, SH.ServiceGameUnlockerReadModuleMemoryCopyVirtualMemoryFailed);
+        HutaoException.ThrowIfNot(readOk, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerReadModuleMemoryCopyVirtualMemoryFailed);
 
         using (localMemory)
         {
             int offset = IndexOfPattern(localMemory.AsSpan()[(int)requiredGameModule.UnityPlayer.Size..]);
-            HutaoException.ThrowIfNot(offset >= 0, SH.ServiceGameUnlockerInterestedPatternNotFound);
+            HutaoException.ThrowIfNot(offset >= 0, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerInterestedPatternNotFound);
 
             byte* pLocalMemory = (byte*)localMemory.Pointer;
             ref readonly Module unityPlayer = ref requiredGameModule.UnityPlayer;
@@ -76,7 +76,7 @@ internal static class GameFpsAddress
     {
         value = 0;
         bool result = ReadProcessMemory((HANDLE)process.Handle, (void*)baseAddress, ref value, out _);
-        HutaoException.ThrowIfNot(result, SH.ServiceGameUnlockerReadProcessMemoryPointerAddressFailed);
+        HutaoException.ThrowIfNot(result, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerReadProcessMemoryPointerAddressFailed);
         return result;
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs

@@ -30,10 +30,10 @@ internal sealed class GameFpsUnlocker : IGameFpsUnlocker
     /// <inheritdoc/>
     public async ValueTask<bool> UnlockAsync(CancellationToken token = default)
     {
-        HutaoException.ThrowIfNot(context.IsUnlockerValid, "This Unlocker is invalid");
+        HutaoException.ThrowIfNot(context.IsUnlockerValid, HutaoExceptionKind.GameFpsUnlockingFailed, "This Unlocker is invalid");
         (FindModuleResult result, RequiredGameModule gameModule) = await GameProcessModule.FindModuleAsync(context).ConfigureAwait(false);
-        HutaoException.ThrowIfNot(result != FindModuleResult.TimeLimitExeeded, SH.ServiceGameUnlockerFindModuleTimeLimitExeeded);
-        HutaoException.ThrowIfNot(result != FindModuleResult.NoModuleFound, SH.ServiceGameUnlockerFindModuleNoModuleFound);
+        HutaoException.ThrowIfNot(result != FindModuleResult.TimeLimitExeeded, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerFindModuleTimeLimitExeeded);
+        HutaoException.ThrowIfNot(result != FindModuleResult.NoModuleFound, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerFindModuleNoModuleFound);
 
         GameFpsAddress.UnsafeFindFpsAddress(context, gameModule);
         context.Report();

src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoAsAService.cs

@@ -17,7 +17,7 @@ namespace Snap.Hutao.Service.Hutao;
 internal sealed partial class HutaoAsAService : IHutaoAsAService
 {
     private const int AnnouncementDuration = 30;
-    private readonly IServiceScopeFactory serviceScopeFactory;
+    private readonly HutaoAsAServiceClient hutaoAsServiceClient;
 
     private ObservableCollection<HutaoAnnouncement>? announcements;
 
@@ -29,13 +29,7 @@ internal sealed partial class HutaoAsAService : IHutaoAsAService
 
             ApplicationDataCompositeValue excludedIds = LocalSetting.Get(SettingKeys.ExcludedAnnouncementIds, new ApplicationDataCompositeValue());
             List<long> data = excludedIds.Select(kvp => long.Parse(kvp.Key, CultureInfo.InvariantCulture)).ToList();
-
-            Response<List<HutaoAnnouncement>> response;
-            using (IServiceScope scope = serviceScopeFactory.CreateScope())
-            {
-                HutaoAsAServiceClient hutaoAsAServiceClient = scope.ServiceProvider.GetRequiredService<HutaoAsAServiceClient>();
-                response = await hutaoAsAServiceClient.GetAnnouncementListAsync(data, token).ConfigureAwait(false);
-            }
+            Response<List<HutaoAnnouncement>> response = await hutaoAsServiceClient.GetAnnouncementListAsync(data, token).ConfigureAwait(false);
 
             if (response.IsOk())
             {

src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs

@@ -15,7 +15,7 @@ internal sealed partial class HutaoUserService : IHutaoUserService, IHutaoUserSe
 {
     private readonly TaskCompletionSource initializeCompletionSource = new();
 
-    private readonly IServiceScopeFactory serviceScopeFactory;
+    private readonly HutaoPassportClient passportClient;
     private readonly ITaskContext taskContext;
     private readonly HutaoUserOptions options;
 
@@ -40,25 +40,20 @@ internal sealed partial class HutaoUserService : IHutaoUserService, IHutaoUserSe
         }
         else
         {
-            using (IServiceScope scope = serviceScopeFactory.CreateScope())
+            Web.Response.Response<string> response = await passportClient.LoginAsync(userName, password, token).ConfigureAwait(false);
+
+            if (response.IsOk())
             {
-                HutaoPassportClient hutaoPassportClient = scope.ServiceProvider.GetRequiredService<HutaoPassportClient>();
-
-                Web.Response.Response<string> response = await hutaoPassportClient.LoginAsync(userName, password, token).ConfigureAwait(false);
-
-                if (response.IsOk())
+                if (await options.PostLoginSucceedAsync(passportClient, taskContext, userName, password, response.Data).ConfigureAwait(false))
                 {
-                    if (await options.PostLoginSucceedAsync(hutaoPassportClient, taskContext, userName, password, response.Data).ConfigureAwait(false))
-                    {
-                        isInitialized = true;
-                    }
-                }
-                else
-                {
-                    await taskContext.SwitchToMainThreadAsync();
-                    options.PostLoginFailed();
+                    isInitialized = true;
                 }
             }
+            else
+            {
+                await taskContext.SwitchToMainThreadAsync();
+                options.PostLoginFailed();
+            }
         }
 
         initializeCompletionSource.TrySetResult();

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdAchievementSource.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdAchievementSource
-{
-    public Dictionary<AchievementId, Model.Metadata.Achievement.Achievement> IdAchievementMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdReliquaryAffixWeightSource.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdReliquaryAffixWeightSource
-{
-    public Dictionary<AvatarId, ReliquaryAffixWeight> IdReliquaryAffixWeightMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdReliquaryMainPropertySource.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdReliquaryMainPropertySource
-{
-    public Dictionary<ReliquaryMainAffixId, FightProperty> IdReliquaryMainPropertyMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdReliquarySource.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdReliquarySource
-{
-    public Dictionary<ReliquaryId, Reliquary> IdReliquaryMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdReliquarySubAffixSource.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdReliquarySubAffixSource
-{
-    public Dictionary<ReliquarySubAffixId, ReliquarySubAffix> IdReliquarySubAffixMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataListAchievementSource.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataListAchievementSource
-{
-    public List<Model.Metadata.Achievement.Achievement> Achievements { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataListReliquaryMainAffixLevelSource.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataListReliquaryMainAffixLevelSource
-{
-    public List<ReliquaryMainAffixLevel> ReliquaryMainAffixLevels { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataListReliquarySource.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataListReliquarySource
-{
-    public List<Reliquary> Reliquaries { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Model.Metadata.Weapon;
@@ -19,39 +18,19 @@ internal static class MetadataServiceContextExtension
 
         // List
         {
-            if (context is IMetadataListAchievementSource listAchievementSource)
+            if (context is IMetadataListMaterialSource listMaterialSource)
             {
-                listAchievementSource.Achievements = await metadataService.GetAchievementListAsync(token).ConfigureAwait(false);
+                listMaterialSource.Materials = await metadataService.GetMaterialListAsync(token).ConfigureAwait(false);
             }
 
             if (context is IMetadataListGachaEventSource listGachaEventSource)
             {
                 listGachaEventSource.GachaEvents = await metadataService.GetGachaEventListAsync(token).ConfigureAwait(false);
             }
-
-            if (context is IMetadataListMaterialSource listMaterialSource)
-            {
-                listMaterialSource.Materials = await metadataService.GetMaterialListAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataListReliquaryMainAffixLevelSource listReliquaryMainAffixLevelSource)
-            {
-                listReliquaryMainAffixLevelSource.ReliquaryMainAffixLevels = await metadataService.GetReliquaryMainAffixLevelListAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataListReliquarySource listReliquarySource)
-            {
-                listReliquarySource.Reliquaries = await metadataService.GetReliquaryListAsync(token).ConfigureAwait(false);
-            }
         }
 
         // Dictionary
         {
-            if (context is IMetadataDictionaryIdAchievementSource dictionaryIdAchievementSource)
-            {
-                dictionaryIdAchievementSource.IdAchievementMap = await metadataService.GetIdToAchievementMapAsync(token).ConfigureAwait(false);
-            }
-
             if (context is IMetadataDictionaryIdAvatarSource dictionaryIdAvatarSource)
             {
                 dictionaryIdAvatarSource.IdAvatarMap = await metadataService.GetIdToAvatarMapAsync(token).ConfigureAwait(false);
@@ -62,26 +41,6 @@ internal static class MetadataServiceContextExtension
                 dictionaryIdMaterialSource.IdMaterialMap = await metadataService.GetIdToMaterialMapAsync(token).ConfigureAwait(false);
             }
 
-            if (context is IMetadataDictionaryIdReliquarySource dictionaryIdReliquarySource)
-            {
-                dictionaryIdReliquarySource.IdReliquaryMap = await metadataService.GetIdToReliquaryMapAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataDictionaryIdReliquaryAffixWeightSource dictionaryIdReliquaryAffixWeightSource)
-            {
-                dictionaryIdReliquaryAffixWeightSource.IdReliquaryAffixWeightMap = await metadataService.GetIdToReliquaryAffixWeightMapAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataDictionaryIdReliquaryMainPropertySource dictionaryIdReliquaryMainPropertySource)
-            {
-                dictionaryIdReliquaryMainPropertySource.IdReliquaryMainPropertyMap = await metadataService.GetIdToReliquaryMainPropertyMapAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataDictionaryIdReliquarySubAffixSource dictionaryIdReliquarySubAffixSource)
-            {
-                dictionaryIdReliquarySubAffixSource.IdReliquarySubAffixMap = await metadataService.GetIdToReliquarySubAffixMapAsync(token).ConfigureAwait(false);
-            }
-
             if (context is IMetadataDictionaryIdWeaponSource dictionaryIdWeaponSource)
             {
                 dictionaryIdWeaponSource.IdWeaponMap = await metadataService.GetIdToWeaponMapAsync(token).ConfigureAwait(false);

src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataService.cs

@@ -6,7 +6,6 @@ using Snap.Hutao.Core;
 using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
 using Snap.Hutao.Core.Diagnostics;
 using Snap.Hutao.Core.ExceptionService;
-using Snap.Hutao.Core.IO;
 using Snap.Hutao.Core.IO.Hashing;
 using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Service.Notification;
@@ -30,12 +29,12 @@ internal sealed partial class MetadataService : IMetadataService, IMetadataServi
 
     private readonly TaskCompletionSource initializeCompletionSource = new();
 
-    private readonly IServiceScopeFactory serviceScopeFactory;
     private readonly ILogger<MetadataService> logger;
     private readonly MetadataOptions metadataOptions;
     private readonly IInfoBarService infoBarService;
     private readonly JsonSerializerOptions options;
     private readonly IMemoryCache memoryCache;
+    private readonly HttpClient httpClient;
 
     private bool isInitialized;
 
@@ -86,7 +85,7 @@ internal sealed partial class MetadataService : IMetadataService, IMetadataServi
         else
         {
             FileNotFoundException exception = new(SH.ServiceMetadataFileNotFound, fileName);
-            throw HutaoException.Throw(SH.ServiceMetadataFileNotFound, exception);
+            throw ThrowHelper.UserdataCorrupted(SH.ServiceMetadataFileNotFound, exception);
         }
     }
 
@@ -120,17 +119,10 @@ internal sealed partial class MetadataService : IMetadataService, IMetadataServi
         Dictionary<string, string>? metadataFileHashs;
         try
         {
-            using (IServiceScope scope = serviceScopeFactory.CreateScope())
-            {
-                IHttpClientFactory httpClientFactory = scope.ServiceProvider.GetRequiredService<IHttpClientFactory>();
-                using (HttpClient httpClient = httpClientFactory.CreateClient(nameof(MetadataService)))
-                {
-                    // Download meta check file
-                    metadataFileHashs = await httpClient
-                        .GetFromJsonAsync<Dictionary<string, string>>(metadataOptions.GetLocalizedRemoteFile(MetaFileName), options, token)
-                        .ConfigureAwait(false);
-                }
-            }
+            // download meta check file
+            metadataFileHashs = await httpClient
+                .GetFromJsonAsync<Dictionary<string, string>>(metadataOptions.GetLocalizedRemoteFile(MetaFileName), options, token)
+                .ConfigureAwait(false);
 
             if (metadataFileHashs is null)
             {
@@ -184,28 +176,23 @@ internal sealed partial class MetadataService : IMetadataService, IMetadataServi
 
     private async ValueTask DownloadMetadataSourceFilesAsync(string fileFullName, CancellationToken token)
     {
-        Stream sourceStream;
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
-        {
-            IHttpClientFactory httpClientFactory = scope.ServiceProvider.GetRequiredService<IHttpClientFactory>();
-            using (HttpClient httpClient = httpClientFactory.CreateClient(nameof(MetadataService)))
-            {
-                sourceStream = await httpClient
-                    .GetStreamAsync(metadataOptions.GetLocalizedRemoteFile(fileFullName), token)
-                    .ConfigureAwait(false);
-            }
-        }
+        Stream sourceStream = await httpClient
+            .GetStreamAsync(metadataOptions.GetLocalizedRemoteFile(fileFullName), token)
+            .ConfigureAwait(false);
 
         // Write stream while convert LF to CRLF
-        using (StreamReaderWriter readerWriter = new(new(sourceStream), File.CreateText(metadataOptions.GetLocalizedLocalFile(fileFullName))))
+        using (StreamReader streamReader = new(sourceStream))
         {
-            while (await readerWriter.ReadLineAsync(token).ConfigureAwait(false) is { } line)
+            using (StreamWriter streamWriter = File.CreateText(metadataOptions.GetLocalizedLocalFile(fileFullName)))
             {
-                await readerWriter.WriteAsync(line).ConfigureAwait(false);
-
-                if (!readerWriter.Reader.EndOfStream)
+                while (await streamReader.ReadLineAsync(token).ConfigureAwait(false) is { } line)
                 {
-                    await readerWriter.WriteAsync(StringLiterals.CRLF).ConfigureAwait(false);
+                    await streamWriter.WriteAsync(line).ConfigureAwait(false);
+
+                    if (!streamReader.EndOfStream)
+                    {
+                        await streamWriter.WriteAsync(StringLiterals.CRLF).ConfigureAwait(false);
+                    }
                 }
             }
         }

src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataServiceDictionaryExtension.cs

@@ -25,12 +25,22 @@ internal static class MetadataServiceDictionaryExtension
 
     public static ValueTask<Dictionary<ExtendedEquipAffixId, ReliquarySet>> GetExtendedEquipAffixIdToReliquarySetMapAsync(this IMetadataService metadataService, CancellationToken token = default)
     {
-        return metadataService.FromCacheAsDictionaryAsync(FileNameReliquarySet, (List<ReliquarySet> list) => list.SelectMany(set => set.EquipAffixIds, (set, id) => (Id: id, Set: set)), token);
+        return metadataService.FromCacheAsDictionaryAsync<ReliquarySet, (ExtendedEquipAffixId Id, ReliquarySet Set), ExtendedEquipAffixId, ReliquarySet>(
+            FileNameReliquarySet,
+            list => list.SelectMany(set => set.EquipAffixIds.Select(id => (Id: id, Set: set))),
+            tuple => tuple.Id,
+            tuple => tuple.Set,
+            token);
     }
 
     public static ValueTask<Dictionary<TowerLevelGroupId, List<TowerLevel>>> GetGroupIdToTowerLevelGroupMapAsync(this IMetadataService metadataService, CancellationToken token = default)
     {
-        return metadataService.FromCacheAsDictionaryAsync(FileNameTowerLevel, (List<TowerLevel> list) => list.GroupBy(l => l.GroupId), g => g.Key, g => g.ToList(), token);
+        return metadataService.FromCacheAsDictionaryAsync<TowerLevel, IGrouping<TowerLevelGroupId, TowerLevel>, TowerLevelGroupId, List<TowerLevel>>(
+            FileNameTowerLevel,
+            list => list.GroupBy(l => l.GroupId),
+            g => g.Key,
+            g => g.ToList(),
+            token);
     }
 
     public static ValueTask<Dictionary<AchievementId, Model.Metadata.Achievement.Achievement>> GetIdToAchievementMapAsync(this IMetadataService metadataService, CancellationToken token = default)
@@ -71,11 +81,6 @@ internal static class MetadataServiceDictionaryExtension
         return metadataService.FromCacheAsDictionaryAsync<MaterialId, Material>(FileNameMaterial, a => a.Id, token);
     }
 
-    public static ValueTask<Dictionary<ReliquaryId, Reliquary>> GetIdToReliquaryMapAsync(this IMetadataService metadataService, CancellationToken token = default)
-    {
-        return metadataService.FromCacheAsDictionaryAsync(FileNameReliquary, (List<Reliquary> list) => list.SelectMany(r => r.Ids, (r, i) => (Index: i, Reliquary: r)), token);
-    }
-
     public static ValueTask<Dictionary<AvatarId, ReliquaryAffixWeight>> GetIdToReliquaryAffixWeightMapAsync(this IMetadataService metadataService, CancellationToken token = default)
     {
         return metadataService.FromCacheAsDictionaryAsync<AvatarId, ReliquaryAffixWeight>(FileNameReliquaryAffixWeight, r => r.AvatarId, token);
@@ -172,12 +177,6 @@ internal static class MetadataServiceDictionaryExtension
         return metadataService.MemoryCache.Set(cacheKey, dict);
     }
 
-    private static ValueTask<Dictionary<TKey, TValue>> FromCacheAsDictionaryAsync<TData, TKey, TValue>(this IMetadataService metadataService, string fileName, Func<List<TData>, IEnumerable<(TKey Key, TValue Value)>> listSelector, CancellationToken token)
-        where TKey : notnull
-    {
-        return FromCacheAsDictionaryAsync(metadataService, fileName, listSelector, kvp => kvp.Key, kvp => kvp.Value, token);
-    }
-
     private static async ValueTask<Dictionary<TKey, TValue>> FromCacheAsDictionaryAsync<TData, TMiddle, TKey, TValue>(this IMetadataService metadataService, string fileName, Func<List<TData>, IEnumerable<TMiddle>> listSelector, Func<TMiddle, TKey> keySelector, Func<TMiddle, TValue> valueSelector, CancellationToken token)
         where TKey : notnull
     {

src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataServiceListExtension.cs

@@ -80,7 +80,7 @@ internal static class MetadataServiceListExtension
         return metadataService.FromCacheOrFileAsync<List<ReliquaryMainAffix>>(FileNameReliquaryMainAffix, token);
     }
 
-    public static ValueTask<List<ReliquaryMainAffixLevel>> GetReliquaryMainAffixLevelListAsync(this IMetadataService metadataService, CancellationToken token = default)
+    public static ValueTask<List<ReliquaryMainAffixLevel>> GetReliquaryLevelListAsync(this IMetadataService metadataService, CancellationToken token = default)
     {
         return metadataService.FromCacheOrFileAsync<List<ReliquaryMainAffixLevel>>(FileNameReliquaryMainAffixLevel, token);
     }

src/Snap.Hutao/Snap.Hutao/Service/SignIn/SignInService.cs

@@ -16,22 +16,31 @@ internal sealed partial class SignInService : ISignInService
 
     public async ValueTask<ValueResult<bool, string>> ClaimRewardAsync(UserAndUid userAndUid, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
+        ISignInClient signInClient = serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<ISignInClient>>()
+            .Create(userAndUid.User.IsOversea);
+
+        Response<Reward> rewardResponse = await signInClient.GetRewardAsync(userAndUid.User, token).ConfigureAwait(false);
+
+        if (rewardResponse.IsOk())
         {
-            ISignInClient signInClient = scope.ServiceProvider
-                .GetRequiredService<IOverseaSupportFactory<ISignInClient>>()
-                .Create(userAndUid.User.IsOversea);
-
-            Response<Reward> rewardResponse = await signInClient.GetRewardAsync(userAndUid.User, token).ConfigureAwait(false);
-
-            if (!rewardResponse.IsOk())
-            {
-                return new(false, SH.ServiceSignInRewardListRequestFailed);
-            }
-
             Response<SignInResult> resultResponse = await signInClient.SignAsync(userAndUid, token).ConfigureAwait(false);
 
-            if (!resultResponse.IsOk(showInfoBar: false))
+            if (resultResponse.IsOk(showInfoBar: false))
+            {
+                Response<SignInRewardInfo> infoResponse = await signInClient.GetInfoAsync(userAndUid, token).ConfigureAwait(false);
+                if (infoResponse.IsOk())
+                {
+                    int index = infoResponse.Data.TotalSignDay - 1;
+                    Award award = rewardResponse.Data.Awards[index];
+                    return new(true, SH.FormatServiceSignInSuccessRewardFormat(award.Name, award.Count));
+                }
+                else
+                {
+                    return new(false, SH.ServiceSignInInfoRequestFailed);
+                }
+            }
+            else
             {
                 string message = resultResponse.Message;
 
@@ -47,16 +56,10 @@ internal sealed partial class SignInService : ISignInService
 
                 return new(false, SH.FormatServiceSignInClaimRewardFailedFormat(message));
             }
-
-            Response<SignInRewardInfo> infoResponse = await signInClient.GetInfoAsync(userAndUid, token).ConfigureAwait(false);
-            if (!infoResponse.IsOk())
-            {
-                return new(false, SH.ServiceSignInInfoRequestFailed);
-            }
-
-            int index = infoResponse.Data.TotalSignDay - 1;
-            Award award = rewardResponse.Data.Awards[index];
-            return new(true, SH.FormatServiceSignInSuccessRewardFormat(award.Name, award.Count));
+        }
+        else
+        {
+            return new(false, SH.ServiceSignInRewardListRequestFailed);
         }
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs

@@ -21,9 +21,8 @@ namespace Snap.Hutao.Service.SpiralAbyss;
 [Injection(InjectAs.Scoped, typeof(ISpiralAbyssRecordService))]
 internal sealed partial class SpiralAbyssRecordService : ISpiralAbyssRecordService
 {
-    //private readonly IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory;
+    private readonly IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory;
     private readonly ISpiralAbyssRecordDbService spiralAbyssRecordDbService;
-    private readonly IServiceScopeFactory serviceScopeFactory;
     private readonly IMetadataService metadataService;
     private readonly ITaskContext taskContext;
 
@@ -77,69 +76,54 @@ internal sealed partial class SpiralAbyssRecordService : ISpiralAbyssRecordServi
     /// <inheritdoc/>
     public async ValueTask RefreshSpiralAbyssAsync(UserAndUid userAndUid)
     {
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
-        {
-            IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory = scope.ServiceProvider.GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>();
+        // request the index first
+        await gameRecordClientFactory
+            .Create(userAndUid.User.IsOversea)
+            .GetPlayerInfoAsync(userAndUid)
+            .ConfigureAwait(false);
 
-            // request the index first
-            await gameRecordClientFactory
-                .Create(userAndUid.User.IsOversea)
-                .GetPlayerInfoAsync(userAndUid)
-                .ConfigureAwait(false);
-
-            await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Last).ConfigureAwait(false);
-            await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Current).ConfigureAwait(false);
-        }
+        await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Last).ConfigureAwait(false);
+        await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Current).ConfigureAwait(false);
     }
 
     private async ValueTask RefreshSpiralAbyssCoreAsync(UserAndUid userAndUid, SpiralAbyssSchedule schedule)
     {
-        Response<Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss> response;
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
+        Response<Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss> response = await gameRecordClientFactory
+            .Create(userAndUid.User.IsOversea)
+            .GetSpiralAbyssAsync(userAndUid, schedule)
+            .ConfigureAwait(false);
+
+        if (response.IsOk())
         {
-            IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory = scope.ServiceProvider.GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>();
+            Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss webSpiralAbyss = response.Data;
 
-            response = await gameRecordClientFactory
-                .Create(userAndUid.User.IsOversea)
-                .GetSpiralAbyssAsync(userAndUid, schedule)
-                .ConfigureAwait(false);
+            ArgumentNullException.ThrowIfNull(spiralAbysses);
+            ArgumentNullException.ThrowIfNull(metadataContext);
+
+            int index = spiralAbysses.FirstIndexOf(s => s.ScheduleId == webSpiralAbyss.ScheduleId);
+            if (index >= 0)
+            {
+                await taskContext.SwitchToBackgroundAsync();
+                SpiralAbyssView view = spiralAbysses[index];
+
+                SpiralAbyssEntry targetEntry;
+                if (view.Entity is not null)
+                {
+                    view.Entity.SpiralAbyss = webSpiralAbyss;
+                    await spiralAbyssRecordDbService.UpdateSpiralAbyssEntryAsync(view.Entity).ConfigureAwait(false);
+                    targetEntry = view.Entity;
+                }
+                else
+                {
+                    SpiralAbyssEntry newEntry = SpiralAbyssEntry.From(userAndUid.Uid.Value, webSpiralAbyss);
+                    await spiralAbyssRecordDbService.AddSpiralAbyssEntryAsync(newEntry).ConfigureAwait(false);
+                    targetEntry = newEntry;
+                }
+
+                await taskContext.SwitchToMainThreadAsync();
+                spiralAbysses.RemoveAt(index);
+                spiralAbysses.Insert(index, SpiralAbyssView.From(targetEntry, metadataContext));
+            }
         }
-
-        if (!response.IsOk())
-        {
-            return;
-        }
-
-        Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss webSpiralAbyss = response.Data;
-
-        ArgumentNullException.ThrowIfNull(spiralAbysses);
-        ArgumentNullException.ThrowIfNull(metadataContext);
-
-        int index = spiralAbysses.FirstIndexOf(s => s.ScheduleId == webSpiralAbyss.ScheduleId);
-        if (index < 0)
-        {
-            return;
-        }
-
-        await taskContext.SwitchToBackgroundAsync();
-        SpiralAbyssView view = spiralAbysses[index];
-
-        SpiralAbyssEntry targetEntry;
-        if (view.Entity is not null)
-        {
-            view.Entity.SpiralAbyss = webSpiralAbyss;
-            await spiralAbyssRecordDbService.UpdateSpiralAbyssEntryAsync(view.Entity).ConfigureAwait(false);
-            targetEntry = view.Entity;
-        }
-        else
-        {
-            SpiralAbyssEntry newEntry = SpiralAbyssEntry.From(userAndUid.Uid.Value, webSpiralAbyss);
-            await spiralAbyssRecordDbService.AddSpiralAbyssEntryAsync(newEntry).ConfigureAwait(false);
-            targetEntry = newEntry;
-        }
-
-        await taskContext.SwitchToMainThreadAsync();
-        spiralAbysses.RemoveAt(index);
-        spiralAbysses.Insert(index, SpiralAbyssView.From(targetEntry, metadataContext));
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/User/UserFingerprintService.cs

@@ -12,7 +12,7 @@ namespace Snap.Hutao.Service.User;
 [Injection(InjectAs.Singleton, typeof(IUserFingerprintService))]
 internal sealed partial class UserFingerprintService : IUserFingerprintService
 {
-    private readonly IServiceScopeFactory serviceScopeFactory;
+    private readonly DeviceFpClient deviceFpClient;
 
     public async ValueTask TryInitializeAsync(ViewModel.User.User user, CancellationToken token = default)
     {
@@ -101,13 +101,7 @@ internal sealed partial class UserFingerprintService : IUserFingerprintService
             DeviceFp = string.IsNullOrEmpty(user.Fingerprint) ? Core.Random.GetLowerHexString(13) : user.Fingerprint,
         };
 
-        Response<DeviceFpWrapper> response;
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
-        {
-            DeviceFpClient deviceFpClient = scope.ServiceProvider.GetRequiredService<DeviceFpClient>();
-            response = await deviceFpClient.GetFingerprintAsync(data, token).ConfigureAwait(false);
-        }
-
+        Response<DeviceFpWrapper> response = await deviceFpClient.GetFingerprintAsync(data, token).ConfigureAwait(false);
         user.TryUpdateFingerprint(response.IsOk() ? response.Data.DeviceFp : string.Empty);
 
         user.NeedDbUpdateAfterResume = true;

src/Snap.Hutao/Snap.Hutao/Service/User/UserInitializationService.cs

@@ -68,7 +68,6 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             return false;
         }
 
-        // TODO: sharing scope
         if (!await TrySetUserLTokenAsync(user, token).ConfigureAwait(false))
         {
             return false;
@@ -101,17 +100,11 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             return true;
         }
 
-        Response<LTokenWrapper> lTokenResponse;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            IPassportClient passportClient = scope.ServiceProvider
-                .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
-                .Create(user.IsOversea);
-
-            lTokenResponse = await passportClient
-                .GetLTokenBySTokenAsync(user.Entity, token)
-                .ConfigureAwait(false);
-        }
+        Response<LTokenWrapper> lTokenResponse = await serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
+            .Create(user.IsOversea)
+            .GetLTokenBySTokenAsync(user.Entity, token)
+            .ConfigureAwait(false);
 
         if (lTokenResponse.IsOk())
         {
@@ -138,17 +131,11 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             }
         }
 
-        Response<UidCookieToken> cookieTokenResponse;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            IPassportClient passportClient = scope.ServiceProvider
-                .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
-                .Create(user.IsOversea);
-
-            cookieTokenResponse = await passportClient
-                .GetCookieAccountInfoBySTokenAsync(user.Entity, token)
-                .ConfigureAwait(false);
-        }
+        Response<UidCookieToken> cookieTokenResponse = await serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
+            .Create(user.IsOversea)
+            .GetCookieAccountInfoBySTokenAsync(user.Entity, token)
+            .ConfigureAwait(false);
 
         if (cookieTokenResponse.IsOk())
         {
@@ -170,17 +157,11 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
 
     private async ValueTask<bool> TrySetUserUserInfoAsync(ViewModel.User.User user, CancellationToken token)
     {
-        Response<UserFullInfoWrapper> response;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            IUserClient userClient = scope.ServiceProvider
-                .GetRequiredService<IOverseaSupportFactory<IUserClient>>()
-                .Create(user.IsOversea);
-
-            response = await userClient
-                .GetUserFullInfoAsync(user.Entity, token)
-                .ConfigureAwait(false);
-        }
+        Response<UserFullInfoWrapper> response = await serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<IUserClient>>()
+            .Create(user.IsOversea)
+            .GetUserFullInfoAsync(user.Entity, token)
+            .ConfigureAwait(false);
 
         if (response.IsOk())
         {
@@ -195,16 +176,10 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
 
     private async ValueTask<bool> TrySetUserUserGameRolesAsync(ViewModel.User.User user, CancellationToken token)
     {
-        Response<ListWrapper<UserGameRole>> userGameRolesResponse;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            BindingClient bindingClient = scope.ServiceProvider
-                .GetRequiredService<BindingClient>();
-
-            userGameRolesResponse = await bindingClient
-                .GetUserGameRolesOverseaAwareAsync(user.Entity, token)
-                .ConfigureAwait(false);
-        }
+        Response<ListWrapper<UserGameRole>> userGameRolesResponse = await serviceProvider
+            .GetRequiredService<BindingClient>()
+            .GetUserGameRolesOverseaAwareAsync(user.Entity, token)
+            .ConfigureAwait(false);
 
         if (userGameRolesResponse.IsOk())
         {