fix(570): On Now/Next overlay YAML renders (font_family + format_datetime) #571

Merged
timothy merged 1 commits from fix/74-overlay-render into main 2026-07-22 23:39:33 +02:00
2 changed files with 31 additions and 1 deletions
@@ -25,18 +25,21 @@ public static class GraphicsElementSeeder
base_style: now
styles:
- name: now
font_family: "Noto Sans"
font_size: 30
font_weight: 700
text_color: "#FFFFFF"
halo_color: "#000000"
halo_width: 2
- name: sub
font_family: "Noto Sans"
font_size: 22
font_weight: 400
text_color: "#DDDDDD"
halo_color: "#000000"
halo_width: 2
- name: next
font_family: "Noto Sans"
font_size: 22
font_weight: 400
text_color: "#DDDDDD"
@@ -45,7 +48,7 @@ public static class GraphicsElementSeeder
text: |
[now]NOW {{ Epg[0].Title }}[/now]
{{ if Epg[0].SubTitle }}[sub]{{ Epg[0].SubTitle }}[/sub]{{ end }}
{{ if Epg.size > 1 }}[next]NEXT {{ Epg[1].Title }} · {{ format_datetime (convert_timezone Epg[1].Start) "h:mm tt" }}[/next]{{ end }}
{{ if (array.size Epg) > 1 }}[next]NEXT {{ Epg[1].Title }}[/next]{{ end }}
""";
public static async Task SeedOnNowNext(TvContext context, IFileSystem fileSystem, CancellationToken cancellationToken)
@@ -8,6 +8,9 @@ using ErsatzTV.Tests.Support;
using Microsoft.EntityFrameworkCore;
using NUnit.Framework;
using Shouldly;
using YamlDotNet.Serialization;
using YamlDotNet.Serialization.NamingConventions;
using ErsatzTV.Core.Graphics;
namespace ErsatzTV.Tests.Infrastructure;
@@ -65,4 +68,28 @@ public class GraphicsElementSeederTests
fs.File.Exists(_seededPath).ShouldBeFalse();
}
// Guards the #570 render bugs: the seeded YAML must deserialize into a TextGraphicsElement whose
// base_style names a real style and whose every style sets a font_family — a null font_family
// crashes CustomFontMapper before its default-font fallback, so the overlay silently never renders.
[Test]
public async Task Seeded_Element_Deserializes_With_Resolvable_BaseStyle_And_Font_Families()
{
var fs = new MockFileSystem();
await using TvContext context = _db.CreateContext();
await GraphicsElementSeeder.SeedOnNowNext(context, fs, CancellationToken.None);
string yaml = await fs.File.ReadAllTextAsync(_seededPath);
IDeserializer deserializer = new DeserializerBuilder()
.WithNamingConvention(CamelCaseNamingConvention.Instance)
.IgnoreUnmatchedProperties()
.Build();
var element = deserializer.Deserialize<TextGraphicsElement>(yaml);
element.ShouldNotBeNull();
element.Styles.ShouldNotBeEmpty();
element.Styles.Select(s => s.Name).ShouldContain(element.BaseStyle);
element.Styles.ShouldAllBe(s => !string.IsNullOrWhiteSpace(s.FontFamily));
}
}