Add support for edge cases parsing

- Allow executing rest of the logic for links that do not parse
- Respect default other than app/package, and do not enforce id for name and regex

Author: JustArchi

ArchiSteamFarm.Tests/SteamUtilities.cs

@@ -55,6 +55,8 @@ internal void TryParseGameIdentifierReturnsExpectedId(string input, EGameIdentif
 	[DataRow("unknown/123", EGameIdentifier.Application)]
 	[DataRow("https://store.steampowered.com/bundle/123", EGameIdentifier.Application)]
 	[DataRow("https://example.com/app/730", EGameIdentifier.Application)]
+	[DataRow("regex/pattern", EGameIdentifier.Application)]
+	[DataRow("name/Half-Life", EGameIdentifier.Application)]
 	[TestMethod]
 	internal void TryParseGameIdentifierReturnsFalseForInvalidInput(string input, EGameIdentifier defaultType) {
 		bool result = TryParseGameIdentifier(input, defaultType, out EGameIdentifier? type, out uint id);
@@ -68,6 +70,7 @@ internal void TryParseGameIdentifierReturnsFalseForInvalidInput(string input, EG
 	[DataRow("r/test.*", EGameIdentifier.Application, EGameIdentifier.Regex, "test.*")]
 	[DataRow("name/Half-Life", EGameIdentifier.Application, EGameIdentifier.Name, "Half-Life")]
 	[DataRow("n/Portal", EGameIdentifier.Application, EGameIdentifier.Name, "Portal")]
+	[DataRow("http:CS2", EGameIdentifier.Name, EGameIdentifier.Name, "http:CS2")]
 	[TestMethod]
 	internal void TryParseGameIdentifierStringReturnsExpectedValue(string input, EGameIdentifier defaultType, EGameIdentifier expectedType, string expectedValue) {
 		bool result = TryParseGameIdentifier(input, defaultType, out EGameIdentifier? type, out string? value);
@@ -76,16 +79,5 @@ internal void TryParseGameIdentifierStringReturnsExpectedValue(string input, EGa
 		Assert.AreEqual(expectedType, type);
 		Assert.AreEqual(expectedValue, value);
 	}
-
-	[DataRow("regex/pattern", EGameIdentifier.Application)]
-	[DataRow("name/Half-Life", EGameIdentifier.Application)]
-	[TestMethod]
-	internal void TryParseGameIdentifierUintReturnsFalseForNonNumericTypes(string input, EGameIdentifier defaultType) {
-		bool result = TryParseGameIdentifier(input, defaultType, out EGameIdentifier? type, out uint id);
-
-		Assert.IsFalse(result);
-		Assert.IsNull(type);
-		Assert.AreEqual(0U, id);
-	}
 }
 #pragma warning restore CA1812 // False positive, the class is used during MSTest

ArchiSteamFarm/Steam/Integration/SteamUtilities.cs

@@ -153,29 +153,22 @@ internal static bool TryParseGameIdentifier(string input, EGameIdentifier defaul
 			throw new InvalidEnumArgumentException(nameof(defaultType), (int) defaultType, typeof(EGameIdentifier));
 		}
 
-		if (input.StartsWith("http", StringComparison.OrdinalIgnoreCase)) {
-			if (Uri.TryCreate(input, UriKind.Absolute, out Uri? uri) && uri.Host.Equals(ArchiWebHandler.SteamStoreURL.Host, StringComparison.OrdinalIgnoreCase)) {
-				string[] segments = uri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries);
+		if (input.StartsWith("http", StringComparison.OrdinalIgnoreCase) && Uri.TryCreate(input, UriKind.Absolute, out Uri? uri) && uri.Host.Equals(ArchiWebHandler.SteamStoreURL.Host, StringComparison.OrdinalIgnoreCase)) {
+			string[] segments = uri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries);
 
-				if (segments.Length >= 2) {
-					type = segments[0].ToUpperInvariant() switch {
-						"APP" => EGameIdentifier.Application,
-						"SUB" => EGameIdentifier.Package,
-						_ => null
-					};
+			if (segments.Length >= 2) {
+				type = segments[0].ToUpperInvariant() switch {
+					"APP" => EGameIdentifier.Application,
+					"SUB" => EGameIdentifier.Package,
+					_ => null
+				};
 
-					if ((type != null) && uint.TryParse(segments[1], out uint pathNumericValue) && (pathNumericValue > 0)) {
-						value = segments[1];
+				if ((type != null) && uint.TryParse(segments[1], out uint pathNumericValue) && (pathNumericValue > 0)) {
+					value = segments[1];
 
-						return true;
-					}
+					return true;
 				}
 			}
-
-			type = null;
-			value = null;
-
-			return false;
 		}
 
 		int slashIndex = input.IndexOf('/', StringComparison.Ordinal);
@@ -212,11 +205,27 @@ internal static bool TryParseGameIdentifier(string input, EGameIdentifier defaul
 			return false;
 		}
 
-		if (uint.TryParse(input, out uint numericValue) && (numericValue > 0)) {
-			type = defaultType;
-			value = input;
+		switch (defaultType) {
+			case EGameIdentifier.Application:
+			case EGameIdentifier.Package:
+				if (uint.TryParse(input, out uint numericValue) && (numericValue > 0)) {
+					type = defaultType;
+					value = input;
 
-			return true;
+					return true;
+				}
+
+				break;
+			case EGameIdentifier.Name:
+				type = EGameIdentifier.Name;
+				value = input;
+
+				return true;
+			case EGameIdentifier.Regex:
+				type = EGameIdentifier.Regex;
+				value = input;
+
+				return true;
 		}
 
 		type = null;