fix #2363

DGP-Studio · Jan 10, 2025 · 561d01c · 561d01c
1 parent bda63d0
commit 561d01c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryWebCacheProvider.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryWebCacheProvider.cs
@@ -71,7 +71,7 @@ public async ValueTask<ValueResult<bool, GachaLogQuery>> GetQueryAsync()
         {
             using (MemoryStream memoryStream = await memoryStreamFactory.GetStreamAsync(fileStream).ConfigureAwait(false))
             {
-                string? result = Match(memoryStream, cacheFile.Contains(GameConstants.GenshinImpactData, StringComparison.Ordinal));
+                string? result = Match(memoryStream, cacheFile.Contains(GameConstants.GenshinImpactData, StringComparison.OrdinalIgnoreCase));
 
                 if (string.IsNullOrEmpty(result))
                 {
@@ -97,7 +97,7 @@ public async ValueTask<ValueResult<bool, GachaLogQuery>> GetQueryAsync()
         using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent((int)stream.Length))
         {
             Span<byte> span = memoryOwner.Memory.Span;
-            stream.Write(span);
+            stream.Read(span);
 
             ReadOnlySpan<byte> match = isOversea
                 ? "https://gs.hoyoverse.com/genshin/event/e20190909gacha-v3/index.html"u8

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/PathAbstraction/GamePathService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/PathAbstraction/GamePathService.cs
@@ -23,9 +23,9 @@ public async ValueTask<ValueResult<bool, string>> SilentGetGamePathAsync()
         }
 
         // Try to locate by unity log
-        if (await gameLocatorFactory.LocateSingleAsync(GameLocationSourceKind.UnityLog).ConfigureAwait(false) is (true, { } path1))
+        if (await gameLocatorFactory.LocateSingleAsync(GameLocationSourceKind.UnityLog).ConfigureAwait(false) is (true, { } path))
         {
-            launchOptions.UpdateGamePath(path1);
+            launchOptions.UpdateGamePath(path);
             return new(true, launchOptions.GamePath);
         }
 

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/AvatarStrategyRepository.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/AvatarStrategyRepository.cs
@@ -22,4 +22,9 @@ public void AddStrategy(AvatarStrategy strategy)
     {
         this.Add(strategy);
     }
+
+    public void RemoveStrategy(AvatarStrategy strategy)
+    {
+        this.Delete(strategy);
+    }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/AvatarStrategyService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/AvatarStrategyService.cs
@@ -18,6 +18,13 @@ internal sealed partial class AvatarStrategyService : IAvatarStrategyService
     public async ValueTask<AvatarStrategy?> GetStrategyByAvatarId(AvatarId avatarId)
     {
         AvatarStrategy? strategy = repository.GetStrategyByAvatarId(avatarId);
+        if (strategy is { ChineseStrategyId: 0 } or { OverseaStrategyId: 0 })
+        {
+            repository.RemoveStrategy(strategy);
+            strategy = default;
+            return default;
+        }
+
         if (strategy is null)
         {
             using (IServiceScope scope = serviceProvider.CreateScope())

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IAvatarStrategyRepository.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IAvatarStrategyRepository.cs
@@ -12,4 +12,5 @@ internal interface IAvatarStrategyRepository : IRepository<AvatarStrategy>
     AvatarStrategy? GetStrategyByAvatarId(AvatarId avatarId);
 
     void AddStrategy(AvatarStrategy strategy);
+    void RemoveStrategy(AvatarStrategy strategy);
 }