Merge pull request #24 from Rzaw/v56.1

Updated version v56.1
balbarak · Sep 2, 2022 · 776ec2d · 776ec2d
2 parents 5ad093d + 8401f0e
commit 776ec2d
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 11 deletions.
diff --git a/src/Balbarak.WeasyPrint.Test/WeasyPrintClientTest.cs b/src/Balbarak.WeasyPrint.Test/WeasyPrintClientTest.cs
@@ -8,8 +8,8 @@ namespace Balbarak.WeasyPrint.Test
 {
     public class WeasyPrintClientTest
     {
-        private readonly string _inputFolder = @"C:\Repos\WeasyPrint-netcore\src\Balbarak.WeasyPrint.Test\inputs";
-        private readonly string _outputFolder = @"C:\Repos\WeasyPrint-netcore\src\Balbarak.WeasyPrint.Test\outputs";
+        private readonly string _inputFolder = @"C:\Users\MatijsLode\Source\OpenSource\WeasyPrint-netcore\src\Balbarak.WeasyPrint.Test\inputs";
+        private readonly string _outputFolder = @"C:\Users\MatijsLode\Source\OpenSource\WeasyPrint-netcore\src\Balbarak.WeasyPrint.Test\outputs";
 
         [Fact]
         public async Task Should_Create_Pdf_From_Input_Text_Async()

diff --git a/src/Balbarak.WeasyPrint.Test/inputs/complex.html b/src/Balbarak.WeasyPrint.Test/inputs/complex.html
@@ -87,16 +87,46 @@
     <div class="page">
 
         <h1 style="text-align:center">
-            بسم الله الرحمن الرحيم
+            Hello form complex format
         </h1>
 
     </div>
     <div class="page">
 
         <h1 style="text-align:center">
-            صفحة رقم 2
+            This is page 2
         </h1>
     </div>
 
+    <div class="page">
+
+        <table>
+            <thead>
+                <tr>
+                    <th>No</th>
+                    <th>Name</th>
+                    <th>Available</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>1</td>
+                    <td>Es</td>
+                    <td>Yes</td>
+                </tr>
+                <tr>
+                    <td>2</td>
+                    <td>Šeit</td>
+                    <td>No</td>
+                </tr>
+                <tr>
+                    <td>3</td>
+                    <td>Biju</td>
+                    <td>Maybe</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
 </body>
 </html>
diff --git a/src/Balbarak.WeasyPrint.Test/outputs/output.pdf b/src/Balbarak.WeasyPrint.Test/outputs/output.pdf
diff --git a/src/Balbarak.WeasyPrint.Test/outputs/url.pdf b/src/Balbarak.WeasyPrint.Test/outputs/url.pdf
diff --git a/src/Balbarak.WeasyPrint/Balbarak.WeasyPrint.csproj b/src/Balbarak.WeasyPrint/Balbarak.WeasyPrint.csproj
@@ -22,6 +22,11 @@
 
 
   <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Update="Resources\FileResx.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -30,6 +35,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Update="Resources\FileResx.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>FileResx.Designer.cs</LastGenOutput>

diff --git a/src/Balbarak.WeasyPrint/Helpers/FilesManager.cs b/src/Balbarak.WeasyPrint/Helpers/FilesManager.cs
@@ -36,7 +36,7 @@ public Task InitFilesAsync()
                     Directory.CreateDirectory(FolderPath);
                 }
 
-                var folderData = FileResx.win64_v51;
+                var folderData = FileResx.weasyprint_python_binary;
 
                 var compressedFileName = Path.Combine(FolderPath, "data.zip");
 
@@ -111,7 +111,7 @@ private string GetFolderPath()
         {
             var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
 
-            var folderName = "balbarak-weasyprintv51";
+            var folderName = "netwrapper-weasyprint";
 
             var fullPath = Path.Combine(appDataPath, folderName);
 

diff --git a/src/Balbarak.WeasyPrint/Resources/FileResx.Designer.cs b/src/Balbarak.WeasyPrint/Resources/FileResx.Designer.cs
diff --git a/src/Balbarak.WeasyPrint/Resources/FileResx.resx b/src/Balbarak.WeasyPrint/Resources/FileResx.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="win64_v51" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>win64-v51.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="weasyprint_python_binary" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>weasyprint-python-binary.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
diff --git a/...lbarak.WeasyPrint/Resources/win64-v51.zip → ...nt/Resources/weasyprint-python-binary.zip b/...lbarak.WeasyPrint/Resources/win64-v51.zip → ...nt/Resources/weasyprint-python-binary.zip