.

Author: SimonCropp

readme.md

@@ -13,13 +13,14 @@ public abstract class HtmlConverter
     /// <param name="html">The HTML content to render.</param>
     /// <param name="outputDirectory">Directory where PNG files will be saved.</param>
     /// <param name="options">Conversion options (optional).</param>
+    /// <param name="cancel">Cancellation token.</param>
     /// <returns>Result containing paths to generated images and page count.</returns>
-    public ConversionResult ConvertToImages(string html, string outputDirectory, ConversionOptions? options = null)
+    public async Task<ConversionResult> ConvertToImages(string html, string outputDirectory, ConversionOptions? options = null, CancellationToken cancel = default)
     {
         options ??= new();
         Directory.CreateDirectory(outputDirectory);
 
-        var document = ParseHtml(html);
+        var document = await ParseHtml(html, cancel);
         var imagePaths = new List<string>();
 
         var pageIndex = 0;
@@ -42,12 +43,13 @@ public ConversionResult ConvertToImages(string html, string outputDirectory, Con
     /// </summary>
     /// <param name="html">The HTML content to render.</param>
     /// <param name="options">Conversion options (optional).</param>
+    /// <param name="cancel">Cancellation token.</param>
     /// <returns>List of PNG image data for each page.</returns>
-    public IReadOnlyList<byte[]> ConvertToImageData(string html, ConversionOptions? options = null)
+    public async Task<IReadOnlyList<byte[]>> ConvertToImageData(string html, ConversionOptions? options = null, CancellationToken cancel = default)
     {
         options ??= new();
 
-        var document = ParseHtml(html);
+        var document = await ParseHtml(html, cancel);
         var imageData = new List<byte[]>();
 
         RenderPages(document, options, writePng =>
@@ -60,12 +62,12 @@ public IReadOnlyList<byte[]> ConvertToImageData(string html, ConversionOptions?
         return imageData;
     }
 
-    static ParsedDocument ParseHtml(string html)
+    static async Task<ParsedDocument> ParseHtml(string html, CancellationToken cancel)
     {
-        var elements = HtmlParser.Parse(html);
-        return new ParsedDocument
+        var elements = await HtmlParser.Parse(html, cancel);
+        return new()
         {
-            PageSettings = new PageSettings
+            PageSettings = new()
             {
                 WidthPoints = DefaultPageSize.WidthPoints,
                 HeightPoints = DefaultPageSize.HeightPoints,

src/Morph.Html/HtmlConverter.cs

@@ -21,6 +21,16 @@ public static List<DocumentElement> Parse(string html)
         return elements;
     }
 
+    /// <summary>
+    /// Async version of Parse. Currently delegates to the sync implementation,
+    /// but will support async image fetching in the future.
+    /// </summary>
+    public static Task<List<DocumentElement>> Parse(string html, CancellationToken cancel)
+    {
+        cancel.ThrowIfCancellationRequested();
+        return Task.FromResult(Parse(html));
+    }
+
     static void ParseNodes(INodeList nodes, List<DocumentElement> elements)
     {
         foreach (var node in nodes)

src/Morph.Html/HtmlParser.cs

@@ -4,7 +4,7 @@
   "PageDiffs": [
     {
       "Page": 1,
-      "ErrorMetric": 0.0999,
+      "ErrorMetric": 0.1057,
       "ExpectedFile": "expected_0001.png",
       "VerifiedFile": "results_imagesharp#page_0001.verified.png",
       "ReceivedFile": "results_imagesharp#page_0001.received.png"

src/Tests/Inputs/agendas-minutes/06/results_imagesharp#page_0001.verified.png

@@ -4,7 +4,7 @@
   "PageDiffs": [
     {
       "Page": 1,
-      "ErrorMetric": 0.0996,
+      "ErrorMetric": 0.1055,
       "ExpectedFile": "expected_0001.png",
       "VerifiedFile": "results_skia#page_0001.verified.png",
       "ReceivedFile": "results_skia#page_0001.received.png"

src/Tests/Inputs/agendas-minutes/06/results_imagesharp.verified.json

@@ -11,7 +11,7 @@
     },
     {
       "Page": 2,
-      "ErrorMetric": 0.6782,
+      "ErrorMetric": 0.6744,
       "ExpectedFile": "expected_0002.png",
       "VerifiedFile": "results_skia#page_0002.verified.png",
       "ReceivedFile": "results_skia#page_0002.received.png"