Merge pull request #14 from jbennie/debug_ul_error

Debug ul error

Author: Bubeee

HTMLToQPDF.Example/HTMLToQPDF.Example.csproj

@@ -24,7 +24,7 @@
     </PackageReference>
     <PackageReference Include="HandyControls" Version="3.4.2" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.0.4" />
-    <PackageReference Include="QuestPDF" Version="2022.9.0" />
+    <PackageReference Include="QuestPDF" Version="2023.12.5" />
   </ItemGroup>
 
   <ItemGroup>

HTMLToQPDF.Example/Utilities/PDFCreator.cs

@@ -9,6 +9,8 @@ internal static class PDFCreator
     {
         public static void Create(string html, string path, bool customStyles)
         {
+
+            QuestPDF.Settings.License = LicenseType.Community;
             Document.Create(container =>
             {
                 container.Page(page =>
@@ -17,10 +19,14 @@ public static void Create(string html, string path, bool customStyles)
                     page.MarginHorizontal(0.5f, Unit.Centimetre);
                     page.MarginVertical(1f, Unit.Centimetre);
 
-                    page.DefaultTextStyle(TextStyle.Default
-                        .Fallback(y => y.FontFamily("MS Reference Sans Serif")
+                    page.DefaultTextStyle(TextStyle.Default.FontFamily("Arial").FontSize(8).Fallback(y => y.FontFamily("Segoe UI Emoji")));
+
+                  /* page.DefaultTextStyle(TextStyle.Default
+                    //    .Fallback(y => y.FontFamily("MS Reference Sans Serif")
                         .Fallback(y => y.FontFamily("Segoe UI Emoji")
-                        .Fallback(y => y.FontFamily("Microsoft YaHei")))));
+                      //  .Fallback(y => y.FontFamily("Microsoft YaHei")))
+                    ));
+                  */
 
                     page.Content().Column(col =>
                     {

HTMLToQPDF/Components/Tags/ImgComponent.cs

@@ -19,7 +19,8 @@ protected override void ComposeSingle(IContainer container)
         {
             var src = node.GetAttributeValue("src", "");
             var img = getImgBySrc(src) ?? Placeholders.Image(200, 100);
-            container.Image(img, ImageScaling.FitArea);
+            container.AlignCenter().Image(img).FitArea();
+            
         }
     }
 }

HTMLToQPDF/HTMLToQPDF.csproj

@@ -25,8 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
-    <PackageReference Include="QuestPDF" Version="2022.9.0" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.59" />
+    <PackageReference Include="QuestPDF" Version="2023.12.5" />
   </ItemGroup>
 
   <ItemGroup>

HTMLToQPDF/Utils/ImgUtils.cs

@@ -4,6 +4,28 @@ namespace HTMLToQPDF.Utils
 {
     internal static class ImgUtils
     {
+
+        private static HttpClient _SingletonClient;
+
+        static ImgUtils() {
+
+            if (_SingletonClient == null)
+            {
+                _SingletonClient = new HttpClient();
+            }
+        }
+
+        /// <summary>
+        /// Call this manually at the end of the appliction life : Static classes don't auto Dispose.  
+        /// </summary>
+        public static void Dispose() {
+
+            if (_SingletonClient != null)
+            {
+                _SingletonClient.Dispose();
+            }
+        }
+        
         public static byte[]? GetImgBySrc(string src)
         {
             try
@@ -13,13 +35,33 @@ internal static class ImgUtils
                     var base64 = src.Substring(src.IndexOf("base64,") + "base64,".Length);
                     return Convert.FromBase64String(base64);
                 }
-                var webClient = new WebClient();
-                return webClient.DownloadData(src);
+
+                else {
+                    return Download(src).Result;
+                }
+
+           
             }
             catch
             {
                 return null;
             }
         }
+
+        private static Task<byte[]> Download(string src)
+        {
+
+            if (_SingletonClient != null)
+            {
+                Uri uri = new Uri(src);
+                return _SingletonClient.GetByteArrayAsync(uri);
+            }
+            else
+            {
+                // To prevent memory and IO socket Leaks HttpClient should be a singleton for life. 
+                throw new Exception("HttpClient not Available");
+            }
+        }
+     
     }
 }