Dropped BrowserFetcher.DownloadProgressChanged support

Author: stesee

Codeuctivity.HtmlRenderer/Renderer.cs

@@ -46,7 +46,7 @@ public Renderer(LaunchOptions? launchOptions = null)
             }
         }
 
-        private IBrowser Browser { get; set; } = default!;
+        public IBrowser? Browser { get; set; }
         private int LastProgressValue { get; set; }
 
         /// <summary>
@@ -91,21 +91,11 @@ public static Task<Renderer> CreateAsync(BrowserFetcher browserFetcher, LaunchOp
 
         private async Task<Renderer> InitializeAsync(BrowserFetcher browserFetcher)
         {
-            // for macsome reason the download progress is not called on macos
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                using var browserFetcher1 = new BrowserFetcher();
-                await browserFetcher1.DownloadAsync();
-                Browser = await Puppeteer.LaunchAsync(new LaunchOptions { Headless = true });
-            }
-            else
-            {
-                BrowserFetcher = browserFetcher;
-                BrowserFetcher.DownloadProgressChanged += DownloadProgressChanged;
-                var revisionInfo = await BrowserFetcher.DownloadAsync(PuppeteerSharp.BrowserData.Chrome.DefaultBuildId).ConfigureAwait(false);
-                LaunchOptions.ExecutablePath = revisionInfo.GetExecutablePath();
-                Browser = await Puppeteer.LaunchAsync(LaunchOptions).ConfigureAwait(false);
-            }
+
+            BrowserFetcher = browserFetcher;
+            var revisionInfo = await BrowserFetcher.DownloadAsync(PuppeteerSharp.BrowserData.Chrome.DefaultBuildId).ConfigureAwait(false);
+            LaunchOptions.ExecutablePath = revisionInfo.GetExecutablePath();
+            Browser = await Puppeteer.LaunchAsync(LaunchOptions).ConfigureAwait(false);
 
             return this;
         }
@@ -268,6 +258,7 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 Browser?.Dispose();
+
             }
         }
 

Codeuctivity.HtmlRendererCli/Program.cs

@@ -37,9 +37,8 @@ public static async Task<int> Main(string[] args)
             }
 
             Console.WriteLine($"Converting {inputPathDocX} to {outputPathHtml} using PuppeteerSharp.Renderer {Version}");
-            using var browserFetcher = new BrowserFetcher();
+            var browserFetcher = new BrowserFetcher();
             Console.WriteLine($"Fetching chromium from web, to {browserFetcher.CacheDir} .... ");
-            browserFetcher.DownloadProgressChanged += BrowserFetcher_DownloadProgressChanged;
             using var renderer = await Renderer.CreateAsync(browserFetcher).ConfigureAwait(false);
             await renderer.ConvertHtmlToPdf(inputPathDocX, outputPathHtml).ConfigureAwait(false);
             return 0;

Codeuctivity.HtmlRendererTests/RendererTests.cs

@@ -205,7 +205,7 @@ public async Task ShouldDisposeGraceful()
 
             await using (var chromiumRenderer = new Renderer())
             {
-                Assert.Null(chromiumRenderer.BrowserFetcher);
+                Assert.Null(chromiumRenderer.Browser);
             }
             var afterDisposeChromiumTasks = ChromiumProcessDisposedAsserter.CountChromiumTasks();
             Assert.Equal(afterDisposeChromiumTasks, initialChromiumTasks);