Optimise for minimal memory
This commit is contained in:
@@ -15,12 +15,25 @@ public class HomeController(IMediator mediator) : ControllerBase
|
|||||||
return Ok(await mediator.Send(new Weather.Command()));
|
return Ok(await mediator.Send(new Weather.Command()));
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet("default.png")]
|
[HttpGet("default.bmp")]
|
||||||
public async Task<IActionResult> GetImage()
|
public async Task<IActionResult> GetImage()
|
||||||
{
|
{
|
||||||
return File(await mediator.Send(new ImageGeneration.Command()), "image/png");
|
return File(await mediator.Send(new ImageGeneration.Command()), "image/bmp");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*[HttpGet("screen/buffers")]
|
||||||
|
public async Task<IActionResult> GetCombinedBuffers()
|
||||||
|
{
|
||||||
|
var (black, red) = await mediator.Send(new ImageGeneration.Command());
|
||||||
|
|
||||||
|
// Combine buffers
|
||||||
|
byte[] combined = new byte[black.Length + red.Length];
|
||||||
|
Buffer.BlockCopy(black, 0, combined, 0, black.Length);
|
||||||
|
Buffer.BlockCopy(red, 0, combined, black.Length, red.Length);
|
||||||
|
|
||||||
|
return File(combined, "application/octet-stream");
|
||||||
|
}*/
|
||||||
|
|
||||||
[HttpGet("departureboard")]
|
[HttpGet("departureboard")]
|
||||||
public async Task<ActionResult<List<TimeTable>>> GetDepartureBoard()
|
public async Task<ActionResult<List<TimeTable>>> GetDepartureBoard()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using HomeApi.Models;
|
|
||||||
using HomeApi.Models.Configuration;
|
using HomeApi.Models.Configuration;
|
||||||
using MediatR;
|
using MediatR;
|
||||||
using Microsoft.AspNetCore.Http.HttpResults;
|
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using PuppeteerSharp;
|
using PuppeteerSharp;
|
||||||
using RazorLight;
|
using RazorLight;
|
||||||
|
using SixLabors.ImageSharp.Formats.Bmp;
|
||||||
|
using SixLabors.ImageSharp.PixelFormats;
|
||||||
|
using SixLabors.ImageSharp.Processing;
|
||||||
|
using Image = SixLabors.ImageSharp.Image;
|
||||||
|
|
||||||
namespace HomeApi.Handlers;
|
namespace HomeApi.Handlers;
|
||||||
|
|
||||||
@@ -32,7 +34,7 @@ public static class ImageGeneration
|
|||||||
var weather = await _mediator.Send(new Weather.Command(), cancellationToken);
|
var weather = await _mediator.Send(new Weather.Command(), cancellationToken);
|
||||||
var departureBoard = await _mediator.Send(new DepartureBoard.Command(), cancellationToken);
|
var departureBoard = await _mediator.Send(new DepartureBoard.Command(), cancellationToken);
|
||||||
|
|
||||||
var model = new Image
|
var model = new Models.Image
|
||||||
{
|
{
|
||||||
Weather = weather,
|
Weather = weather,
|
||||||
TimeTable = departureBoard
|
TimeTable = departureBoard
|
||||||
@@ -69,7 +71,55 @@ public static class ImageGeneration
|
|||||||
});
|
});
|
||||||
await page.SetContentAsync(htmlContent, new NavigationOptions { WaitUntil = new[] { WaitUntilNavigation.Networkidle0 } });
|
await page.SetContentAsync(htmlContent, new NavigationOptions { WaitUntil = new[] { WaitUntilNavigation.Networkidle0 } });
|
||||||
var stream = await page.ScreenshotStreamAsync(new ScreenshotOptions { Type = ScreenshotType.Png });
|
var stream = await page.ScreenshotStreamAsync(new ScreenshotOptions { Type = ScreenshotType.Png });
|
||||||
return stream;
|
|
||||||
|
return await stream.ToBmpStream();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task<Stream> ToBmpStream(this Stream stream)
|
||||||
|
{
|
||||||
|
var image = await Image.LoadAsync<Rgba32>(stream);
|
||||||
|
// Resize or crop to 800x480 if necessary
|
||||||
|
image.Mutate(x => x.Resize(800, 480));
|
||||||
|
|
||||||
|
// Reduce to 3-color e-paper palette
|
||||||
|
image.ProcessPixelRows(accessor =>
|
||||||
|
{
|
||||||
|
for (int y = 0; y < accessor.Height; y++)
|
||||||
|
{
|
||||||
|
var row = accessor.GetRowSpan(y);
|
||||||
|
for (int x = 0; x < row.Length; x++)
|
||||||
|
{
|
||||||
|
var pixel = row[x];
|
||||||
|
|
||||||
|
// Compute perceived brightness (gray)
|
||||||
|
float brightness = 0.299f * pixel.R + 0.587f * pixel.G + 0.114f * pixel.B;
|
||||||
|
|
||||||
|
if (pixel.R > 150 && pixel.G < 80 && pixel.B < 80) // RED threshold
|
||||||
|
{
|
||||||
|
row[x] = new Rgba32(255, 0, 0); // Red
|
||||||
|
}
|
||||||
|
else if (brightness > 180)
|
||||||
|
{
|
||||||
|
row[x] = new Rgba32(255, 255, 255); // White
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
row[x] = new Rgba32(0, 0, 0); // Black
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
var bmpStream = new MemoryStream();
|
||||||
|
var bmpEncoder = new BmpEncoder
|
||||||
|
{
|
||||||
|
BitsPerPixel = BmpBitsPerPixel.Pixel24
|
||||||
|
};
|
||||||
|
|
||||||
|
await image.SaveAsync(bmpStream, bmpEncoder);
|
||||||
|
bmpStream.Position = 0;
|
||||||
|
|
||||||
|
return bmpStream;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
<PackageReference Include="RazorLight" Version="2.3.1" />
|
<PackageReference Include="RazorLight" Version="2.3.1" />
|
||||||
<PackageReference Include="Refit.HttpClientFactory" Version="8.0.0" />
|
<PackageReference Include="Refit.HttpClientFactory" Version="8.0.0" />
|
||||||
<PackageReference Include="Scalar.AspNetCore" Version="2.5.6" />
|
<PackageReference Include="Scalar.AspNetCore" Version="2.5.6" />
|
||||||
|
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
@HomeApi_HostAddress = http://localhost:5128
|
|
||||||
|
|
||||||
GET {{HomeApi_HostAddress}}/weatherforecast/
|
|
||||||
Accept: application/json
|
|
||||||
|
|
||||||
###
|
|
||||||
|
|||||||
@@ -1,4 +1,11 @@
|
|||||||
{
|
{
|
||||||
|
"Kestrel": {
|
||||||
|
"Endpoints": {
|
||||||
|
"Http": {
|
||||||
|
"Url": "http://*:5000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"Logging": {
|
"Logging": {
|
||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
"Default": "Information",
|
"Default": "Information",
|
||||||
@@ -18,5 +25,6 @@
|
|||||||
},
|
},
|
||||||
"DefaultCity": "Vega stockholms lan",
|
"DefaultCity": "Vega stockholms lan",
|
||||||
"DefaultStation": "Vega Station"
|
"DefaultStation": "Vega Station"
|
||||||
}
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,11 @@
|
|||||||
{
|
{
|
||||||
|
"Kestrel": {
|
||||||
|
"Endpoints": {
|
||||||
|
"Http": {
|
||||||
|
"Url": "http://*:5000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"Logging": {
|
"Logging": {
|
||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
"Default": "Information",
|
"Default": "Information",
|
||||||
|
|||||||
Reference in New Issue
Block a user