Merge pull request #1415 from DGP-Studio/develop

src/Snap.Hutao/Snap.Hutao/Control/Brush/SegmentedBar.cs

@@ -5,6 +5,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Shapes;
+using System.Collections.Specialized;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Control.Brush;

src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs

@@ -4,6 +4,7 @@
 using CommunityToolkit.WinUI.Collections;
 using CommunityToolkit.WinUI.Helpers;
 using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Core.ExceptionService;
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -207,11 +208,13 @@ internal sealed class AdvancedCollectionView<T> : IAdvancedCollectionView<T>, IN
 
     public void Add(T item)
     {
+        ThrowHelper.NotSupportedIf(IsReadOnly, "Collection is read-only.");
         source.Add(item);
     }
 
     public void Clear()
     {
+        ThrowHelper.NotSupportedIf(IsReadOnly, "Collection is read-only.");
         source.Clear();
     }
 
@@ -227,6 +230,7 @@ internal sealed class AdvancedCollectionView<T> : IAdvancedCollectionView<T>, IN
 
     public bool Remove(T item)
     {
+        ThrowHelper.NotSupportedIf(IsReadOnly, "Collection is read-only.");
         source.Remove(item);
         return true;
     }
@@ -239,6 +243,7 @@ internal sealed class AdvancedCollectionView<T> : IAdvancedCollectionView<T>, IN
 
     public void Insert(int index, T item)
     {
+        ThrowHelper.NotSupportedIf(IsReadOnly, "Collection is read-only.");
         source.Insert(index, item);
     }
 

src/Snap.Hutao/Snap.Hutao/Control/IXamlElementAccessor.cs

@@ -1,6 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control;
-
-internal interface IXamlElementAccessor;

src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCache.cs

@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.DependencyInjection.Abstraction;
 using Snap.Hutao.Core.IO;
 
 namespace Snap.Hutao.Core.Caching;
@@ -9,7 +10,7 @@ namespace Snap.Hutao.Core.Caching;
 /// 为图像缓存提供抽象
 /// </summary>
 [HighQuality]
-internal interface IImageCache
+internal interface IImageCache : ICastService
 {
     /// <summary>
     /// Gets the file path containing cached item for given Uri

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

@@ -7,6 +7,4 @@ internal enum HutaoExceptionKind
 {
     None,
     ServiceTypeCastFailed,
-    FileSystemCreateFileInsufficientPermissions,
-    PrivateNamedPipeContentHashIncorrect,
 }

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

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

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs

@@ -148,15 +148,17 @@ internal sealed partial class Activation : IActivation
 
         await taskContext.SwitchToBackgroundAsync();
 
-        if (serviceProvider.GetRequiredService<IMetadataService>() is IMetadataServiceInitialization metadataServiceInitialization)
+        serviceProvider
-        {
+            .GetRequiredService<IMetadataService>()
-            metadataServiceInitialization.InitializeInternalAsync().SafeForget();
+            .As<IMetadataServiceInitialization>()?
-        }
+            .InitializeInternalAsync()
+            .SafeForget();
 
-        if (serviceProvider.GetRequiredService<IHutaoUserService>() is IHutaoUserServiceInitialization hutaoUserServiceInitialization)
+        serviceProvider
-        {
+            .GetRequiredService<IHutaoUserService>()
-            hutaoUserServiceInitialization.InitializeInternalAsync().SafeForget();
+            .As<IHutaoUserServiceInitialization>()?
-        }
+            .InitializeInternalAsync()
+            .SafeForget();
 
         serviceProvider
             .GetRequiredService<IDiscordService>()

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, HutaoExceptionKind.PrivateNamedPipeContentHashIncorrect, "PipePacket Content Hash incorrect");
+        ThrowHelper.InvalidDataIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
         return content;
     }
 

src/Snap.Hutao/Snap.Hutao/Extension/DateTimeOffsetExtension.cs

@@ -18,11 +18,20 @@ internal static class DateTimeOffsetExtension
             return defaultValue;
         }
 
-        return value switch
+        try
         {
-            >= -62135596800 and <= 253402300799 => DateTimeOffset.FromUnixTimeSeconds(value),
+            return DateTimeOffset.FromUnixTimeSeconds(value);
-            >= -62135596800000 and <= 253402300799999 => DateTimeOffset.FromUnixTimeMilliseconds(value),
+        }
-            _ => defaultValue,
+        catch (ArgumentOutOfRangeException)
-        };
+        {
+            try
+            {
+                return DateTimeOffset.FromUnixTimeMilliseconds(value);
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                return defaultValue;
+            }
+        }
     }
 }

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

@@ -46,6 +46,34 @@ internal static partial class EnumerableExtension
         return first;
     }
 
+    public static string JoinToString<T>(this IEnumerable<T> source, char separator, Action<StringBuilder, T> selector)
+    {
+        StringBuilder resultBuilder = new();
+
+        IEnumerator<T> enumerator = source.GetEnumerator();
+        if (!enumerator.MoveNext())
+        {
+            return string.Empty;
+        }
+
+        T first = enumerator.Current;
+        selector(resultBuilder, first);
+
+        if (!enumerator.MoveNext())
+        {
+            return resultBuilder.ToString();
+        }
+
+        do
+        {
+            resultBuilder.Append(separator);
+            selector(resultBuilder, enumerator.Current);
+        }
+        while (enumerator.MoveNext());
+
+        return resultBuilder.ToString();
+    }
+
     public static string JoinToString<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source, char separator, Action<StringBuilder, TKey, TValue> selector)
     {
         StringBuilder resultBuilder = new();

src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs

@@ -27,7 +27,7 @@ internal sealed partial class MainWindow : Window, IWindowOptionsSource, IMinMax
     public MainWindow(IServiceProvider serviceProvider)
     {
         InitializeComponent();
-        windowOptions = new(this, TitleBarView.DragArea, new(1200, 741), true);
+        windowOptions = new(this, TitleBarView.DragArea, new(1200, 741), true, false);
         this.InitializeController(serviceProvider);
     }
 

src/Snap.Hutao/Snap.Hutao/Message/BackgroundImageTypeChangedMessage.cs

@@ -1,6 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Message;
-
-internal sealed class BackgroundImageTypeChangedMessage;

src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoUserService.cs

@@ -1,12 +1,14 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.DependencyInjection.Abstraction;
+
 namespace Snap.Hutao.Service.Hutao;
 
 /// <summary>
 /// 胡桃用户服务
 /// </summary>
-internal interface IHutaoUserService
+internal interface IHutaoUserService : ICastService
 {
     /// <summary>
     /// 异步初始化

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

@@ -10,7 +10,7 @@ namespace Snap.Hutao.Service.Metadata;
 /// 元数据服务
 /// </summary>
 [HighQuality]
-internal interface IMetadataService
+internal interface IMetadataService : ICastService
 {
     IMemoryCache MemoryCache { get; }
 

src/Snap.Hutao/Snap.Hutao/Service/Navigation/INavigationCurrent.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Navigation;
-
-internal interface INavigationCurrent
-{
-    Type? Current { get; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Navigation/INavigationInitialization.cs

@@ -1,6 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.UI.Xaml.Controls;
+
 namespace Snap.Hutao.Service.Navigation;
 
 /// <summary>
@@ -8,5 +10,10 @@ namespace Snap.Hutao.Service.Navigation;
 /// </summary>
 internal interface INavigationInitialization
 {
-    void Initialize(INavigationViewAccessor accessor);
+    /// <summary>
+    /// 使用指定的对象进行初始化
+    /// </summary>
+    /// <param name="navigationView">管理的 <see cref="NavigationView"/></param>
+    /// <param name="frame">管理的 <see cref="Frame"/></param>
+    void Initialize(NavigationView navigationView, Frame frame);
 }

src/Snap.Hutao/Snap.Hutao/Service/Navigation/INavigationService.cs

@@ -10,7 +10,7 @@ namespace Snap.Hutao.Service.Navigation;
 /// 导航服务
 /// </summary>
 [HighQuality]
-internal interface INavigationService : INavigationCurrent
+internal interface INavigationService : ICastService, INavigationCurrent
 {
     /// <summary>
     /// 导航到指定类型的页面
@@ -47,4 +47,9 @@ internal interface INavigationService : INavigationCurrent
     /// 尽可能尝试返回
     /// </summary>
     void GoBack();
+}
+
+internal interface INavigationCurrent
+{
+    Type? Current { get; }
 }

src/Snap.Hutao/Snap.Hutao/Service/Navigation/INavigationViewAccessor.cs

@@ -1,14 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control;
-
-namespace Snap.Hutao.Service.Navigation;
-
-internal interface INavigationViewAccessor : IXamlElementAccessor
-{
-    NavigationView NavigationView { get; }
-
-    Frame Frame { get; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Navigation/NavigationService.cs

@@ -147,10 +147,10 @@ internal sealed class NavigationService : INavigationService, INavigationInitial
     }
 
     /// <inheritdoc/>
-    public void Initialize(INavigationViewAccessor accessor)
+    public void Initialize(NavigationView navigationView, Frame frame)
     {
-        NavigationView = accessor.NavigationView;
+        NavigationView = navigationView;
-        frame = accessor.Frame;
+        this.frame = frame;
 
         NavigationView.IsPaneOpen = LocalSetting.Get(SettingKeys.IsNavPaneOpen, true);
     }

src/Snap.Hutao/Snap.Hutao/View/MainView.xaml

@@ -18,7 +18,7 @@
     <mxi:Interaction.Behaviors>
         <shcb:PeriodicInvokeCommandOrOnActualThemeChangedBehavior
             Command="{Binding UpdateBackgroundCommand}"
-            CommandParameter="{x:Bind BackgroundImagePresenter}"
+            CommandParameter="{x:Bind BackdroundImagePresenter}"
             Period="0:5:0"/>
     </mxi:Interaction.Behaviors>
 
@@ -28,10 +28,9 @@
         <x:Double x:Key="NavigationViewItemOnLeftIconBoxHeight">24</x:Double>
         <SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent"/>
     </UserControl.Resources>
-    <!--  Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"  -->
+    <Grid Background="{ThemeResource SolidBackgroundFillColorBaseBrush}" Transitions="{ThemeResource EntranceThemeTransitions}">
-    <Grid Transitions="{ThemeResource EntranceThemeTransitions}">
         <Image
-            x:Name="BackgroundImagePresenter"
+            x:Name="BackdroundImagePresenter"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Opacity="0"

src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs

@@ -27,44 +27,17 @@ internal sealed partial class MainView : UserControl
     /// </summary>
     public MainView()
     {
-        IServiceProvider serviceProvider = Ioc.Default;
+        DataContext = Ioc.Default.GetRequiredService<MainViewModel>();
-
-        MainViewModel mainViewModel = serviceProvider.GetRequiredService<MainViewModel>();
-
-        DataContext = mainViewModel;
         InitializeComponent();
 
-        mainViewModel.Initialize(new BackgroundImagePresenterAccessor(BackgroundImagePresenter));
+        IServiceProvider serviceProvider = Ioc.Default;
 
         navigationService = serviceProvider.GetRequiredService<INavigationService>();
         if (navigationService is INavigationInitialization navigationInitialization)
         {
-            navigationInitialization.Initialize(new NavigationViewAccessor(NavView, ContentFrame));
+            navigationInitialization.Initialize(NavView, ContentFrame);
         }
 
         navigationService.Navigate<AnnouncementPage>(INavigationAwaiter.Default, true);
     }
-
-    private class NavigationViewAccessor : INavigationViewAccessor
-    {
-        public NavigationViewAccessor(NavigationView navigationView, Frame frame)
-        {
-            NavigationView = navigationView;
-            Frame = frame;
-        }
-
-        public NavigationView NavigationView { get; private set; }
-
-        public Frame Frame { get; private set; }
-    }
-
-    private class BackgroundImagePresenterAccessor : IBackgroundImagePresenterAccessor
-    {
-        public BackgroundImagePresenterAccessor(Image backgroundImagePresenter)
-        {
-            BackgroundImagePresenter = backgroundImagePresenter;
-        }
-
-        public Image BackgroundImagePresenter { get; private set; }
-    }
 }

src/Snap.Hutao/Snap.Hutao/ViewModel/IBackgroundImagePresenterAccessor.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control;
-
-namespace Snap.Hutao.ViewModel;
-
-internal interface IBackgroundImagePresenterAccessor : IXamlElementAccessor
-{
-    Image BackgroundImagePresenter { get; }
-}

src/Snap.Hutao/Snap.Hutao/ViewModel/IMainViewModelInitialization.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.ViewModel;
-
-internal interface IMainViewModelInitialization
-{
-    void Initialize(IBackgroundImagePresenterAccessor accessor);
-}

src/Snap.Hutao/Snap.Hutao/ViewModel/MainViewModel.cs

@@ -1,45 +1,27 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI.Animations;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Snap.Hutao.Control.Animation;
 using Snap.Hutao.Control.Theme;
-using Snap.Hutao.Message;
 using Snap.Hutao.Service.BackgroundImage;
 
 namespace Snap.Hutao.ViewModel;
 
 [ConstructorGenerated]
 [Injection(InjectAs.Singleton)]
-internal sealed partial class MainViewModel : Abstraction.ViewModel, IMainViewModelInitialization, IRecipient<BackgroundImageTypeChangedMessage>
+internal sealed partial class MainViewModel : Abstraction.ViewModel
 {
     private readonly IBackgroundImageService backgroundImageService;
     private readonly ITaskContext taskContext;
 
     private BackgroundImage? previousBackgroundImage;
-    private Image? backgroundImagePresenter;
-
-    public void Initialize(IBackgroundImagePresenterAccessor accessor)
-    {
-        backgroundImagePresenter = accessor.BackgroundImagePresenter;
-    }
-
-    public void Receive(BackgroundImageTypeChangedMessage message)
-    {
-        UpdateBackgroundAsync().SafeForget();
-    }
 
     [Command("UpdateBackgroundCommand")]
-    private async Task UpdateBackgroundAsync()
+    private async Task UpdateBackgroundAsync(Image presenter)
     {
-        if (backgroundImagePresenter is null)
-        {
-            return;
-        }
-
         (bool isOk, BackgroundImage backgroundImage) = await backgroundImageService.GetNextBackgroundImageAsync(previousBackgroundImage).ConfigureAwait(false);
 
         if (isOk)
@@ -54,11 +36,11 @@ internal sealed partial class MainViewModel : Abstraction.ViewModel, IMainViewMo
                     duration: ControlAnimationConstants.ImageOpacityFadeInOut,
                     easingType: EasingType.Quartic,
                     easingMode: EasingMode.EaseInOut)
-                .StartAsync(backgroundImagePresenter)
+                .StartAsync(presenter)
                 .ConfigureAwait(true);
 
-            backgroundImagePresenter.Source = backgroundImage.ImageSource;
+            presenter.Source = backgroundImage.ImageSource;
-            double targetOpacity = ThemeHelper.IsDarkMode(backgroundImagePresenter.ActualTheme) ? 1 - backgroundImage.Luminance : backgroundImage.Luminance;
+            double targetOpacity = ThemeHelper.IsDarkMode(presenter.ActualTheme) ? 1 - backgroundImage.Luminance : backgroundImage.Luminance;
 
             await AnimationBuilder
                 .Create()
@@ -67,7 +49,7 @@ internal sealed partial class MainViewModel : Abstraction.ViewModel, IMainViewMo
                     duration: ControlAnimationConstants.ImageOpacityFadeInOut,
                     easingType: EasingType.Quartic,
                     easingMode: EasingMode.EaseInOut)
-                .StartAsync(backgroundImagePresenter)
+                .StartAsync(presenter)
                 .ConfigureAwait(true);
         }
     }

src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/SettingViewModel.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.AppLifecycle;
 using Snap.Hutao.Core;
@@ -55,7 +54,6 @@ internal sealed partial class SettingViewModel : Abstraction.ViewModel
     private readonly IUserService userService;
     private readonly ITaskContext taskContext;
     private readonly AppOptions appOptions;
-    private readonly IMessenger messenger;
 
     private NameValue<BackdropType>? selectedBackdropType;
     private NameValue<BackgroundImageType>? selectedBackgroundImageType;
@@ -102,7 +100,6 @@ internal sealed partial class SettingViewModel : Abstraction.ViewModel
             if (SetProperty(ref selectedBackgroundImageType, value) && value is not null)
             {
                 AppOptions.BackgroundImageType = value.Value;
-                messenger.Send(new Message.BackgroundImageTypeChangedMessage());
             }
         }
     }