Misc refactor

Author: JustArchi

ArchiSteamFarm.Tests/SteamUtilities.cs

@@ -56,9 +56,10 @@ internal void TryParseGameIdentifierReturnsExpectedId(string input, EGameIdentif
 	[DataRow("sub/abc", EGameIdentifier.Application)]
 	[DataRow("unknown/123", EGameIdentifier.Application)]
 	[DataRow("https://store.steampowered.com/bundle/123", EGameIdentifier.Application)]
-	[DataRow("https://example.com/app/730", EGameIdentifier.Application)]
+	[DataRow("https://example.com/app/730", EGameIdentifier.Package)]
 	[DataRow("regex/pattern", EGameIdentifier.Application)]
 	[DataRow("name/Half-Life", EGameIdentifier.Application)]
+	[DataRow("steam://launch/Half-Life/", EGameIdentifier.Package)]
 	[TestMethod]
 	internal void TryParseGameIdentifierReturnsFalseForInvalidInput(string input, EGameIdentifier defaultType) {
 		bool result = TryParseGameIdentifier(input, defaultType, out EGameIdentifier? type, out uint id);
@@ -73,6 +74,7 @@ internal void TryParseGameIdentifierReturnsFalseForInvalidInput(string input, EG
 	[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")]
+	[DataRow("steam:CS2", EGameIdentifier.Name, EGameIdentifier.Name, "steam:CS2")]
 	[TestMethod]
 	internal void TryParseGameIdentifierStringReturnsExpectedValue(string input, EGameIdentifier defaultType, EGameIdentifier expectedType, string expectedValue) {
 		bool result = TryParseGameIdentifier(input, defaultType, out EGameIdentifier? type, out string? value);

ArchiSteamFarm/Steam/Integration/SteamUtilities.cs

@@ -153,37 +153,51 @@ internal static bool TryParseGameIdentifier(string input, EGameIdentifier defaul
 			throw new InvalidEnumArgumentException(nameof(defaultType), (int) defaultType, typeof(EGameIdentifier));
 		}
 
-		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 (Uri.TryCreate(input, UriKind.Absolute, out Uri? uri)) {
+			switch (uri.Scheme) {
+				case "http" or "https" when uri.Host.Equals(ArchiWebHandler.SteamStoreURL.Host, StringComparison.OrdinalIgnoreCase):
+					// Handle https://store.steampowered.com/<type>/<appID>
+					string[] httpSegments = uri.AbsolutePath.Split('/', 3, StringSplitOptions.RemoveEmptyEntries);
+
+					if (httpSegments.Length < 2) {
+						break;
+					}
+
+					type = httpSegments[0].ToUpperInvariant() switch {
+						"APP" => EGameIdentifier.Application,
+						"SUB" => EGameIdentifier.Package,
+						_ => null
+					};
+
+					if (type == null) {
+						break;
+					}
 
-			if (segments.Length >= 2) {
-				type = segments[0].ToUpperInvariant() switch {
-					"APP" => EGameIdentifier.Application,
-					"SUB" => EGameIdentifier.Package,
-					_ => null
-				};
+					if (!uint.TryParse(httpSegments[1], out uint pathNumericValue) || (pathNumericValue == 0)) {
+						type = null;
+
+						break;
+					}
 
-				if ((type != null) && uint.TryParse(segments[1], out uint pathNumericValue) && (pathNumericValue > 0)) {
-					value = segments[1];
+					value = httpSegments[1];
 
 					return true;
-				}
-			}
-		}
+				case "steam" when uri.Host.Equals("launch", StringComparison.OrdinalIgnoreCase):
+					// Handle steam://launch/<appID>/ and steam://launch/<appID>/Dialog formats
+					string[] steamSegments = uri.AbsolutePath.Split('/', 2, StringSplitOptions.RemoveEmptyEntries);
 
-		// Handle steam://launch/APPID/ and steam://launch/APPID/Dialog formats
-		if (input.StartsWith("steam://launch/", StringComparison.OrdinalIgnoreCase)) {
-			string launchPath = input["steam://launch/".Length..];
-			string[] launchSegments = launchPath.Split('/', StringSplitOptions.RemoveEmptyEntries);
+					if ((steamSegments.Length < 1) || !uint.TryParse(steamSegments[0], out uint launchAppId) || (launchAppId == 0)) {
+						break;
+					}
 
-			if ((launchSegments.Length >= 1) && uint.TryParse(launchSegments[0], out uint launchAppId) && (launchAppId > 0)) {
-				type = EGameIdentifier.Application;
-				value = launchSegments[0];
+					type = EGameIdentifier.Application;
+					value = steamSegments[0];
 
-				return true;
+					return true;
 			}
 		}
 
+		// Handle common ASF-specific format of <format>/<input>
 		int slashIndex = input.IndexOf('/', StringComparison.Ordinal);
 
 		if ((slashIndex > 0) && (input.Length > slashIndex + 1)) {