Remove obsolete parameter

Sicos1977 · May 22, 2024 · 74895c8 · 74895c8
1 parent fb95078
commit 74895c8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/ChromiumHtmlToPdfLib/Browser.cs b/ChromiumHtmlToPdfLib/Browser.cs
@@ -679,14 +679,11 @@ internal async Task PrintToPdfAsync(Stream outputStream,
         message.AddParameter("marginLeft", pageSettings.MarginLeft);
         message.AddParameter("marginRight", pageSettings.MarginRight);
         message.AddParameter("pageRanges", pageSettings.PageRanges ?? string.Empty);
-        message.AddParameter("ignoreInvalidPageRanges", pageSettings.IgnoreInvalidPageRanges);
-        if (!string.IsNullOrEmpty(pageSettings.HeaderTemplate))
-            message.AddParameter("headerTemplate", pageSettings.HeaderTemplate!);
-        if (!string.IsNullOrEmpty(pageSettings.FooterTemplate))
-            message.AddParameter("footerTemplate", pageSettings.FooterTemplate!);
+        if (!string.IsNullOrEmpty(pageSettings.HeaderTemplate)) message.AddParameter("headerTemplate", pageSettings.HeaderTemplate!);
+        if (!string.IsNullOrEmpty(pageSettings.FooterTemplate)) message.AddParameter("footerTemplate", pageSettings.FooterTemplate!);
         message.AddParameter("preferCSSPageSize", pageSettings.PreferCSSPageSize);
         message.AddParameter("transferMode", "ReturnAsStream");
-        message.AddParameter("generateTaggedPDF", pageSettings.TaggedPDF);
+        message.AddParameter("generateTaggedPDF", pageSettings.TaggedPdf);
         message.AddParameter("generateDocumentOutline", pageSettings.GenerateOutline);
 
         _logger?.Info("Sending PDF request to Chromium");
@@ -695,6 +692,11 @@ internal async Task PrintToPdfAsync(Stream outputStream,
             ? await _pageConnection.SendForResponseAsync(message, cancellationToken).ConfigureAwait(false)
             : await _pageConnection.SendForResponseAsync(message, new CancellationTokenSource(countdownTimer.MillisecondsLeft).Token).ConfigureAwait(false);
 
+        System.IO.File.AppendAllText(@"e:\logs\converter\test.log", $"{DateTime.Now:yyyy-MM-ddTHH:mm:ss.fff} - {result}{Environment.NewLine}");
+
+        if (string.IsNullOrEmpty(result))
+            throw new ConversionException("Conversion failed ... did not get the expected response from Chromium");
+
         var printToPdfResponse = PrintToPdfResponse.FromJson(result);
 
         if (printToPdfResponse.Error != null || string.IsNullOrEmpty(printToPdfResponse.Result?.Stream))

diff --git a/ChromiumHtmlToPdfLib/Connection.cs b/ChromiumHtmlToPdfLib/Connection.cs
@@ -266,7 +266,7 @@ internal async Task<string> SendForResponseAsync(Message message, CancellationTo
             await _webSocket.SendAsync(MessageToBytes(message), WebSocketMessageType.Text, true, cancellationToken).ConfigureAwait(false);
 
             tcs.Task.Wait(cancellationToken);
-            return cancellationToken.IsCancellationRequested ? tcs.Task.Result : string.Empty;
+            return cancellationToken.IsCancellationRequested ? string.Empty : tcs.Task.Result;
         }
         catch (Exception exception)
         {

diff --git a/ChromiumHtmlToPdfLib/Converter.cs b/ChromiumHtmlToPdfLib/Converter.cs
@@ -793,6 +793,7 @@ void OnChromiumProcessOnErrorDataReceived(object _, DataReceivedEventArgs args)
     }
     #endregion
 
+    #region GetChromiumLocation
     /// <summary>
     ///     Returns the location of the Chromium based browser or <c>null</c> when not found
     /// </summary>
@@ -808,6 +809,7 @@ void OnChromiumProcessOnErrorDataReceived(object _, DataReceivedEventArgs args)
             _ => throw new ArgumentOutOfRangeException(nameof(browser), browser, null)
         };
     }
+    #endregion
 
     #region ReadDevToolsActiveFileAsync
     /// <summary>

diff --git a/ChromiumHtmlToPdfLib/Settings/PageSettings.cs b/ChromiumHtmlToPdfLib/Settings/PageSettings.cs
@@ -106,11 +106,6 @@ public class PageSettings : ICloneable
     /// </summary>
     public string? PageRanges { get; set; }
 
-    /// <summary>
-    ///     Whether to silently ignore invalid but successfully parsed page ranges, such as '3-2'. Defaults to false.
-    /// </summary>
-    public bool IgnoreInvalidPageRanges { get; set; }
-
     /// <summary>
     ///     Whether or not to prefer page size as defined by css. Defaults to false, in which case the content will be scaled
     ///     to fit the paper size.
@@ -126,11 +121,11 @@ public class PageSettings : ICloneable
     /// <summary>
     ///     Generate tagged PDF. Defaults to true.
     /// </summary>
-    public bool TaggedPDF { get; set; } = true;
+    public bool TaggedPdf { get; set; } = true;
 
     /// <summary>
     ///     Generate outline bookmarks from header tags (H1-H6). Defaults to false.
-    ///     Requires both <see cref="Converter.UseOldHeadlessMode"/> and <see cref="TaggedPDF"/> set to <c>true</c>.
+    ///     Requires both <see cref="Converter.UseOldHeadlessMode"/> and <see cref="TaggedPdf"/> set to <c>true</c>.
     /// </summary>
     public bool GenerateOutline { get; set; }
     #endregion
@@ -178,7 +173,7 @@ public void ResetToDefaultSettings()
         MarginLeft = 0.4;
         MarginRight = 0.4;
         PageRanges = string.Empty;
-        TaggedPDF = true;
+        TaggedPdf = true;
         GenerateOutline = false;
     }
     #endregion
@@ -283,11 +278,10 @@ public object Clone()
             MarginLeft = MarginLeft,
             MarginRight = MarginRight,
             PageRanges = PageRanges,
-            IgnoreInvalidPageRanges = IgnoreInvalidPageRanges,
             PreferCSSPageSize = PreferCSSPageSize,
-            TaggedPDF = TaggedPDF,
+            TaggedPdf = TaggedPdf,
             GenerateOutline = GenerateOutline
         };
     }
     #endregion
-}
+}