Fix ignored assets gets redownloaded

Author: neon-nyan

CollapseLauncher/Classes/InstallManagement/Zenless/ZenlessInstall.SophonPatch.cs

@@ -1,5 +1,6 @@
 using Hi3Helper.Sophon;
 using Hi3Helper.Sophon.Infos;
+using Hi3Helper.Sophon.Structs;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
@@ -29,47 +30,16 @@ public override async Task FilterAssetList<T>(
             Func<T, string?>  itemPathSelector,
             CancellationToken token)
         {
-            HashSet<int> exceptMatchFieldHashSet = await GetExceptMatchFieldHashSet(token);
+            HashSet<string> exceptMatchFieldHashSet = await GetExceptMatchFieldHashSet(token);
             if (exceptMatchFieldHashSet.Count == 0)
             {
                 return;
             }
 
-            FilterSophonAsset(itemList, Selector, exceptMatchFieldHashSet);
-            return;
-
-            string? Selector(T item)
-            {
-                // For Game Update
-                if (item is SophonPatchAsset asset)
-                {
-                    if (asset.MainAssetInfo is not { } assetSelected)
-                    {
-                        return null;
-                    }
-
-                    token.ThrowIfCancellationRequested();
-                    ref SophonChunksInfo chunkInfo = ref Unsafe.IsNullRef(ref assetSelected)
-                        ? ref Unsafe.NullRef<SophonChunksInfo>()
-                        : ref GetChunkAssetChunksInfo(assetSelected);
-
-                    if (Unsafe.IsNullRef(ref chunkInfo))
-                    {
-                        chunkInfo = ref GetChunkAssetChunksInfoAlt(assetSelected);
-                    }
-
-                    return Unsafe.IsNullRef(ref chunkInfo)
-                        ? asset.MainAssetInfo.AssetName
-                        : chunkInfo.ChunksBaseUrl;
-                }
-
-                // TODO: For Game Repair handle
-
-                return null;
-            }
+            FilterSophonAsset(itemList, exceptMatchFieldHashSet);
         }
 
-        private async Task<HashSet<int>> GetExceptMatchFieldHashSet(CancellationToken token)
+        private async Task<HashSet<string>> GetExceptMatchFieldHashSet(CancellationToken token)
         {
             string gameExecDataName =
                 Path.GetFileNameWithoutExtension(GameVersionManager.GamePreset.GameExecutableName) ?? "ZenlessZoneZero";
@@ -82,38 +52,20 @@ private async Task<HashSet<int>> GetExceptMatchFieldHashSet(CancellationToken to
                 return [];
             }
 
-            string       exceptMatchFieldContent = await File.ReadAllTextAsync(gameExceptMatchFieldFile, token);
-            HashSet<int> exceptMatchFieldHashSet = CreateExceptMatchFieldHashSet<int>(exceptMatchFieldContent);
+            string          exceptMatchFieldContent = await File.ReadAllTextAsync(gameExceptMatchFieldFile, token);
+            HashSet<string> exceptMatchFieldHashSet = CreateExceptMatchFieldHashSet(exceptMatchFieldContent);
 
             return exceptMatchFieldHashSet;
         }
 
         // ReSharper disable once IdentifierTypo
-        private static void FilterSophonAsset<T>(List<T> itemList, Func<T, string?> assetSelector, HashSet<int> exceptMatchFieldHashSet)
+        private static void FilterSophonAsset<T>(List<T> itemList, HashSet<string> exceptMatchFieldHashSet)
         {
-            const string       separators    = "/\\";
-            scoped Span<Range> urlPathRanges = stackalloc Range[32];
-
             List<T> filteredList = [];
             foreach (T asset in itemList)
             {
-                string? assetPath = assetSelector(asset);
-                if (assetPath == null)
-                {
-                    filteredList.Add(asset);
-                    continue;
-                }
-
-                ReadOnlySpan<char> manifestUrl = assetPath;
-                int                rangeLen    = manifestUrl.SplitAny(urlPathRanges, separators, SplitOptions);
-                if (rangeLen <= 0)
-                {
-                    continue;
-                }
-
-                ReadOnlySpan<char> manifestStr = manifestUrl[urlPathRanges[rangeLen - 1]];
-                if (int.TryParse(manifestStr, null, out int lookupNumber) &&
-                    exceptMatchFieldHashSet.Contains(lookupNumber))
+                if (asset is SophonIdentifiableProperty { MatchingField: { } assetMatchingField } &&
+                    exceptMatchFieldHashSet.Contains(assetMatchingField))
                 {
                     continue;
                 }
@@ -130,11 +82,10 @@ private static void FilterSophonAsset<T>(List<T> itemList, Func<T, string?> asse
             itemList.AddRange(filteredList);
         }
 
-        internal static HashSet<T> CreateExceptMatchFieldHashSet<T>(string exceptMatchFieldContent)
-            where T : ISpanParsable<T>
+        internal static HashSet<string> CreateExceptMatchFieldHashSet(string exceptMatchFieldContent)
         {
             const string       lineFeedSeparators = "\r\n";
-            HashSet<T>         hashSetReturn      = [];
+            HashSet<string>    hashSetReturn      = new(StringComparer.OrdinalIgnoreCase);
             scoped Span<Range> contentLineRange   = stackalloc Range[2];
 
             ReadOnlySpan<char> contentSpan = exceptMatchFieldContent.AsSpan();
@@ -157,10 +108,7 @@ internal static HashSet<T> CreateExceptMatchFieldHashSet<T>(string exceptMatchFi
                 }
 
                 ReadOnlySpan<char> contentMatch = contentSpan[contentMatchRange].Trim(separatorsChars);
-                if (T.TryParse(contentMatch, null, out T? result))
-                {
-                    hashSetReturn.Add(result);
-                }
+                hashSetReturn.Add(contentMatch.ToString());
             }
 
             return hashSetReturn;

CollapseLauncher/Classes/RepairManagement/Zenless/ZenlessRepair.Fetch.cs

@@ -107,7 +107,7 @@ private void FilterExcludedAssets(List<FilePropertiesRemote> assetList)
             }
 
             string exceptMatchFieldContent = File.ReadAllText(gameExceptMatchFieldFile);
-            HashSet<int> exceptMatchFieldHashSet = ZenlessInstall.CreateExceptMatchFieldHashSet<int>(exceptMatchFieldContent);
+            HashSet<string> exceptMatchFieldHashSet = ZenlessInstall.CreateExceptMatchFieldHashSet(exceptMatchFieldContent);
 
             List<FilePropertiesRemote> filteredList = [];
             foreach (FilePropertiesRemote asset in assetList)
@@ -120,7 +120,7 @@ private void FilterExcludedAssets(List<FilePropertiesRemote> assetList)
                     continue;
                 }
 
-                bool isExceptionFound = zenlessResAsset.PackageMatchingIds.Any(exceptMatchFieldHashSet.Contains);
+                bool isExceptionFound = zenlessResAsset.PackageMatchingIds.Any(x => exceptMatchFieldHashSet.Contains($"{x}"));
                 if (isExceptionFound)
                 {
                     continue;