Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Add new settings - Image Quality

KrzysztofPajakf8af8786fb18
diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.cs
index 0892996f2..9e3326c8b 100644
--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs
@@ -867,11 +867,11 @@ namespace Grand.Business.Storage.Services
try
{
- using (var resized = image.Resize(new SKImageInfo((int)width, (int)height), SKFilterQuality.None))
+ using (var resized = image.Resize(new SKImageInfo((int)width, (int)height), SKFilterQuality.High))
{
using (var resimage = SKImage.FromBitmap(resized))
{
- return resimage.Encode(format, 100).ToArray();
+ return resimage.Encode(format, _mediaSettings.ImageQuality).ToArray();
}
}
}
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
index 0e7bad0ce..b794db688 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
@@ -86,6 +86,7 @@ namespace Grand.Business.System.Services.Installation
AutoCompleteSearchThumbPictureSize = 50,
ImageSquarePictureSize = 32,
MaximumImageSize = 1980,
+ ImageQuality = 100,
DefaultPictureZoomEnabled = true,
StoreLocation = "/",
StoreInDb = true
diff --git a/src/Core/Grand.Domain/Media/MediaSettings.cs b/src/Core/Grand.Domain/Media/MediaSettings.cs
index a4419e177..eef6beb9a 100644
--- a/src/Core/Grand.Domain/Media/MediaSettings.cs
+++ b/src/Core/Grand.Domain/Media/MediaSettings.cs
@@ -28,6 +28,8 @@ namespace Grand.Domain.Media
public int MaximumImageSize { get; set; }
+ public int ImageQuality { get; set; } = 100;
+
public string AllowedFileTypes { get; set; }
public string FileManagerEnabledCommands { get; set; } = "back, chmod, colwidth, copy, cut, download, duplicate, edit, extract, forward, fullscreen, getfile, help, home, info, mkdir, mkfile, open, opendir, paste, places, quicklook, reload, rename, resize, restore, rm, search, sort, up, upload, view, ls";
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Media.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Media.cshtml
index 1c3d16fc6..d309bb998 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Media.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Media.cshtml
@@ -146,6 +146,15 @@
<span asp-validation-for="MaximumImageSize"></span>
</div>
</div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ImageQuality" class="control-label" />
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ImageQuality" />
+ <span asp-validation-for="ImageQuality"></span>
+ </div>
+ </div>
<div class="form-group">
<div class="col-8 col-md-4 col-sm-4 text-right">
<admin-label asp-for="DefaultPictureZoomEnabled" class="control-label" />
diff --git a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs b/src/Web/Grand.Web.Admin/Controllers/CommonController.cs
index 09860d230..b6b101d85 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CommonController.cs
@@ -348,22 +348,20 @@ namespace Grand.Web.Admin.Controllers
var pictures = pictureService.GetPictures();
foreach (var picture in pictures)
{
- if (!picture.MimeType.Contains("webp"))
+ try
{
- try
- {
- using var image = SKBitmap.Decode(picture.PictureBinary);
- SKData d = SKImage.FromBitmap(image).Encode(SKEncodedImageFormat.Webp, 100);
- await pictureService.UpdatePicture(picture.Id, d.ToArray(), "image/webp", picture.SeoFilename, picture.AltAttribute, picture.TitleAttribute, true, false);
- model.ConvertedPictureModel.NumberOfConvertItems += 1;
- }
- catch (Exception ex)
- {
- logger.Error($"Error on converting picture with id {picture.Id} to webp format", ex);
- }
+ using var image = SKBitmap.Decode(picture.PictureBinary);
+ SKData d = SKImage.FromBitmap(image).Encode(SKEncodedImageFormat.Webp, mediaSettings.ImageQuality);
+ await pictureService.UpdatePicture(picture.Id, d.ToArray(), "image/webp", picture.SeoFilename, picture.AltAttribute, picture.TitleAttribute, true, false);
+ model.ConvertedPictureModel.NumberOfConvertItems += 1;
}
+ catch (Exception ex)
+ {
+ logger.Error($"Error on converting picture with id {picture.Id} to webp format", ex);
+ }
+
}
- }
+ }
return View("Maintenance", model);
}
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/MediaSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/MediaSettingsModel.cs
index e6ef09d09..e2b513d58 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/MediaSettingsModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/MediaSettingsModel.cs
@@ -44,6 +44,9 @@ namespace Grand.Web.Admin.Models.Settings
[GrandResourceDisplayName("Admin.Settings.Media.MaximumImageSize")]
public int MaximumImageSize { get; set; }
+ [GrandResourceDisplayName("Admin.Settings.Media.ImageQuality")]
+ public int ImageQuality { get; set; }
+
[GrandResourceDisplayName("Admin.Settings.Media.DefaultPictureZoomEnabled")]
public bool DefaultPictureZoomEnabled { get; set; }
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index f5d77a513..84ee4c2ff 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -11490,6 +11490,9 @@
<Resource Name="Admin.Settings.Media.ImageSquarePictureSize">
<Value>Image square attribute picture size</Value>
</Resource>
+ <Resource Name="Admin.Settings.Media.ImageQuality">
+ <Value>Image quality</Value>
+ </Resource>
<Resource Name="Admin.Settings.Media.LessonThumbPictureSize">
<Value>Lesson thumb picture size</Value>
</Resource>