Update GameResourcesResolveHelper.cs

Corona-Studio · Dec 4, 2024 · 3202d47 · 3202d47
1 parent 46d4062
commit 3202d47
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/ProjBobcat/ProjBobcat/Class/Helper/GameResourcesResolveHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/GameResourcesResolveHelper.cs
@@ -237,7 +237,9 @@ public static async IAsyncEnumerable<GameModResolvedInfo> ResolveModListAsync(
                   ext.Equals(".disabled", StringComparison.OrdinalIgnoreCase)))
                 continue;
 
-            if (!ArchiveHelper.TryOpen(file, out var archive)) continue;
+            await using var fs = File.OpenRead(file);
+
+            if (!ArchiveHelper.TryOpen(fs, out var archive)) continue;
 
             var modInfoEntry =
                 archive.Entries.FirstOrDefault(e =>
@@ -303,7 +305,10 @@ public static async IAsyncEnumerable<GameModResolvedInfo> ResolveModListAsync(
         var ext = Path.GetExtension(file);
 
         if (!ext.Equals(".zip", StringComparison.OrdinalIgnoreCase)) return null;
-        if (!ArchiveHelper.TryOpen(file, out var archive)) return null;
+
+        await using var fs = File.OpenRead(file);
+
+        if (!ArchiveHelper.TryOpen(fs, out var archive)) return null;
 
         var packIconEntry =
             archive.Entries.FirstOrDefault(e => e.Key?.Equals("pack.png", StringComparison.OrdinalIgnoreCase) ?? false);
@@ -407,9 +412,11 @@ public static async IAsyncEnumerable<GameResourcePackResolvedInfo> ResolveResour
         }
     }
 
-    static GameShaderPackResolvedInfo? ResolveShaderPackFile(string file)
+    static async Task<GameShaderPackResolvedInfo?> ResolveShaderPackFile(string file)
     {
-        if (!ArchiveHelper.TryOpen(file, out var archive)) return null;
+        await using var fs = File.OpenRead(file);
+
+        if (!ArchiveHelper.TryOpen(fs, out var archive)) return null;
         if (!archive.Entries.Any(e =>
                 Path.GetFileName(e.Key?.TrimEnd('/'))
                     ?.Equals("shaders", StringComparison.OrdinalIgnoreCase) ?? false))
@@ -429,17 +436,17 @@ public static async IAsyncEnumerable<GameResourcePackResolvedInfo> ResolveResour
         return new GameShaderPackResolvedInfo(Path.GetFileName(dir), true);
     }
 
-    public static IEnumerable<GameShaderPackResolvedInfo> ResolveShaderPack(
+    public static async IAsyncEnumerable<GameShaderPackResolvedInfo> ResolveShaderPack(
         IEnumerable<(string, bool)> paths,
-        CancellationToken ct)
+        [EnumeratorCancellation] CancellationToken ct)
     {
         foreach (var (path, isDir) in paths)
         {
             if (ct.IsCancellationRequested) yield break;
 
             if (!isDir)
             {
-                var result = ResolveShaderPackFile(path);
+                var result = await ResolveShaderPackFile(path);
 
                 if (result == null) continue;