fix #2272

DGP-Studio · Dec 9, 2024 · fb0510e · fb0510e
1 parent 9f7646c
commit fb0510e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 52 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Json/JsonExtensionDataDictionary.cs b/src/Snap.Hutao/Snap.Hutao/Core/Json/JsonExtensionDataDictionary.cs
@@ -8,7 +8,7 @@
 
 namespace Snap.Hutao.Core.Json;
 
-[CollectionBuilder(typeof(JsonExtensionDataDictionary), nameof(InitialzieWithIgnoredKeys))]
+[CollectionBuilder(typeof(JsonExtensionDataDictionary), nameof(InitializeWithIgnoredKeys))]
 internal sealed partial class JsonExtensionDataDictionary : IDictionary<string, JsonElement>
 {
     private readonly Dictionary<string, JsonElement> inner = [];
@@ -45,9 +45,9 @@ public JsonElement this[string key]
         set => inner[key] = value;
     }
 
-    public static JsonExtensionDataDictionary InitialzieWithIgnoredKeys(ReadOnlySpan<string> keys)
+    public static JsonExtensionDataDictionary InitializeWithIgnoredKeys(ReadOnlySpan<string> keys)
     {
-        return new JsonExtensionDataDictionary(keys);
+        return new(keys);
     }
 
     public void Add(string key, JsonElement value)

diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -1034,6 +1034,9 @@
   <data name="ServiceGameLocatorPickerFilterText" xml:space="preserve">
     <value>游戏本体</value>
   </data>
+  <data name="ServiceGameLocatorUnityLogCannotOpenRead" xml:space="preserve">
+    <value>游戏运行中，无法读取 Unity 日志文件</value>
+  </data>
   <data name="ServiceGameLocatorUnityLogFileNotFound" xml:space="preserve">
     <value>找不到 Unity 日志文件</value>
   </data>

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Locator/UnityLogGameLocator.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Locator/UnityLogGameLocator.cs
@@ -31,7 +31,15 @@ public async ValueTask<ValueResult<bool, string>> LocateGamePathAsync()
             return new(false, SH.ServiceGameLocatorUnityLogFileNotFound);
         }
 
-        string content = await File.ReadAllTextAsync(logFilePath).ConfigureAwait(false);
+        string content;
+        try
+        {
+            content = await File.ReadAllTextAsync(logFilePath).ConfigureAwait(false);
+        }
+        catch (IOException)
+        {
+            return new(false, SH.ServiceGameLocatorUnityLogCannotOpenRead);
+        }
 
         Match matchResult = WarmupFileLine.Match(content);
         if (!matchResult.Success)

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/PathAbstraction/GamePathService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/PathAbstraction/GamePathService.cs
@@ -17,12 +17,12 @@ public async ValueTask<ValueResult<bool, string>> SilentGetGamePathAsync()
         // Cannot find in setting
         if (string.IsNullOrEmpty(launchOptions.GamePath))
         {
-            // Try locate by unity log
+            // Try to locate by unity log
             (bool isOk, string path) = await gameLocatorFactory.LocateAsync(GameLocationSource.UnityLog).ConfigureAwait(false);
 
             if (!isOk)
             {
-                // Try locate by registry
+                // Try to locate by registry
                 (isOk, path) = await gameLocatorFactory.LocateAsync(GameLocationSource.Registry).ConfigureAwait(false);
             }