Allow multiple separators split

neon-nyan · neon-nyan · commit 82b81239fd25 · 2025-05-09T14:00:58.000+07:00
diff --git a/CollapseLauncher/Classes/Interfaces/Class/Structs.cs b/CollapseLauncher/Classes/Interfaces/Class/Structs.cs
@@ -145,6 +145,8 @@ public GameVersion(string? version)
 
         public static bool TryParse(string? version, [NotNullWhen(true)] out GameVersion? result)
         {
+            const string Separators = ",.;|";
+
             result = null;
             if (string.IsNullOrEmpty(version))
             {
@@ -153,7 +155,7 @@ public static bool TryParse(string? version, [NotNullWhen(true)] out GameVersion
 
             Span<Range>        ranges      = stackalloc Range[8];
             ReadOnlySpan<char> versionSpan = version.AsSpan();
-            int                splitRanges = versionSpan.Split(ranges, '.', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+            int                splitRanges = versionSpan.SplitAny(ranges, Separators, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
 
             if (splitRanges == 0)
             {

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ public GameVersion(string? version)`
`145`	`145`
`146`	`146`	`public static bool TryParse(string? version, [NotNullWhen(true)] out GameVersion? result)`
`147`	`147`	`{`
	`148`	`+ const string Separators = ",.;\|";`
	`149`	`+`
`148`	`150`	`result = null;`
`149`	`151`	`if (string.IsNullOrEmpty(version))`
`150`	`152`	`{`
`@@ -153,7 +155,7 @@ public static bool TryParse(string? version, [NotNullWhen(true)] out GameVersion`
`153`	`155`
`154`	`156`	`Span<Range> ranges = stackalloc Range[8];`
`155`	`157`	`ReadOnlySpan<char> versionSpan = version.AsSpan();`
`156`		`- int splitRanges = versionSpan.Split(ranges, '.', StringSplitOptions.TrimEntries \| StringSplitOptions.RemoveEmptyEntries);`
	`158`	`+ int splitRanges = versionSpan.SplitAny(ranges, Separators, StringSplitOptions.TrimEntries \| StringSplitOptions.RemoveEmptyEntries);`
`157`	`159`
`158`	`160`	`if (splitRanges == 0)`
`159`	`161`	`{`