From 1d7627454675c9ebfa7c1a9c5add79f8fcf36691 Mon Sep 17 00:00:00 2001 From: Rory& Date: Sat, 11 Apr 2026 21:38:36 +0200 Subject: Cdn cs worker cleanup --- .../Spacebar.Cdn/Controllers/UserController.cs | 154 ++++++++++----------- 1 file changed, 77 insertions(+), 77 deletions(-) (limited to 'extra/admin-api/Spacebar.Cdn/Controllers/UserController.cs') diff --git a/extra/admin-api/Spacebar.Cdn/Controllers/UserController.cs b/extra/admin-api/Spacebar.Cdn/Controllers/UserController.cs index 97626609..a6c47036 100644 --- a/extra/admin-api/Spacebar.Cdn/Controllers/UserController.cs +++ b/extra/admin-api/Spacebar.Cdn/Controllers/UserController.cs @@ -1,77 +1,77 @@ -using ArcaneLibs.Extensions.Streams; -using Microsoft.AspNetCore.Mvc; -using Spacebar.AdminApi.TestClient.Services.Services; -using Spacebar.Cdn.Extensions; -using Spacebar.Interop.Cdn.Abstractions; - -namespace Spacebar.Cdn.Controllers; - -[ApiController] -public class UserController(LruFileCache lfc, IFileSource fs, DiscordImageResizeService dirs) : ImageController { - [HttpGet("/avatars/{userId}/{hash}.{ext}")] - public async Task GetUserAvatar(string userId, string hash, string ext) { - var originalKey = fs.BaseUrl + Request.Path; - var cacheKey = Request.Path + Request.QueryString; - - DiscordImageResizeParams resizeParams = GetResizeParams(); - - var entry = await lfc.GetOrAdd(cacheKey, async () => { - var original = await fs.GetFile(Request.Path); - - if (Request.Query.Any()) { - using var img = await original.ToMagickImageCollectionAsync(); - dirs.Apply(img, resizeParams); - - var outStream = new MemoryStream(); - await img.WriteAsync(outStream, img.First().Format); - outStream.Position = 0; - - return new LruFileCache.Entry() { - Data = outStream.ReadToEnd().ToArray(), - MimeType = original.MimeType - }; - } - - return new LruFileCache.Entry() { - Data = original.Stream.ReadToEnd().ToArray(), - MimeType = original.MimeType - }; - }); - - // byte array with mime type result - return new FileContentResult(entry.Data, entry.MimeType); - } - [HttpGet("/banners/{userId}/{hash}.{ext}")] - public async Task GetUserBanner(string userId, string hash, string ext) { - var originalKey = fs.BaseUrl + Request.Path; - var cacheKey = Request.Path + Request.QueryString; - - DiscordImageResizeParams resizeParams = GetResizeParams(); - - var entry = await lfc.GetOrAdd(cacheKey, async () => { - var original = await fs.GetFile(Request.Path); - - if (Request.Query.Any()) { - using var img = await original.ToMagickImageCollectionAsync(); - dirs.Apply(img, resizeParams); - - var outStream = new MemoryStream(); - await img.WriteAsync(outStream, img.First().Format); - outStream.Position = 0; - - return new LruFileCache.Entry() { - Data = outStream.ReadToEnd().ToArray(), - MimeType = original.MimeType - }; - } - - return new LruFileCache.Entry() { - Data = original.Stream.ReadToEnd().ToArray(), - MimeType = original.MimeType - }; - }); - - // byte array with mime type result - return new FileContentResult(entry.Data, entry.MimeType); - } -} \ No newline at end of file +// using ArcaneLibs.Extensions.Streams; +// using Microsoft.AspNetCore.Mvc; +// using Spacebar.AdminApi.TestClient.Services.Services; +// using Spacebar.Cdn.Extensions; +// using Spacebar.Interop.Cdn.Abstractions; +// +// namespace Spacebar.Cdn.Controllers; +// +// [ApiController] +// public class UserController(LruFileCache lfc, IFileSource fs, DiscordImageResizeService dirs) : ImageController { +// [HttpGet("/avatars/{userId}/{hash}.{ext}")] +// public async Task GetUserAvatar(string userId, string hash, string ext) { +// var originalKey = fs.BaseUrl + Request.Path; +// var cacheKey = Request.Path + Request.QueryString; +// +// DiscordImageResizeParams resizeParams = GetResizeParams(); +// +// var entry = await lfc.GetOrAdd(cacheKey, async () => { +// var original = await fs.GetFile(Request.Path); +// +// if (Request.Query.Any()) { +// using var img = await original.ToMagickImageCollectionAsync(); +// dirs.Apply(img, resizeParams); +// +// var outStream = new MemoryStream(); +// await img.WriteAsync(outStream, img.First().Format); +// outStream.Position = 0; +// +// return new LruFileCache.Entry() { +// Data = outStream.ReadToEnd().ToArray(), +// MimeType = original.MimeType +// }; +// } +// +// return new LruFileCache.Entry() { +// Data = original.Stream.ReadToEnd().ToArray(), +// MimeType = original.MimeType +// }; +// }); +// +// // byte array with mime type result +// return new FileContentResult(entry.Data, entry.MimeType); +// } +// [HttpGet("/banners/{userId}/{hash}.{ext}")] +// public async Task GetUserBanner(string userId, string hash, string ext) { +// var originalKey = fs.BaseUrl + Request.Path; +// var cacheKey = Request.Path + Request.QueryString; +// +// DiscordImageResizeParams resizeParams = GetResizeParams(); +// +// var entry = await lfc.GetOrAdd(cacheKey, async () => { +// var original = await fs.GetFile(Request.Path); +// +// if (Request.Query.Any()) { +// using var img = await original.ToMagickImageCollectionAsync(); +// dirs.Apply(img, resizeParams); +// +// var outStream = new MemoryStream(); +// await img.WriteAsync(outStream, img.First().Format); +// outStream.Position = 0; +// +// return new LruFileCache.Entry() { +// Data = outStream.ReadToEnd().ToArray(), +// MimeType = original.MimeType +// }; +// } +// +// return new LruFileCache.Entry() { +// Data = original.Stream.ReadToEnd().ToArray(), +// MimeType = original.MimeType +// }; +// }); +// +// // byte array with mime type result +// return new FileContentResult(entry.Data, entry.MimeType); +// } +// } \ No newline at end of file -- cgit 1.5.1