Better solution using existing data-structures

Author: OssianEPPlus

src/EPPlus/Export/HtmlExport/Enums/ePictureInclude.cs

@@ -30,5 +30,9 @@ public enum ePictureInclude
         /// Include the images in the html export.
         /// </summary>
         Include,
+        /// <summary>
+        /// Include the images only in the HTML.
+        /// </summary>
+        IncludeInHtmlOnly
     }
 }

src/EPPlus/Export/HtmlExport/Exporters/Internal/HtmlExporterBaseInternal.cs

@@ -148,7 +148,7 @@ protected HTMLElement GetThead(ExcelRangeBase range, List<string> headers = null
 
                     AddTableData(table, contentElement, col);
 
-                    if (Settings.Pictures.Include == ePictureInclude.Include)
+                    if (Settings.Pictures.Include == (ePictureInclude.Include | ePictureInclude.IncludeInHtmlOnly))
                     {
                         image = GetImage(cell.Worksheet.PositionId, cell._fromRow, cell._fromCol);
                     }
@@ -269,7 +269,7 @@ protected HTMLElement GetTableBody(ExcelRangeBase range, int row, int endRow)
 
                     SetColRowSpan(range, tblData, cell);
 
-                    if (Settings.Pictures.Include == ePictureInclude.Include)
+                    if (Settings.Pictures.Include == (ePictureInclude.Include | ePictureInclude.IncludeInHtmlOnly))
                     { 
                         image = GetImage(cell.Worksheet.PositionId, cell._fromRow, cell._fromCol);
                     }
@@ -414,7 +414,7 @@ protected void AddImage(HTMLElement parent, HtmlExportSettings settings, HtmlIma
                     child.AddAttribute("id", imageName);
                 }
 
-                if(settings.Pictures.EmbedImagesInHtml)
+                if(settings.Pictures.Include == ePictureInclude.IncludeInHtmlOnly)
                 {
                     ePictureType? type;
                     var _encodedImage = ImageEncoder.EncodeImage(image, out type);

src/EPPlus/Export/HtmlExport/Settings/HtmlPictureSettings.cs

@@ -23,8 +23,6 @@ internal HtmlPictureSettings()
 
         }
 
-        public bool EmbedImagesInHtml = false;
-
         /// <summary>
         /// If picture drawings should be included in the html. Default is <see cref="ePictureInclude.Exclude"/>
         /// </summary>

src/EPPlusTest/Export/HtmlExport/RangeExporterTests.cs

@@ -197,7 +197,7 @@ public async Task WriteImagesAsync()
         }
 
         [TestMethod]
-        public async Task WriteImagesAsyncBoolEmbed()
+        public async Task WriteImagesAsyncHTMLOnlyEmbed()
         {
             using (var p = OpenTemplatePackage("20-CreateAFileSystemReport.xlsx"))
             {
@@ -206,16 +206,13 @@ public async Task WriteImagesAsyncBoolEmbed()
 
                 exporter.Settings.SetColumnWidth = true;
                 exporter.Settings.SetRowHeight = true;
-                exporter.Settings.Pictures.Include = ePictureInclude.Include;
+                exporter.Settings.Pictures.Include = ePictureInclude.IncludeInHtmlOnly;
                 exporter.Settings.Minify = false;
                 exporter.Settings.Encoding = Encoding.UTF8;
-                exporter.Settings.Pictures.EmbedImagesInHtml = true;
 
-                var html = exporter.GetSinglePage();
+                var html = exporter.GetHtmlString();
                 var htmlAsync = await exporter.GetSinglePageAsync();
-                File.WriteAllText("c:\\temp\\" + sheet.Name + ".html", html);
-                File.WriteAllText("c:\\temp\\" + sheet.Name + "-async.html", htmlAsync);
-                Assert.AreEqual(html, htmlAsync);
+                File.WriteAllText("c:\\temp\\" + sheet.Name + "_htmlOnly.html", html);
             }
         }