Merge pull request #10 from Codeuctivity/CustomImageHandler

ExportImageHandler implemented

Author: stesee

OpenXmlToHtml/ExportImageHandler.cs

@@ -0,0 +1,32 @@
+using OpenXmlPowerTools;
+using OpenXmlPowerTools.OpenXMLWordprocessingMLToHtmlConverter;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Linq;
+
+namespace Codeuctivity.OpenXmlToHtml
+{
+    public class ExportImageHandler : IImageHandler
+    {
+        public IDictionary<string, byte[]> Images { get; }
+
+        public ExportImageHandler(IDictionary<string, byte[]> images)
+        {
+            Images = images;
+        }
+
+        public XElement TransformImage(ImageInfo imageInfo)
+        {
+            var cid = Guid.NewGuid().ToString();
+            using var memoryStream = new MemoryStream();
+            imageInfo.Bitmap.Save(memoryStream, imageInfo.Bitmap.RawFormat);
+
+            Images.Add(cid, memoryStream.ToArray());
+
+            var cidReference = $"cid: {cid}";
+
+            return new XElement(Xhtml.img, new XAttribute(NoNamespace.src, cidReference), imageInfo.ImgStyleAttribute, imageInfo.AltText != null ? new XAttribute(NoNamespace.alt, imageInfo.AltText) : null);
+        }
+    }
+}

OpenXmlToHtml/OpenXmlToHtml.cs

@@ -2,6 +2,7 @@
 using OpenXmlPowerTools;
 using OpenXmlPowerTools.OpenXMLWordprocessingMLToHtmlConverter;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -55,10 +56,27 @@ public static Task<Stream> ConvertToHtmlAsync(Stream sourceOpenXml, string fallb
                 throw new ArgumentNullException(nameof(sourceOpenXml));
             }
 
-            return ConvertToHtmlInternalAsync(sourceOpenXml, fallbackPageTitle);
+            return ConvertToHtmlInternalAsync(sourceOpenXml, fallbackPageTitle, new ImageHandler());
         }
 
-        private static async Task<Stream> ConvertToHtmlInternalAsync(Stream sourceOpenXml, string fallbackPageTitle)
+        /// <summary>
+        /// Converts docx to html
+        /// </summary>
+        /// <param name="sourceOpenXml"></param>
+        /// <param name="fallbackPageTitle"></param>
+        /// <param name="images"></param>
+        /// <returns>selfContainedHtml</returns>
+        public static Task<Stream> ConvertToHtmlAsync(Stream sourceOpenXml, string fallbackPageTitle, IDictionary<string, byte[]> images)
+        {
+            if (sourceOpenXml == null)
+            {
+                throw new ArgumentNullException(nameof(sourceOpenXml));
+            }
+
+            return ConvertToHtmlInternalAsync(sourceOpenXml, fallbackPageTitle, new ExportImageHandler(images));
+        }
+
+        private static async Task<Stream> ConvertToHtmlInternalAsync(Stream sourceOpenXml, string fallbackPageTitle, IImageHandler imageHandler)
         {
             using var memoryStream = new MemoryStream();
             await sourceOpenXml.CopyToAsync(memoryStream).ConfigureAwait(false);
@@ -69,17 +87,17 @@ private static async Task<Stream> ConvertToHtmlInternalAsync(Stream sourceOpenXm
             var computedPageTitle = coreFilePropertiesPart?.GetXDocument().Descendants(DC.title).FirstOrDefault();
             var pageTitle = string.IsNullOrEmpty(computedPageTitle?.Value) ? fallbackPageTitle : computedPageTitle!.Value;
 
-            var htmlElement = WmlToHtmlConverter.ConvertToHtml(wordProcessingDocument, CreateHtmlConverterSettings(pageTitle));
+            var htmlElement = WmlToHtmlConverter.ConvertToHtml(wordProcessingDocument, CreateHtmlConverterSettings(pageTitle, imageHandler));
 
             var memoryStreamHtml = new MemoryStream();
             htmlElement.Save(memoryStreamHtml);
             memoryStreamHtml.Position = 0;
             return memoryStreamHtml;
         }
 
-        private static WmlToHtmlConverterSettings CreateHtmlConverterSettings(string pageTitle)
+        private static WmlToHtmlConverterSettings CreateHtmlConverterSettings(string pageTitle, IImageHandler imageHandler)
         {
-            var settings = new WmlToHtmlConverterSettings(pageTitle, new ImageHandler(), new TextSymbolToUnicodeHandler(), new SymbolHandler(), new PageBreakHandler(new BreakHandler()), true, string.Empty, "@page { size: A4 } body { margin: 1cm auto; max-width: 20cm; padding: 0; }", "Codeuctivity-");
+            var settings = new WmlToHtmlConverterSettings(pageTitle, imageHandler, new TextSymbolToUnicodeHandler(), new SymbolHandler(), new PageBreakHandler(new BreakHandler()), true, string.Empty, "@page { size: A4 } body { margin: 1cm auto; max-width: 20cm; padding: 0; }", "Codeuctivity-");
 
             return settings;
         }

OpenXmlToHtmlTests/OpenXmlToHtmlTests.cs

@@ -1,7 +1,10 @@
 using Codeuctivity.OpenXmlToHtml;
 using Codeuctivity.PuppeteerSharp;
 using PdfSharp.Pdf.IO;
+using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -29,6 +32,35 @@ public async Task ShouldConvertDocumentIntegrativeWithKnownAberrancyTest(string
             await DocumentAsserter.AssertRenderedHtmlIsEqual(actualHtmlFilePath, expectedHtmlFilePath, allowedPixelErrorCount);
         }
 
+        [Theory]
+        [InlineData("Images.docx")]
+        public async Task ShouldConvertDocumentAndExportImagesIntegrativeTest(string testFileName)
+        {
+            var sourceOpenXmlFilePath = $"../../../TestInput/{testFileName}";
+            var actualHtmlFilePath = Path.Combine(Path.GetTempPath(), $"Actual{testFileName}.html");
+
+            if (File.Exists(actualHtmlFilePath))
+            {
+                File.Delete(actualHtmlFilePath);
+            }
+
+            using var sourceIpenXml = new FileStream(sourceOpenXmlFilePath, FileMode.Open, FileAccess.Read);
+            var exportedImages = new Dictionary<string, byte[]>();
+
+            await OpenXmlToHtml.ConvertToHtmlAsync(sourceIpenXml, "fallbackTitle", exportedImages);
+
+            Assert.Equal(2, exportedImages.Count);
+
+            Assert.True(IsValidBitmap(exportedImages.First().Value));
+            Assert.True(IsValidBitmap(exportedImages.Last().Value));
+        }
+
+        private bool IsValidBitmap(byte[] blob)
+        {
+            var bitmap = new Bitmap(new MemoryStream(blob));
+            return bitmap.Width > 1 && bitmap.Height > 1;
+        }
+
         [Fact]
         public async Task ShouldConvertDocumentIntegrativeWithToExpectedPageQuantityTest()
         {