Add option and extra logging

Sicos1977 · Oct 21, 2021 · dfdfba4 · dfdfba4
1 parent b3f72cb
commit dfdfba4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/ChromeHtmlToPdfConsole/Options.cs b/ChromeHtmlToPdfConsole/Options.cs
@@ -288,7 +288,7 @@ public class Options
         ///     of images when the option <see cref="ImageResize"/> and/or <see cref="ImageRotate"/>
         ///     is being used
         /// </summary>
-        [Option("imageloadtimeout", Required = false, Default = 30000,
+        [Option("image-load-timeout", Required = false, Default = 30000,
             HelpText = "The timeout in milliseconds before this application aborts the downloading " +
                        "of images when the option --ImageResize and/or --ImageRotate is being used")]
         public int? ImageLoadTimeout { get; set; }

diff --git a/ChromeHtmlToPdfConsole/Program.cs b/ChromeHtmlToPdfConsole/Program.cs
@@ -316,6 +316,7 @@ private static void SetConverterSettings(Converter converter, Options options)
                 converter.SetDiskCache(options.DiskCacheDirectory, options.DiskCacheSize);
 
             converter.DiskCacheDisabled = options.DiskCacheDisabled;
+            converter.ImageLoadTimeout = options.ImageLoadTimeout;
 
         }
         #endregion

diff --git a/ChromeHtmlToPdfConsole/Properties/launchSettings.json b/ChromeHtmlToPdfConsole/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "ChromeHtmlToPdf": {
       "commandName": "Project",
-      "commandLineArgs": "--input \"d:\\test.htm\" --output d:\\test.pdf  --log-network-traffic --media-load-timeout 5000 --image-resize true"
+      "commandLineArgs": "--input \"d:\\test.htm\" --output d:\\test.pdf  --log-network-traffic --media-load-timeout 5000 --image-resize true --image-load-timeout 5000"
     }
   }
 }
diff --git a/ChromeHtmlToPdfLib/Browser.cs b/ChromeHtmlToPdfLib/Browser.cs
@@ -238,14 +238,19 @@ internal void NavigateTo(
                             // waiting for stylesheets, images, and sub frames to finish loading (the load event can be used to
                             // detect a fully-loaded page).
                             case "Page.lifecycleEvent" when page.Params?.Name == "DOMContentLoaded":
+
+                                WriteToLog("The 'Page.lifecycleEvent' with param name 'DomContentLoaded' has been fired, the dom content is now loaded and parsed, waiting for stylesheets, images and sub frames to finish loading");
+
                                 if (mediaLoadTimeout.HasValue && !mediaTimeoutTaskSet)
                                 {
                                     try
                                     {
+                                        WriteToLog($"Media load timeout has a value of {mediaLoadTimeout.Value} milliseconds, setting media load timeout task");
+
                                         Task.Run(async delegate
                                         {
                                             await Task.Delay(mediaLoadTimeout.Value, mediaLoadTimeoutCancellationTokenSource.Token);
-                                            WriteToLog($"Media load timed out after {mediaLoadTimeout.Value} milliseconds");
+                                            WriteToLog($"Media load timeout task timed out after {mediaLoadTimeout.Value} milliseconds");
                                             waitEvent?.Set();
                                         }, mediaLoadTimeoutCancellationTokenSource.Token);
 

diff --git a/ChromeHtmlToPdfLib/Converter.cs b/ChromeHtmlToPdfLib/Converter.cs
@@ -1148,8 +1148,7 @@ private void Convert(
 
                         if (pageSettings.PaperFormat == PaperFormat.FitPageToContent)
                         {
-                            WriteToLog(
-                                "The paper format 'FitPageToContent' is set, modifying html so that the PDF fits the HTML content");
+                            WriteToLog("The paper format 'FitPageToContent' is set, modifying html so that the PDF fits the HTML content");
                             if (documentHelper.FitPageToContent(inputUri, out var outputUri))
                             {
                                 inputUri = outputUri;