tfaour
e331f5e5a1
Extends weather's experimental Chromium+Jinja2 render style to battery, text, tasks, static image, whiteboard, and calendar (all four view modes -- agenda/today_tomorrow/week/month), and gives the photos widget its own genuinely independent palette + dithering strength. Photos: Frame.photo_palette_rgb/photo_dither_strength (mirroring the existing palette_rgb/dither_strength), with a second "Photos configuration" card in Advanced Configuration. widgets/photos.py's render() quantizes itself against these before returning -- no render_panel changes needed, since photos is the only widget that genuinely needs a different reference palette and can carry that itself, the same way modern-style widgets already self-dither via ordered_dither. Battery/text/tasks/static image/whiteboard: same render_style pattern weather established (render_style column, html_render.py build function, Jinja2 template, dialog toggle). Static image/whiteboard get their first-ever visual chrome (a rounded-corner shadowed card, shared framed_image.html.jinja) since classic draws them with zero frame at all. Fixed the same "preview endpoint bypasses render_style" bug weather originally shipped with, for tasks/static/whiteboard/ calendar's preview endpoints. Calendar: own module (app/calendar_html_render.py, mirroring calendar_render.py's separation from the simpler widgets) covering all four view modes, not just agenda -- reuses calendar_render's own private helpers so event colors/times/weather/month-grid math match classic exactly. Found and fixed two real cross-day layout bugs along the way: a per-day header height that varied based on whether that specific day had a weather entry (misaligning where every other day's event rows started across the week/month grid), and regular-weight small text being fragile under Bayer ordered dithering (out-of-month day numbers degraded into unrecognizable speckle) -- fixed by using bold everywhere and de-emphasizing via size instead of weight/gray, since gray text has the same dithering fragility this project's PIL renderers already avoid for exactly this reason. Migrations 32-38 (Frame's two new columns, then one render_style column per widget config table). 452 tests passing, including new dispatch/ migration coverage per widget type and a dedicated photos test proving photo_palette_rgb produces genuinely independent quantization from the frame's main palette_rgb.
145 lines
5.5 KiB
Python
145 lines
5.5 KiB
Python
"""app.widgets.text -- unit-level, no HTTP: constructs Widget/
|
|
TextWidgetConfig rows directly with already-parsed run structures (the
|
|
HTML-parsing step is covered separately in test_text_content.py; the
|
|
HTTP-level config-save/preview endpoints in
|
|
test_widget_config_and_queue_endpoints.py). These tests only exercise
|
|
render()'s own word-wrap/shrink-to-fit/style layout."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import time
|
|
|
|
from app import widgets
|
|
from app.models import Frame, TextWidgetConfig, Widget
|
|
|
|
|
|
def _run(text, **overrides) -> dict:
|
|
run = {"text": text, "bold": False, "italic": False, "underline": False, "color": None, "bg": None}
|
|
run.update(overrides)
|
|
return run
|
|
|
|
|
|
def _make_widget(db_session, **cfg_kwargs) -> tuple[Frame, Widget]:
|
|
frame = db_session.get(Frame, 1)
|
|
widget = Widget(frame_id=frame.id, widget_type="text", x=0, y=0, w=2, h=1,
|
|
sort_order=0, created_at=time.time())
|
|
db_session.add(widget)
|
|
db_session.flush()
|
|
db_session.add(TextWidgetConfig(widget_id=widget.id, **cfg_kwargs))
|
|
db_session.commit()
|
|
return frame, widget
|
|
|
|
|
|
def test_render_shows_a_placeholder_when_never_configured(db_session):
|
|
frame, widget = _make_widget(db_session)
|
|
img = widgets.text.render(db_session, frame, widget, 300, 200)
|
|
assert img.size == (300, 200)
|
|
assert img.mode == "RGB"
|
|
|
|
|
|
def test_render_shows_a_placeholder_for_whitespace_only_content(db_session):
|
|
frame, widget = _make_widget(db_session, content=[[_run(" ")]])
|
|
img = widgets.text.render(db_session, frame, widget, 300, 200)
|
|
assert img.size == (300, 200)
|
|
|
|
|
|
def test_render_draws_configured_text(db_session):
|
|
frame, widget = _make_widget(db_session, content=[[_run("Hello world")]])
|
|
img = widgets.text.render(db_session, frame, widget, 300, 200)
|
|
assert img.size == (300, 200)
|
|
assert img.mode == "RGB"
|
|
# Not just a blank/placeholder canvas -- some non-background pixel exists.
|
|
assert img.getcolors(maxcolors=1) is None or img.getcolors()[0][0] != 300 * 200
|
|
|
|
|
|
def test_render_respects_background_color(db_session):
|
|
frame, widget = _make_widget(db_session, content=[[_run("hi")]], background_color="#ff0000")
|
|
img = widgets.text.render(db_session, frame, widget, 50, 40)
|
|
assert img.getpixel((0, 0)) == (255, 0, 0)
|
|
|
|
|
|
def test_render_shrinks_font_to_fit_a_tiny_box(db_session):
|
|
long_text = " ".join(["word"] * 40)
|
|
frame, widget = _make_widget(db_session, content=[[_run(long_text)]], font_size=96)
|
|
# grid.MIN_FOOTPRINT["text"] is (2, 1) cells -- on an 8x5 grid against
|
|
# a full 800x480 panel that's a 200x96 box, the smallest a text
|
|
# widget can actually be placed at.
|
|
img = widgets.text.render(db_session, frame, widget, 200, 96)
|
|
assert img.size == (200, 96)
|
|
|
|
|
|
def test_render_wraps_across_multiple_paragraphs(db_session):
|
|
content = [[_run("First paragraph with several words to wrap.")],
|
|
[_run("Second paragraph, also with text.")]]
|
|
frame, widget = _make_widget(db_session, content=content)
|
|
img = widgets.text.render(db_session, frame, widget, 250, 150)
|
|
assert img.size == (250, 150)
|
|
|
|
|
|
def test_render_applies_bold_italic_underline_color_and_highlight(db_session):
|
|
content = [[
|
|
_run("bold", bold=True),
|
|
_run(" "),
|
|
_run("italic", italic=True),
|
|
_run(" "),
|
|
_run("underline", underline=True),
|
|
_run(" "),
|
|
_run("colored", color="#cf000f"),
|
|
_run(" "),
|
|
_run("highlighted", bg="#ffdb00"),
|
|
]]
|
|
frame, widget = _make_widget(db_session, content=content)
|
|
img = widgets.text.render(db_session, frame, widget, 400, 150)
|
|
assert img.size == (400, 150)
|
|
|
|
|
|
def test_render_respects_alignment(db_session):
|
|
for align in ("left", "center", "right"):
|
|
frame, widget = _make_widget(db_session, content=[[_run("hi")]], align=align)
|
|
img = widgets.text.render(db_session, frame, widget, 200, 100)
|
|
assert img.size == (200, 100)
|
|
|
|
|
|
def test_render_supports_every_font_family(db_session):
|
|
for family in widgets.text.FONT_FAMILIES:
|
|
frame, widget = _make_widget(db_session, content=[[_run("The quick brown fox")]], font_family=family)
|
|
img = widgets.text.render(db_session, frame, widget, 250, 100)
|
|
assert img.size == (250, 100)
|
|
|
|
|
|
def test_render_falls_back_to_default_family_for_an_unrecognized_value(db_session):
|
|
"""A stale/tampered font_family value (e.g. a family removed in a
|
|
later release) never crashes render() -- falls back to the default
|
|
the same way an unrecognized align/display_mode value does
|
|
elsewhere in this codebase."""
|
|
frame, widget = _make_widget(db_session, content=[[_run("hi")]], font_family="does-not-exist")
|
|
img = widgets.text.render(db_session, frame, widget, 200, 100)
|
|
assert img.size == (200, 100)
|
|
|
|
|
|
def test_no_button_actions():
|
|
"""Fixed authored text -- nothing to advance/back/check."""
|
|
assert widgets.text.ACTIONS == {}
|
|
assert widgets.text.ACTION_LABELS == {}
|
|
|
|
|
|
def test_render_modern_style(db_session, monkeypatch):
|
|
from PIL import Image
|
|
|
|
from app import html_render
|
|
|
|
frame, widget = _make_widget(
|
|
db_session,
|
|
content=[[_run("Hello, ", bold=True), _run("world!", italic=True, color="#cc0000")]],
|
|
render_style="modern",
|
|
)
|
|
|
|
def _stub(html, target_w, target_h):
|
|
return Image.new("RGB", (target_w, target_h), (255, 255, 255))
|
|
|
|
monkeypatch.setattr(html_render, "render_html_to_image", _stub)
|
|
|
|
img = widgets.text.render(db_session, frame, widget, 300, 200)
|
|
assert img.size == (300, 200)
|
|
assert img.mode == "RGB"
|