Hero: varianten op de achtergrond knippen; upload en opslaan antwoorden direct
Opslaan van 8 foto's met gewijzigde focus duurde 40 s op een snelle pc en ruim 3 minuten op de Pi (proxy-timeout 60 s gaf 504, hero niet bewaard). Upload bewaart het origineel en antwoordt; HeroRenderService knipt de set per afbeelding en schakelt over zodra de set compleet is (oude set blijft ondertussen live; afbeelding zonder set wordt niet gepubliceerd). Opslaan legt alleen de focus vast. Admin toont 'wordt verwerkt' en ververst zelf; Seed-Hero wacht tot alles klaar is. Metingen: HeroSaveTimingTests. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -12,7 +12,7 @@ public class HeroFocusSaveTests
|
||||
=> new("Andrea Slop", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, imageId, "foto")], focus);
|
||||
|
||||
[Fact]
|
||||
public async Task TheLiveHero_KeepsItsAddresses_UntilTheHeroIsSavedWithTheNewFocus()
|
||||
public async Task TheLiveHero_KeepsItsOldSet_UntilTheNewSetIsCut_AndThenSwitchesToIt()
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var image = await rig.Upload(HeroTestRig.Photo());
|
||||
@@ -20,19 +20,22 @@ public class HeroFocusSaveTests
|
||||
await rig.Service.SaveAsync(Save(id, null), HeroTestRig.Admin, default);
|
||||
var before = (await rig.Public.GetActiveAsync(default))!.Slides[0].Image.Src;
|
||||
|
||||
// Nothing but a save changes what is live: the focus travels with the save request.
|
||||
// The save returns without cutting anything: the old set stays live and the admin sees the image as processing.
|
||||
var saved = await rig.Service.SaveAsync(Save(id, [new HeroImageFocusRequest(id, new FocusDto(0.5, 0.5, 1), null, new FocusDto(1.0, 0.5, 1))]), HeroTestRig.Admin, default);
|
||||
(await rig.Public.GetActiveAsync(default))!.Slides[0].Image.Src.Should().Be(before);
|
||||
saved.Slides[0].Image.Processing.Should().BeTrue();
|
||||
|
||||
await rig.Service.SaveAsync(Save(id, [new HeroImageFocusRequest(id, new FocusDto(0.5, 0.5, 1), null, new FocusDto(1.0, 0.5, 1))]), HeroTestRig.Admin, default);
|
||||
(await rig.RenderPending()).Should().Be(1);
|
||||
var after = (await rig.Public.GetActiveAsync(default))!.Slides[0].Image;
|
||||
|
||||
var beforeSet = before.Split('/')[3];
|
||||
after.Variants.Should().OnlyContain(v => !v.Url.Contains(beforeSet), "a changed focus gives new addresses");
|
||||
after.FocusByRatio.Should().ContainKey("tall");
|
||||
(await rig.Service.GetAsync(default)).Slides[0].Image.Processing.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task TheOldFiles_StayOnDisk_AfterTheSave_UntilTheCleanUp()
|
||||
public async Task TheOldFiles_StayOnDisk_AfterTheSwitch_UntilTheCleanUp()
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var image = await rig.Upload(HeroTestRig.Photo());
|
||||
@@ -41,11 +44,64 @@ public class HeroFocusSaveTests
|
||||
var oldVariant = image.Variants.First();
|
||||
|
||||
await rig.Service.SaveAsync(Save(id, [new HeroImageFocusRequest(id, new FocusDto(0.1, 0.1, 1.5))]), HeroTestRig.Admin, default);
|
||||
await rig.RenderPending();
|
||||
|
||||
(await rig.Store.ExistsAsync(oldVariant.Url["/media/".Length..], default)).Should().BeTrue("a site that still holds the old data keeps working for the retention time");
|
||||
rig.Db.HeroRetiredFiles.Should().ContainSingle(f => f.Kind == "set");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AnUpload_ReturnsWithoutCuttingAnything_AndIsNotPublishedUntilItsSetExists()
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
|
||||
var dto = await rig.UploadWithoutRendering(HeroTestRig.Photo());
|
||||
dto.Processing.Should().BeTrue();
|
||||
dto.Variants.Should().BeEmpty();
|
||||
await rig.Service.SaveAsync(Save(Guid.Parse(dto.Id), null), HeroTestRig.Admin, default);
|
||||
(await rig.Public.GetActiveAsync(default))!.Slides.Should().BeEmpty("a slide whose image is not ready is not published");
|
||||
|
||||
await rig.RenderPending();
|
||||
|
||||
(await rig.Public.GetActiveAsync(default))!.Slides.Should().ContainSingle();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task TwoFocusSaves_BeforeTheRenderRuns_AreCutOnce_AtTheLastFocus()
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var image = await rig.Upload(HeroTestRig.Photo());
|
||||
var id = Guid.Parse(image.Id);
|
||||
await rig.Service.SaveAsync(Save(id, [new HeroImageFocusRequest(id, new FocusDto(0.2, 0.2, 1))]), HeroTestRig.Admin, default);
|
||||
await rig.Service.SaveAsync(Save(id, [new HeroImageFocusRequest(id, new FocusDto(0.9, 0.9, 1))]), HeroTestRig.Admin, default);
|
||||
|
||||
(await rig.RenderPending()).Should().Be(1);
|
||||
|
||||
var done = rig.Db.HeroImages.Single();
|
||||
done.SetHash.Should().Be(HeroMapping.TargetSetHash(done));
|
||||
done.FocusX.Should().Be(0.9);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ACancelledRenderOrSave_LeavesTheStoredHeroAlone_AndARepeatWorks()
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var image = await rig.Upload(HeroTestRig.Photo());
|
||||
var id = Guid.Parse(image.Id);
|
||||
await rig.Service.SaveAsync(Save(id, null), HeroTestRig.Admin, default);
|
||||
var live = rig.Db.HeroImages.Single().SetHash;
|
||||
await rig.Service.SaveAsync(Save(id, [new HeroImageFocusRequest(id, new FocusDto(0.9, 0.1, 1))]), HeroTestRig.Admin, default);
|
||||
|
||||
using var cancelled = new CancellationTokenSource();
|
||||
await cancelled.CancelAsync();
|
||||
var act = async () => await rig.Images.RenderNextPendingAsync(new HashSet<Guid>(), cancelled.Token);
|
||||
await act.Should().ThrowAsync<OperationCanceledException>();
|
||||
|
||||
rig.Db.HeroImages.Single().SetHash.Should().Be(live, "nothing was switched");
|
||||
(await rig.RenderPending()).Should().Be(1);
|
||||
HeroMapping.NeedsRender(rig.Db.HeroImages.Single()).Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task APreparedFocusThatIsNeverSaved_LeavesOnlyUnreferencedFiles_ThatTheCleanUpRemoves()
|
||||
{
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
using System.Diagnostics;
|
||||
using SlpModularCms.Core.Media;
|
||||
using SlpModularCms.Modules.Hero.Models;
|
||||
using Xunit.Abstractions;
|
||||
|
||||
namespace SlpModularCms.Modules.Hero.Tests;
|
||||
|
||||
/// <summary>
|
||||
/// A measurement, not a check: how long uploading and saving a hero with real photos takes. Runs only when
|
||||
/// HERO_TIMING_DIR points to a folder with hero-1.jpg .. hero-8.jpg (the ASF exports); otherwise it passes at once.
|
||||
/// </summary>
|
||||
public class HeroSaveTimingTests(ITestOutputHelper output)
|
||||
{
|
||||
[Fact]
|
||||
public async Task MeasureUploadAndSave_WithRealPhotos()
|
||||
{
|
||||
var dir = Environment.GetEnvironmentVariable("HERO_TIMING_DIR");
|
||||
if (string.IsNullOrEmpty(dir) || !Directory.Exists(dir))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
using var rig = new HeroTestRig();
|
||||
var ids = new List<Guid>();
|
||||
var watch = Stopwatch.StartNew();
|
||||
for (var i = 1; i <= 8; i++)
|
||||
{
|
||||
watch.Restart();
|
||||
var image = await rig.UploadWithoutRendering(await File.ReadAllBytesAsync(Path.Combine(dir, $"hero-{i}.jpg")));
|
||||
ids.Add(Guid.Parse(image.Id));
|
||||
output.WriteLine($"upload request hero-{i}.jpg: {watch.ElapsedMilliseconds} ms, {image.Width}x{image.Height}");
|
||||
}
|
||||
|
||||
var slides = ids.Select(id => new HeroSlideRequest(null, id, "foto")).ToList();
|
||||
var focus = ids.Select(id => new HeroImageFocusRequest(id, new FocusDto(0.3, 0.4, 1), null, null)).ToList();
|
||||
watch.Restart();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, focus), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save request with 8 slides and 8 changed focus points: {watch.ElapsedMilliseconds} ms");
|
||||
|
||||
watch.Restart();
|
||||
var cut = await rig.RenderPending();
|
||||
output.WriteLine($"background renderer: {cut} images in {watch.ElapsedMilliseconds} ms ({watch.ElapsedMilliseconds / Math.Max(1, cut)} ms per image)");
|
||||
|
||||
watch.Restart();
|
||||
var again = focus.Select(f => f with { Focus = new FocusDto(0.6, 0.4, 1) }).ToList();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, again), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save request with 8 changed focus points again: {watch.ElapsedMilliseconds} ms");
|
||||
await rig.RenderPending();
|
||||
|
||||
watch.Restart();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, null), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save without focus changes: {watch.ElapsedMilliseconds} ms");
|
||||
}
|
||||
}
|
||||
@@ -84,12 +84,38 @@ public sealed class HeroTestRig : IDisposable
|
||||
new SlpModularCms.Modules.Hero.Models.HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [],
|
||||
[new SlpModularCms.Modules.Hero.Models.HeroImageFocusRequest(imageId, request.Focus, request.Wide, request.Tall)]),
|
||||
Admin, CancellationToken.None);
|
||||
await RenderPending();
|
||||
return SlpModularCms.Modules.Hero.Services.HeroMapping.ToImageDto((await Repository.GetImageAsync(imageId, CancellationToken.None))!);
|
||||
}
|
||||
|
||||
public Task<SlpModularCms.Modules.Hero.Models.HeroImageDto> Upload(byte[] bytes)
|
||||
/// <summary>Uploads an image and lets the background renderer cut its variants (here: at once, the way the worker would).</summary>
|
||||
public async Task<SlpModularCms.Modules.Hero.Models.HeroImageDto> Upload(byte[] bytes)
|
||||
{
|
||||
var dto = await UploadWithoutRendering(bytes);
|
||||
await RenderPending();
|
||||
return SlpModularCms.Modules.Hero.Services.HeroMapping.ToImageDto((await Repository.GetImageAsync(Guid.Parse(dto.Id), CancellationToken.None))!);
|
||||
}
|
||||
|
||||
/// <summary>The upload request as such: the image is stored and its variants are still to be cut.</summary>
|
||||
public Task<SlpModularCms.Modules.Hero.Models.HeroImageDto> UploadWithoutRendering(byte[] bytes)
|
||||
=> Images.UploadAsync(new MemoryStream(bytes), bytes.Length, Admin, CancellationToken.None);
|
||||
|
||||
/// <summary>Does the work of the background renderer until nothing is pending.</summary>
|
||||
public async Task<int> RenderPending()
|
||||
{
|
||||
var count = 0;
|
||||
while (await Images.RenderNextPendingAsync(new HashSet<Guid>(), CancellationToken.None) is not null)
|
||||
{
|
||||
count++;
|
||||
if (count > 100)
|
||||
{
|
||||
throw new InvalidOperationException("The renderer does not settle.");
|
||||
}
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Db.Dispose();
|
||||
|
||||
Reference in New Issue
Block a user