#508 Added support for SVG images

src/Libraries/Nop.Core/MimeTypes.cs

@@ -92,6 +92,11 @@ public static class MimeTypes
         /// </summary>
         public static string ImageWebp => "image/webp";
 
+        /// <summary>
+        /// Type
+        /// </summary>
+        public static string ImageSvg => "image/svg+xml";
+
         #endregion
 
         #region text/*

src/Libraries/Nop.Services/Common/PdfService.cs

@@ -1191,7 +1191,19 @@ protected virtual async Task PrintHeaderAsync(PdfSettings pdfSettingsByStore, La
             if (logoExists)
             {
                 var logoFilePath = await _pictureService.GetThumbLocalPathAsync(logoPicture, 0, false);
-                var logo = Image.GetInstance(logoFilePath);
+                Image logo;
+
+                if (logoPicture.MimeType == MimeTypes.ImageSvg)
+                {
+                    //we must first convert the SVG to PNG to show the image in the PDF document
+                    var picturePng = await _pictureService.ConvertSvgToPngAsync(logoFilePath);
+                    logo = Image.GetInstance(picturePng);
+                }
+                else
+                {
+                    logo = Image.GetInstance(logoFilePath);
+                }
+
                 logo.Alignment = GetAlignment(lang, true);
                 logo.ScaleToFit(65f, 65f);
 

src/Libraries/Nop.Services/Media/IPictureService.cs

@@ -258,5 +258,13 @@ public partial interface IPictureService
         /// The task result contains the picture binary
         /// </returns>
         Task<PictureBinary> GetPictureBinaryByPictureIdAsync(int pictureId);
+
+        /// <summary>
+        /// Convert image from SVG format to PNG
+        /// </summary>
+        /// <param name="filePath">SVG file path</param>
+        /// <returns>A task that represents the asynchronous operation
+        /// The task result contains the byte array</returns>
+        Task<byte[]> ConvertSvgToPngAsync(string filePath);
     }
 }

src/Libraries/Nop.Services/Media/PictureService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,6 +15,8 @@
 using Nop.Services.Configuration;
 using Nop.Services.Seo;
 using SkiaSharp;
+using Svg;
+using Svg.Skia;
 
 namespace Nop.Services.Media
 {
@@ -430,6 +433,9 @@ public virtual Task<string> GetFileExtensionFromMimeTypeAsync(string mimeType)
                 case "x-icon":
                     lastPart = "ico";
                     break;
+                case "svg+xml":
+                    lastPart = "svg";
+                    break;
                 default:
                     break;
             }
@@ -638,9 +644,22 @@ public virtual async Task<string> GetPictureSeNameAsync(string name)
                     {
                         try
                         {
-                            using var image = SKBitmap.Decode(pictureBinary);
-                            var format = GetImageFormatByMimeType(picture.MimeType);
-                            pictureBinary = ImageResize(image, format, targetSize);
+                            if (picture.MimeType == MimeTypes.ImageSvg)
+                            {
+                                using var memStream = new MemoryStream(pictureBinary);
+                                var svgDocument = SvgDocument.Open<SvgDocument>(memStream);
+                                svgDocument.Height = targetSize;
+                                svgDocument.Width = targetSize;
+                                using var stream = new MemoryStream();
+                                svgDocument.Write(stream);
+                                pictureBinary = stream.ToArray();
+                            }
+                            else
+                            {
+                                using var image = SKBitmap.Decode(pictureBinary);
+                                var format = GetImageFormatByMimeType(picture.MimeType);
+                                pictureBinary = ImageResize(image, format, targetSize);
+                            }
                         }
                         catch
                         {
@@ -679,6 +698,46 @@ public virtual async Task<string> GetThumbLocalPathAsync(Picture picture, int ta
 
         #endregion
 
+        #region Convertation methods
+
+        /// <summary>
+        /// Convert image from SVG format to PNG
+        /// </summary>
+        /// <param name="filePath">SVG file path</param>
+        /// <returns>A task that represents the asynchronous operation
+        /// The task result contains the byte array</returns>
+        public virtual Task<byte[]> ConvertSvgToPngAsync(string filePath)
+        {
+            try
+            {
+                using var svg = new SKSvg();
+                svg.Load(filePath);
+
+                using var bitmap = new SKBitmap((int)svg.Picture.CullRect.Width, (int)svg.Picture.CullRect.Height);
+                var canvas = new SKCanvas(bitmap);
+                canvas.DrawPicture(svg.Picture);
+                canvas.Flush();
+                canvas.Save();
+
+                using var image = SKImage.FromBitmap(bitmap);
+                using var data = image.Encode(SKEncodedImageFormat.Png, 100);
+
+                // save the data to a stream
+                using var memStream = new MemoryStream();
+                data.SaveTo(memStream);
+                memStream.Seek(0, SeekOrigin.Begin);
+
+                return Task.FromResult(memStream.ToArray());
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
+        #endregion
+
         #region CRUD methods
 
         /// <summary>
@@ -833,7 +892,8 @@ public virtual async Task<Picture> InsertPictureAsync(IFormFile formFile, string
                 ".pjp",
                 ".png",
                 ".tiff",
-                ".tif"
+                ".tif",
+                ".svg"
             } as IReadOnlyCollection<string>;
 
             var fileName = formFile.FileName;
@@ -855,7 +915,7 @@ public virtual async Task<Picture> InsertPictureAsync(IFormFile formFile, string
             //contentType is not always available 
             //that's why we manually update it here
             //http://www.sfsu.edu/training/mimetype.htm
-            if (string.IsNullOrEmpty(contentType))
+            if (string.IsNullOrEmpty(contentType) || contentType == MimeTypes.ImageSvg)
             {
                 switch (fileExtension)
                 {
@@ -879,6 +939,9 @@ public virtual async Task<Picture> InsertPictureAsync(IFormFile formFile, string
                     case ".png":
                         contentType = MimeTypes.ImagePng;
                         break;
+                    case ".svg":
+                        contentType = MimeTypes.ImageSvg;
+                        break;
                     case ".tiff":
                     case ".tif":
                         contentType = MimeTypes.ImageTiff;

src/Libraries/Nop.Services/Media/RoxyFileman/BaseRoxyFilemanService.cs

@@ -113,7 +113,7 @@ protected virtual string GetFileType(string fileExtension)
             var fileType = "file";
 
             fileExtension = fileExtension.ToLowerInvariant();
-            if (fileExtension == ".jpg" || fileExtension == ".jpeg" || fileExtension == ".png" || fileExtension == ".gif" || fileExtension == ".webp")
+            if (fileExtension == ".jpg" || fileExtension == ".jpeg" || fileExtension == ".png" || fileExtension == ".gif" || fileExtension == ".webp" || fileExtension == ".svg")
                 fileType = "image";
 
             if (fileExtension == ".swf" || fileExtension == ".flv")

src/Libraries/Nop.Services/Nop.Services.csproj

@@ -21,6 +21,7 @@
     <PackageReference Include="MaxMind.GeoIP2" Version="4.1.0" />
     <PackageReference Include="SkiaSharp" Version="2.80.3" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.3" />
+    <PackageReference Include="Svg.Skia" Version="0.5.10" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.15" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
   </ItemGroup>

src/Presentation/Nop.Web/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml

@@ -87,7 +87,7 @@
             template: "@(clientId)-qq-template",
             multiple: false,
             validation: {
-                allowedExtensions: [ "bmp", "gif", "jpeg", "jpg", "jpe", "jfif", "pjpeg", "pjp", "png", "tiff", "tif", "webp"]
+                allowedExtensions: [ "bmp", "gif", "jpeg", "jpg", "jpe", "jfif", "pjpeg", "pjp", "png", "tiff", "tif", "webp", "svg"]
             }
         }).on("complete", function(event, id, name, responseJSON, xhr) {
             if (responseJSON.success) {