Added user image caching

This commit is contained in:
2025-11-20 19:22:12 +01:00
parent 6be72c1f5c
commit 9767feb3e2
3 changed files with 27 additions and 30 deletions

View File

@@ -106,15 +106,15 @@ public class HomeController : Controller
} }
if (size is null) if (size is null)
{ {
return File(Convert.FromBase64String(user.JpegPhoto), "image/jpeg"); return File(Convert.FromBase64String(user.JpegPhoto), "image/webp");
} }
if (size is not null) if (size is not null)
{ {
AdminSettingsModel adminSettingsModel = await adminSettingsModelTask; AdminSettingsModel adminSettingsModel = await adminSettingsModelTask;
size = Math.Min((int)size, adminSettingsModel.MaxDownloadableUserImageSize); size = Math.Min((int)size, adminSettingsModel.MaxDownloadableUserImageSize);
} }
string encodedFile = ImageHelper.ResizeAndConvertToBase64(Convert.FromBase64String(user.JpegPhoto), size ?? 32); byte[] encodedFile = ImageHelper.ResizeAndConvertToWebp(user.JpegPhoto, size ?? 32);
return File(Convert.FromBase64String(encodedFile), "image/jpeg"); return File(encodedFile, "image/webp");
} }

View File

@@ -1,5 +1,4 @@
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Formats.Webp; using SixLabors.ImageSharp.Formats.Webp;
using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Formats;
@@ -7,36 +6,33 @@ namespace Berufsschule_HAM.Helpers;
public static class ImageHelper public static class ImageHelper
{ {
public static string ResizeAndConvertToBase64(byte[] imageBytes, int size = 32) public static Dictionary<int, Dictionary<string, byte[]>> ImageCache = [];
public static byte[] ResizeAndConvertToWebp(string imageString, int size = 32)
{ {
using var inputStream = new MemoryStream(imageBytes); if (ImageCache.TryGetValue(size, out Dictionary<string, byte[]>? sizeCache)
&& sizeCache.TryGetValue(imageString, out byte[]? result) && result.Length > 0)
var decoderOptions = new DecoderOptions
{ {
TargetSize = new Size(size, size) return result;
}; }
if (sizeCache is null) ImageCache[size] = [];
using var image = Image.Load(decoderOptions, inputStream); lock (ImageCache[size])
int minDimension = Math.Min(image.Width, image.Height);
var cropRectangle = new Rectangle(
(image.Width - minDimension) / 2,
(image.Height - minDimension) / 2,
minDimension,
minDimension);
image.Mutate(x =>
{ {
x.Crop(cropRectangle); byte[] imageBytes = Convert.FromBase64String(imageString);
x.Resize(new ResizeOptions using var inputStream = new MemoryStream(imageBytes);
var decoderOptions = new DecoderOptions
{ {
Size = new Size(size, size), TargetSize = new Size(size, size),
Mode = ResizeMode.Crop SkipMetadata = true
}); };
});
using var outputStream = new MemoryStream(); using var image = Image.Load(decoderOptions, inputStream);
image.Save(outputStream, new WebpEncoder());
return Convert.ToBase64String(outputStream.GetBuffer(), 0, (int)outputStream.Length); using var outputStream = new MemoryStream();
image.Save(outputStream, new WebpEncoder());
result = outputStream.ToArray();
ImageCache[size][imageString] = result;
}
return result;
} }
} }

View File

@@ -12,6 +12,7 @@ var builder = WebApplication.CreateBuilder(args);
builder.Services.Configure<LdapConfig>(builder.Configuration.GetSection("Ldap")); builder.Services.Configure<LdapConfig>(builder.Configuration.GetSection("Ldap"));
builder.Services.AddLocalization(options => options.ResourcesPath = "Resources"); builder.Services.AddLocalization(options => options.ResourcesPath = "Resources");
builder.Services.AddResponseCaching();
builder.Services.AddControllersWithViews() builder.Services.AddControllersWithViews()
.AddViewLocalization(Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat.Suffix) .AddViewLocalization(Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat.Suffix)