Release 0.9.3.2

Added solution for use between multiple sites/apps simultaneously; also added GZip compression to reduce the assembly size by over half
tuespetre · Apr 28, 2014 · 527e8a0 · 527e8a0
1 parent 3a78cf0
commit 527e8a0
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 19 deletions.
diff --git a/Pechkin/Pechkin.csproj b/Pechkin/Pechkin.csproj
@@ -130,10 +130,8 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="wkhtmltox_64.dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="wkhtmltox_32.dll" />
+    <None Include="wkhtmltox_32.dll.gz" />
+    <None Include="wkhtmltox_64.dll.gz" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

diff --git a/Pechkin/PechkinBindings.cs b/Pechkin/PechkinBindings.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.IO.Compression;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using Pechkin.Properties;
@@ -12,7 +13,7 @@ internal static class PechkinBindings
     {
         static PechkinBindings()
         {
-            var raw = (IntPtr.Size == 8) ? Resources.wkhtmltox_64 : Resources.wkhtmltox_32;
+            var raw = (IntPtr.Size == 8) ? Resources.wkhtmltox_64_dll : Resources.wkhtmltox_32_dll;
 
             SetupUnmanagedAssembly("wkhtmltox.dll", raw);
         }
@@ -127,10 +128,11 @@ private static void SetupUnmanagedAssembly(string fileName, byte[] assemblyRaw)
             var basePath = Path.Combine(
                 Path.GetTempPath(),
                 String.Format(
-                    "{0}{1}_{2}",
+                    "{0}{1}_{2}_{3}",
                     assemblyName.Name.ToString(),
                     assemblyName.Version.ToString(),
-                    IntPtr.Size == 8 ? "x64" : "x86"));
+                    IntPtr.Size == 8 ? "x64" : "x86",
+                    String.Join(String.Empty, AppDomain.CurrentDomain.BaseDirectory.Split(Path.GetInvalidFileNameChars()))));
 
             if (!Directory.Exists(basePath))
             {
@@ -141,7 +143,17 @@ private static void SetupUnmanagedAssembly(string fileName, byte[] assemblyRaw)
 
             if (!File.Exists(fileName))
             {
-                File.WriteAllBytes(fileName, assemblyRaw);
+                var decompressed = new GZipStream(new MemoryStream(assemblyRaw), CompressionMode.Decompress);
+                var writeBuffer = new byte[8192];
+                var writeLength = 0;
+
+                using (var newFile = File.Open(fileName, FileMode.Create))
+                {
+                    while((writeLength = decompressed.Read(writeBuffer, 0, writeBuffer.Length)) > 0) 
+                    {
+                        newFile.Write(writeBuffer, 0, writeLength);
+                    }
+                }
             }
 
             WinApiHelper.LoadLibrary(fileName);

diff --git a/Pechkin/Properties/AssemblyInfo.cs b/Pechkin/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.3.1")]
-[assembly: AssemblyFileVersion("0.9.3.1")]
+[assembly: AssemblyVersion("0.9.3.2")]
+[assembly: AssemblyFileVersion("0.9.3.2")]
diff --git a/Pechkin/Properties/Resources.Designer.cs b/Pechkin/Properties/Resources.Designer.cs
diff --git a/Pechkin/Properties/Resources.resx b/Pechkin/Properties/Resources.resx
@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="wkhtmltox_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\wkhtmltox_32.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="wkhtmltox_32_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\wkhtmltox_32.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="wkhtmltox_64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\wkhtmltox_64.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="wkhtmltox_64_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\wkhtmltox_64.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
diff --git a/Pechkin/wkhtmltox_32.dll b/Pechkin/wkhtmltox_32.dll
diff --git a/Pechkin/wkhtmltox_32.dll.gz b/Pechkin/wkhtmltox_32.dll.gz
diff --git a/Pechkin/wkhtmltox_64.dll b/Pechkin/wkhtmltox_64.dll
diff --git a/Pechkin/wkhtmltox_64.dll.gz b/Pechkin/wkhtmltox_64.dll.gz