Code cleanup

Author: rosolko

WebDriverManager/DriverConfigs/Impl/ChromeConfig.cs

@@ -16,7 +16,7 @@ public class ChromeConfig : IDriverConfig
         private const string ExactReleaseVersionPatternUrl = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_<version>";
 
         /// <summary>
-        /// The minimum version required to download chrome drivers from Chrome for Testing API's 
+        /// The minimum version required to download chrome drivers from Chrome for Testing API's
         /// </summary>
         private static readonly Version MinChromeForTestingDriverVersion = new Version("115.0.5763.0");
 
@@ -165,13 +165,13 @@ private string GetUrlFromChromeStorage(Architecture architecture)
         /// </summary>
         /// <param name="version">The desired version to download</param>
         /// <returns>Chrome driver version info (version number, revision number, download URLs)</returns>
-        private ChromeVersionInfo GetVersionFromChromeForTestingApi(string noRevisionVersion)
+        private ChromeVersionInfo GetVersionFromChromeForTestingApi(string version)
         {
             var knownGoodVersions = ChromeForTestingClient.GetKnownGoodVersionsWithDownloads();
 
             // Pull latest patch version
             _chromeVersionInfo = knownGoodVersions.Versions.LastOrDefault(
-                cV => cV.Version.Contains(noRevisionVersion)
+                cV => cV.Version.Contains(version)
             );
 
             return _chromeVersionInfo;
@@ -206,7 +206,7 @@ private string GetUrlFromChromeForTestingApi(Architecture architecture)
             var result = _chromeVersionInfo.Downloads.ChromeDriver
                 .FirstOrDefault(driver => driver.Platform == platform);
 
-            return result.Url;
+            return result?.Url;
         }
 
         private string GetRawBrowserVersion()

WebDriverManager/DriverManager.cs

@@ -15,7 +15,7 @@ public class DriverManager
 
         private IBinaryService _binaryService;
         private readonly IVariableService _variableService;
-        private string _downloadDirectory = Directory.GetCurrentDirectory();
+        private readonly string _downloadDirectory = Directory.GetCurrentDirectory();
 
         public DriverManager()
         {
@@ -36,7 +36,10 @@ public DriverManager(IBinaryService binaryService, IVariableService variableServ
 
         public DriverManager WithProxy(IWebProxy proxy)
         {
-            _binaryService = new BinaryService {Proxy = proxy};
+            lock (Object)
+            {
+                _binaryService = new BinaryService {Proxy = proxy};
+            }
             ChromeForTestingClient.Proxy = proxy;
             WebRequest.DefaultWebProxy = proxy;
             return this;

WebDriverManager/Services/Impl/BinaryService.cs

@@ -89,10 +89,10 @@ public string SetupBinary(string url, string zipPath, string binaryPath)
             Exception renameException = null;
             try
             {
-                string[] files = Directory.GetFiles(stagingDir);
+                var files = Directory.GetFiles(stagingDir);
 
                 // Copy the files and overwrite destination files if they already exist.
-                foreach (string file in files)
+                foreach (var file in files)
                 {
                     // Use static Path methods to extract only the file name from the path.
                     var fileName = Path.GetFileName(file);
@@ -116,6 +116,7 @@ public string SetupBinary(string url, string zipPath, string binaryPath)
             {
                 Console.Error.WriteLine(ex.ToString());
             }
+
             try
             {
                 RemoveZip(zipPath);
@@ -141,23 +142,19 @@ public string DownloadZip(string url, string destination)
             if (File.Exists(destination)) return destination;
             if (Proxy == null) CheckProxySystemVariables();
 
-            if (Proxy != null)
-            {
-                using (var webClient = new WebClient() {Proxy = Proxy})
-                {
-                    webClient.DownloadFile(new Uri(url), destination);
-                }
-            }
-            else
+            using (var webClient = new WebClient())
             {
-                using (var webClient = new WebClient())
+                if (Proxy != null)
                 {
-                    webClient.DownloadFile(new Uri(url), destination);
+                    webClient.Proxy = Proxy;
                 }
+
+                webClient.DownloadFile(new Uri(url), destination);
             }
 
             return destination;
         }
+
         protected void CheckProxySystemVariables()
         {
             const string nameHttp = "HTTP_PROXY";
@@ -187,17 +184,16 @@ protected string UnZip(string path, string destination, string name)
             {
                 foreach (ZipEntry zipEntry in zip)
                 {
-                    if (zipEntry.Name.EndsWith(name) && zipEntry.IsFile)
+                    if (!zipEntry.Name.EndsWith(name) || !zipEntry.IsFile) continue;
+
+                    var buffer = new byte[4096];
+                    using (var zipStream = zip.GetInputStream(zipEntry))
                     {
-                        byte[] buffer = new byte[4096];
-                        using (Stream zipStream = zip.GetInputStream(zipEntry))
+                        // Unzip file in buffered chunks. This is just as fast as unpacking to a buffer the full size
+                        // of the file, but does not waste memory.
+                        using (var streamWriter = File.Create(destination))
                         {
-                            // Unzip file in buffered chunks. This is just as fast as unpacking to a buffer the full size
-                            // of the file, but does not waste memory.
-                            using (FileStream streamWriter = File.Create(destination))
-                            {
-                                StreamUtils.Copy(zipStream, streamWriter, buffer);
-                            }
+                            StreamUtils.Copy(zipStream, streamWriter, buffer);
                         }
                     }
                 }

WebDriverManager/WebDriverManager.csproj

@@ -18,7 +18,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AngleSharp" Version="1.1.0" />
+        <PackageReference Include="AngleSharp" Version="1.1.2" />
         <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="SharpZipLib" Version="1.4.2" />