Go back to dictionary style

Author: RenderMichael

dotnet/src/webdriver/DriverFinder.cs

@@ -18,6 +18,7 @@
 // </copyright>
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
@@ -34,7 +35,7 @@ namespace OpenQA.Selenium
     public class DriverFinder
     {
         private readonly DriverOptions options;
-        private SeleniumManagerPaths? paths;
+        private Dictionary<string, string>? paths;
         private const string BrowserPathKey = "browser_path";
         private const string DriverPathKey = "driver_path";
 
@@ -55,7 +56,7 @@ public DriverFinder(DriverOptions options)
         /// </returns>
         public string GetBrowserPath()
         {
-            return BinaryPaths().BrowserPath;
+            return BinaryPaths()[SeleniumManager.BrowserPath];
         }
 
         /// <summary>
@@ -66,7 +67,7 @@ public string GetBrowserPath()
         /// </returns>
         public string GetDriverPath()
         {
-            return BinaryPaths().DriverPath;
+            return BinaryPaths()[SeleniumManager.DriverPath];
         }
 
         /// <summary>
@@ -103,16 +104,16 @@ public bool TryGetBrowserPath([NotNullWhen(true)] out string? browserPath)
         /// A Dictionary with the validated browser and driver path.
         /// </returns>
         /// <exception cref="NoSuchDriverException">If one of the paths does not exist.</exception>
-        private SeleniumManagerPaths BinaryPaths()
+        private Dictionary<string, string> BinaryPaths()
         {
-            if (paths is not null && !string.IsNullOrWhiteSpace(paths.DriverPath))
+            if (paths is not null && !string.IsNullOrWhiteSpace(paths[SeleniumManager.DriverPath]))
             {
                 return paths;
             }
 
-            SeleniumManagerPaths binaryPaths = SeleniumManager.BinaryPaths(CreateArguments());
-            string driverPath = binaryPaths.DriverPath;
-            string browserPath = binaryPaths.BrowserPath;
+            Dictionary<string, string> binaryPaths = SeleniumManager.BinaryPaths(CreateArguments());
+            string driverPath = binaryPaths[SeleniumManager.DriverPath];
+            string browserPath = binaryPaths[SeleniumManager.BrowserPath];
 
             if (File.Exists(driverPath))
             {

dotnet/src/webdriver/SeleniumManager.cs

@@ -38,6 +38,9 @@ namespace OpenQA.Selenium
     /// </summary>
     public static class SeleniumManager
     {
+        internal const string DriverPath = "driver_path";
+        internal const string BrowserPath = "browser_path";
+
         private static readonly ILogger _logger = Log.GetLogger(typeof(SeleniumManager));
 
         private static readonly Lazy<string> _lazyBinaryFullPath = new(() =>
@@ -80,7 +83,7 @@ public static class SeleniumManager
         /// <returns>
         /// An array with two entries, one for the driver path, and another one for the browser path.
         /// </returns>
-        public static SeleniumManagerPaths BinaryPaths(string arguments)
+        public static Dictionary<string, string> BinaryPaths(string arguments)
         {
             StringBuilder argsBuilder = new StringBuilder(arguments);
             argsBuilder.Append(" --language-binding csharp");
@@ -90,12 +93,17 @@ public static SeleniumManagerPaths BinaryPaths(string arguments)
                 argsBuilder.Append(" --debug");
             }
 
-            var binaryPaths = RunCommand(_lazyBinaryFullPath.Value, argsBuilder.ToString());
+            var smCommandResult = RunCommand(_lazyBinaryFullPath.Value, argsBuilder.ToString());
+            Dictionary<string, string> binaryPaths = new()
+            {
+                { BrowserPath, smCommandResult.BrowserPath },
+                { DriverPath, smCommandResult.DriverPath }
+            };
 
             if (_logger.IsEnabled(LogEventLevel.Trace))
             {
-                _logger.Trace($"Driver path: {binaryPaths.DriverPath}");
-                _logger.Trace($"Browser path: {binaryPaths.BrowserPath}");
+                _logger.Trace($"Driver path: {binaryPaths[DriverPath]}");
+                _logger.Trace($"Browser path: {binaryPaths[BrowserPath]}");
             }
 
             return binaryPaths;
@@ -109,7 +117,7 @@ public static SeleniumManagerPaths BinaryPaths(string arguments)
         /// <returns>
         /// the standard output of the execution.
         /// </returns>
-        private static SeleniumManagerPaths RunCommand(string fileName, string arguments)
+        private static ResultResponse RunCommand(string fileName, string arguments)
         {
             Process process = new Process();
             process.StartInfo.FileName = _lazyBinaryFullPath.Value;
@@ -203,23 +211,19 @@ private static SeleniumManagerPaths RunCommand(string fileName, string arguments
         }
     }
 
-    internal sealed record SeleniumManagerResponse(IReadOnlyList<LogEntryResponse> Logs, SeleniumManagerPaths Result)
+    internal sealed record SeleniumManagerResponse(IReadOnlyList<LogEntryResponse> Logs, ResultResponse Result)
     {
         public sealed record LogEntryResponse(string Level, string Message);
-    }
 
-    /// <summary>
-    /// Response from Selenium Manager about the paths and their locations.
-    /// </summary>
-    /// <param name="DriverPath">The path to the driver binary.</param>
-    /// <param name="BrowserPath">The path to the browser binary, or <see cref="string.Empty"/> if none exists.</param>
-    public sealed record SeleniumManagerPaths
-    (
-        [property: JsonPropertyName("driver_path")]
+        internal sealed record ResultResponse
+        (
+            [property: JsonPropertyName("driver_path")]
             string DriverPath,
-        [property: JsonPropertyName("browser_path")]
+            [property: JsonPropertyName("browser_path")]
             string BrowserPath
-    );
+        );
+    }
+
 
     [JsonSerializable(typeof(SeleniumManagerResponse))]
     [JsonSourceGenerationOptions(PropertyNameCaseInsensitive = true)]