.

Sicos1977 · Oct 11, 2023 · ddb76ed · ddb76ed
1 parent 2ce1401
commit ddb76ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/ChromiumHtmlToPdfLib/Converter.cs b/ChromiumHtmlToPdfLib/Converter.cs
@@ -33,6 +33,7 @@
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Threading;
+using System.Threading.Tasks;
 using ChromiumHtmlToPdfLib.Enums;
 using ChromiumHtmlToPdfLib.Exceptions;
 using ChromiumHtmlToPdfLib.Helpers;
@@ -1174,8 +1175,8 @@ private bool GetUrlFromFile(string fileName, out string url)
     }
     #endregion
 
-    #region Convert
-    private void Convert(
+    #region ConvertAsync
+    private async Task ConvertAsync(
         OutputFormat outputFormat,
         object input,
         Stream outputStream,
@@ -1250,7 +1251,8 @@ private void Convert(
                     {
                         if (SanitizeHtml)
                         {
-                            if (documentHelper.SanitizeHtml(inputUri, Sanitizer, out var outputUri, ref safeUrls))
+                            var result = documentHelper.SanitizeHtmlAsync(inputUri, Sanitizer, out var outputUri, ref safeUrls)
+                            if (documentHelper.SanitizeHtmlAsync(inputUri, Sanitizer, out var outputUri, ref safeUrls))
                             {
                                 inputUri = outputUri;
                             }
@@ -1472,7 +1474,7 @@ public void ConvertToPdf(
         int? mediaLoadTimeout = null,
         ILogger logger = null)
     {
-        Convert(
+        ConvertAsync(
             OutputFormat.Pdf,
             inputUri,
             outputStream,
@@ -1599,7 +1601,7 @@ public void ConvertToPdf(
         int? mediaLoadTimeout = null,
         ILogger logger = null)
     {
-        Convert(
+        ConvertAsync(
             OutputFormat.Pdf,
             html,
             outputStream,
@@ -1729,7 +1731,7 @@ public void ConvertToImage(
         int? mediaLoadTimeout = null,
         ILogger logger = null)
     {
-        Convert(
+        ConvertAsync(
             OutputFormat.Image,
             inputUri,
             outputStream,
@@ -1788,7 +1790,7 @@ public void ConvertToImage(
         int? mediaLoadTimeout = null,
         ILogger logger = null)
     {
-        Convert(
+        ConvertAsync(
             OutputFormat.Image,
             html,
             outputStream,

diff --git a/ChromiumHtmlToPdfLib/Helpers/DocumentHelper.cs b/ChromiumHtmlToPdfLib/Helpers/DocumentHelper.cs
@@ -302,11 +302,15 @@ public async Task<SanitizeHtmlResult> SanitizeHtmlAsync(ConvertUri inputUri, Htm
 
             await using var fileStream = new FileStream(sanitizedOutputFile, FileMode.CreateNew, FileAccess.Write);
             if (inputUri.Encoding != null)
-                await using (var textWriter = new StreamWriter(fileStream, inputUri.Encoding))
-                    document.ToHtml(textWriter, new HtmlMarkupFormatter());
+            {
+                await using var textWriter = new StreamWriter(fileStream, inputUri.Encoding);
+                document.ToHtml(textWriter, new HtmlMarkupFormatter());
+            }
             else
-                await using (var textWriter = new StreamWriter(fileStream))
-                    document.ToHtml(textWriter, new HtmlMarkupFormatter());
+            {
+                await using var textWriter = new StreamWriter(fileStream);
+                document.ToHtml(textWriter, new HtmlMarkupFormatter());
+            }
 
             WriteToLog("Sanitized webpage written");
             return new SanitizeHtmlResult(true, outputUri, safeUrls);