afs,core: fix duplicate matching in ReplaceFontName

AmusementClub · Oct 26, 2024 · cb8d9e6 · cb8d9e6
1 parent 3863be7
commit cb8d9e6
Showing 1 changed file with 35 additions and 14 deletions.
diff --git a/AssFontSubset.Core/src/SubsetByPyFT.cs b/AssFontSubset.Core/src/SubsetByPyFT.cs
@@ -1,4 +1,5 @@
-using Mobsub.SubtitleParse.AssTypes;
+using System.Buffers;
+using Mobsub.SubtitleParse.AssTypes;
 using Mobsub.SubtitleParse;
 using System.Text;
 using Microsoft.Extensions.Logging;
@@ -281,27 +282,47 @@ where kv2.Key.FamilyNames.ContainsValue(kv.Key)
     private static bool ReplaceFontName(ReadOnlySpan<char> block, Dictionary<string, string> nameMap, StringBuilder sb)
     {
         var changed = false;
-        foreach (var (oldValue, newValue) in nameMap)
+        var start = 0;
+        var tagIndex = block.IndexOf($@"{AssConstants.BackSlash}{AssConstants.OverrideTags.FontName}");
+        while (tagIndex != -1)
         {
-            var curLoopChanged = false;
-            var start = 0;
-            var index = block.IndexOf(oldValue);
-            while (index != -1)
+            tagIndex += 3;
+            sb.Append(block.Slice(start, tagIndex));
+            start += tagIndex;
+
+            var sepValues = SearchValues.Create($"{AssConstants.BackSlash}{AssConstants.EndOvrBlock}");
+            var nextTag = block[start..].IndexOfAny(sepValues);
+
+            var tagValue = nextTag == -1 ? block[start..] : block.Slice(start, nextTag);
+
+            var matched = false;
+            foreach (var (oldValue, newValue) in nameMap)
             {
-                changed = true;
-                curLoopChanged = true;
-                sb.Append(block.Slice(start, index));
-                start += index + oldValue.Length;
-                sb.Append(newValue);
-                index = block[start..].IndexOf(oldValue);
+                if (tagValue.SequenceEqual(oldValue))
+                {
+                    sb.Append(newValue);
+                    changed = true;
+                    matched = true;
+                    break;
+                }
             }
 
-            if (curLoopChanged)
+            if (!matched)
             {
-                sb.Append(block[start..]);
+                sb.Append(tagValue);
             }
+
+            start += tagValue.Length;   
+            if (nextTag == -1)
+            {
+                break;
+            }
+
+            tagIndex = block[start..].IndexOf($@"{AssConstants.BackSlash}{AssConstants.OverrideTags.FontName}");
         }
 
+        sb.Append(block[start..]);
+
         return changed;
     }
 }