Merge pull request #1788 from DGP-Studio/develop

DGP-Studio · Jul 5, 2024 · 497a5fb · 497a5fb
2 parents 8067665 + bfec295
commit 497a5fb
Show file tree

Hide file tree

Showing 785 changed files with 13,865 additions and 11,251 deletions.
diff --git a/crowdin.yml b/crowdin.yml
@@ -1,3 +1,5 @@
 files:
   - source: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
     translation: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.%osx_locale%.resx
+  - source: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SHRegex.resx
+    translation: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SHRegex.%osx_locale%.resx
diff --git a/src/Snap.Hutao/.editorconfig b/src/Snap.Hutao/.editorconfig
@@ -322,6 +322,7 @@ dotnet_diagnostic.CA2227.severity = suggestion
 dotnet_diagnostic.CA2251.severity = suggestion
 
 csharp_style_prefer_primary_constructors = false:none
+dotnet_diagnostic.SA1124.severity = none
 
 [*.vb]
 #### 命名样式 ####

diff --git a/src/Snap.Hutao/Snap.Hutao.Test/BaseClassLibrary/HttpClientTest.cs b/src/Snap.Hutao/Snap.Hutao.Test/BaseClassLibrary/HttpClientTest.cs
@@ -0,0 +1,31 @@
+using System.Net.Http;
+
+namespace Snap.Hutao.Test.BaseClassLibrary;
+
+[TestClass]
+public sealed class HttpClientTest
+{
+    [TestMethod]
+    public void RedirectionHeaderTest()
+    {
+        HttpClientHandler handler = new()
+        {
+            UseCookies = false,
+            AllowAutoRedirect = false,
+        };
+
+        using (handler)
+        {
+            using (HttpClient httpClient = new(handler))
+            {
+                using (HttpRequestMessage request = new(HttpMethod.Get, "https://api.snapgenshin.com/patch/hutao/download"))
+                {
+                    using (HttpResponseMessage response = httpClient.Send(request))
+                    {
+                        _ = 1;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao.Test/BaseClassLibrary/JsonSerializeTest.cs b/src/Snap.Hutao/Snap.Hutao.Test/BaseClassLibrary/JsonSerializeTest.cs
@@ -13,19 +13,19 @@ public sealed class JsonSerializeTest
         NumberHandling = JsonNumberHandling.AllowReadingFromString,
     };
 
-    private const string SmapleObjectJson = """
+    private const string SampleObjectJson = """
         {
             "A" :1
         }
         """;
 
-    private const string SmapleEmptyStringObjectJson = """
+    private const string SampleEmptyStringObjectJson = """
         {
             "A" : ""
         }
         """;
 
-    private const string SmapleNumberKeyDictionaryJson = """
+    private const string SampleNumberKeyDictionaryJson = """
         {
             "111" : "12",
             "222" : "34"
@@ -35,22 +35,31 @@ public sealed class JsonSerializeTest
     [TestMethod]
     public void DelegatePropertyCanSerialize()
     {
-        SampleDelegatePropertyClass sample = JsonSerializer.Deserialize<SampleDelegatePropertyClass>(SmapleObjectJson)!;
+        SampleDelegatePropertyClass sample = JsonSerializer.Deserialize<SampleDelegatePropertyClass>(SampleObjectJson)!;
         Assert.AreEqual(sample.B, 1);
     }
 
     [TestMethod]
     [ExpectedException(typeof(JsonException))]
     public void EmptyStringCannotSerializeAsNumber()
     {
-        SampleStringReadWriteNumberPropertyClass sample = JsonSerializer.Deserialize<SampleStringReadWriteNumberPropertyClass>(SmapleEmptyStringObjectJson)!;
+        SampleStringReadWriteNumberPropertyClass sample = JsonSerializer.Deserialize<SampleStringReadWriteNumberPropertyClass>(SampleEmptyStringObjectJson)!;
         Assert.AreEqual(sample.A, 0);
     }
 
+    [TestMethod]
+    public void EmptyStringCanSerializeAsUri()
+    {
+        SampleEmptyUriClass sample = JsonSerializer.Deserialize<SampleEmptyUriClass>(SampleEmptyStringObjectJson)!;
+        Uri.TryCreate("", UriKind.RelativeOrAbsolute, out Uri? value);
+        Console.WriteLine(value);
+        Assert.AreEqual(sample.A, value);
+    }
+
     [TestMethod]
     public void NumberStringKeyCanSerializeAsKey()
     {
-        Dictionary<int, string> sample = JsonSerializer.Deserialize<Dictionary<int, string>>(SmapleNumberKeyDictionaryJson, AlowStringNumberOptions)!;
+        Dictionary<int, string> sample = JsonSerializer.Deserialize<Dictionary<int, string>>(SampleNumberKeyDictionaryJson, AlowStringNumberOptions)!;
         Assert.AreEqual(sample[111], "12");
     }
 
@@ -92,6 +101,11 @@ private sealed class SampleStringReadWriteNumberPropertyClass
         public int A { get; set; }
     }
 
+    private sealed class SampleEmptyUriClass
+    {
+        public Uri A { get; set; } = default!;
+    }
+
     private sealed class SampleByteArrayPropertyClass
     {
         public byte[]? Array { get; set; }

diff --git a/src/Snap.Hutao/Snap.Hutao.Test/BaseClassLibrary/ListTest.cs b/src/Snap.Hutao/Snap.Hutao.Test/BaseClassLibrary/ListTest.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace Snap.Hutao.Test.BaseClassLibrary;
+
+[TestClass]
+public sealed class ListTest
+{
+    [TestMethod]
+    public void IndexOfNullIsNegativeOne()
+    {
+        List<object> list = [new()];
+        Assert.AreEqual(-1, list.IndexOf(default!));
+    }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao.Test/RuntimeBehavior/UnsafeRuntimeBehaviorTest.cs b/src/Snap.Hutao/Snap.Hutao.Test/RuntimeBehavior/UnsafeRuntimeBehaviorTest.cs
@@ -56,6 +56,51 @@ public unsafe void UnsafeUtf8StringReference()
         Console.WriteLine(System.Text.Encoding.UTF8.GetString(bytes));
     }
 
+    [TestMethod]
+    public unsafe void UnsafeSizeInt32ToRectInt32Test()
+    {
+        RectInt32 rectInt32 = ToRectInt32(new(100, 200));
+        Assert.AreEqual(rectInt32.X, 0);
+        Assert.AreEqual(rectInt32.Y, 0);
+        Assert.AreEqual(rectInt32.Width, 100);
+        Assert.AreEqual(rectInt32.Height, 200);
+
+        unsafe RectInt32 ToRectInt32(SizeInt32 sizeInt32)
+        {
+            byte* pBytes = stackalloc byte[sizeof(RectInt32)];
+            *(SizeInt32*)(pBytes + 8) = sizeInt32;
+            return *(RectInt32*)pBytes;
+        }
+    }
+
+    private struct RectInt32
+    {
+        public int X;
+        public int Y;
+        public int Width;
+        public int Height;
+
+        public RectInt32(int x, int y, int width, int height)
+        {
+            X = x;
+            Y = y;
+            Width = width;
+            Height = height;
+        }
+    }
+
+    private struct SizeInt32
+    {
+        public int Width;
+        public int Height;
+
+        public SizeInt32(int width, int height)
+        {
+            Width = width;
+            Height = height;
+        }
+    }
+
     private readonly struct TestStruct
     {
         public readonly int Value1;

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -7,31 +7,38 @@
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources/>
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsCard/SettingsCard.xaml"/>
-                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenizingTextBox/TokenizingTextBox.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Loading.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Image/CachedImage.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/Card.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/Color.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/ComboBox.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/Converter.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/CornerRadius.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/FlyoutStyle.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/FontStyle.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/Glyph.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/InfoBarOverride.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/ItemsPanelTemplate.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/NumericValue.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/PageOverride.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/PivotOverride.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/ScrollViewer.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/SegmentedOverride.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/SettingsStyle.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/Thickness.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/TransitionCollection.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/Uri.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/WindowOverride.xaml"/>
-                <ResourceDictionary Source="ms-appx:///View/Card/Primitive/CardProgressBar.xaml"/>
-                <ResourceDictionary Source="ms-appx:///View/Control/RateDeltaTextBlockStyle.xaml"/>
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.Labs.WinUI.TokenView/TokenItem/TokenItem.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Elevation.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/ItemIcon.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Loading.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/StandardView.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/AutoSuggestBox/AutoSuggestTokenBox.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Card/CardBlock.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Card/CardProgressBar.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Card/HorizontalCard.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Card/VerticalCard.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Image/CachedImage.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/TextBlock/RateDeltaTextBlock.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Card.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Color.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/ComboBox.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Converter.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/CornerRadius.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/FlyoutStyle.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/FontStyle.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Glyph.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/InfoBarOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/ItemsPanelTemplate.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/NumericValue.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/PageOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/PivotOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/ScrollViewer.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/SegmentedOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/SettingsStyle.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Thickness.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/TransitionCollection.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Uri.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/WindowOverride.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Style
@@ -45,15 +52,15 @@
                 x:Name="NoneSelectionListViewItemStyle"
                 BasedOn="{StaticResource DefaultListViewItemStyle}"
                 TargetType="ListViewItem">
-                <Setter Property="Padding" Value="0"/>
                 <Setter Property="Margin" Value="0,4,0,0"/>
+                <Setter Property="Padding" Value="0"/>
             </Style>
             <Style
                 x:Name="NoneSelectionGridViewItemStyle"
                 BasedOn="{StaticResource DefaultGridViewItemStyle}"
                 TargetType="GridViewItem">
-                <Setter Property="Padding" Value="0"/>
                 <Setter Property="Margin" Value="0,0,2,4"/>
+                <Setter Property="Padding" Value="0"/>
             </Style>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml.cs b/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
@@ -9,7 +9,7 @@
 using Snap.Hutao.Core.LifeCycle;
 using Snap.Hutao.Core.LifeCycle.InterProcess;
 using Snap.Hutao.Core.Logging;
-using Snap.Hutao.Core.Windowing;
+using Snap.Hutao.UI.Xaml;
 using System.Diagnostics;
 
 namespace Snap.Hutao;
@@ -60,7 +60,7 @@ public App(IServiceProvider serviceProvider)
 
     public new void Exit()
     {
-        XamlLifetime.ApplicationExiting = true;
+        XamlApplicationLifetime.Exiting = true;
         base.Exit();
     }
 

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/AutoSuggestTokenBox.cs b/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/AutoSuggestTokenBox.cs