mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 06:15:09 +00:00
* fix(errors): record the exception's own stack trace record_error() called traceback.format_exc(), which only sees an exception while its except block is running. plugin_executor records exceptions caught on a worker thread after that block has ended, so every trace on /errors read "NoneType: None". The trace is now built from the exception's __traceback__. The executor's log call had the same problem with exc_info=True and now passes the exception. record_error() also merged LEDMatrixError context into the caller's dict in place; it now works on a copy. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(wifi): point at configure_wifi_permissions.sh instead of a sudoers list The module docstring told users to grant NOPASSWD sudo on iptables and ip. configure_wifi_permissions.sh refuses those grants on purpose: a wildcard rule for either runs an arbitrary program as root. Point at the script and say why it leaves them out. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): disconnect finds the saved profile by SSID disconnect_from_network() asked `nmcli -f NAME,802-11-wireless.ssid connection show` for the profile to take down, but nmcli rejects that column for `connection show`, so the lookup always failed and only the device was disconnected. The per-profile lookup _connect_nmcli() already used is now _find_profile_for_ssid(), and both callers share it. It also splits terse output on the last colon and unescapes "\:", so a profile name containing a colon is found. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): write wifi_config.json atomically and report a failed save _save_config() opened the file for writing in place and swallowed any error, so a wifi_config.json left owned by root made the web toggle for auto-enabling AP mode report success while nothing was saved, and a crash mid-write could truncate the file. It now uses atomic_write_json, which also keeps the file's owner and shared group when root saves it, and returns False on failure. POST /wifi/ap/auto-enable answers 500 in that case. The file is now written with indent=4, like the other config files. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(fonts): resolve plugin:// fonts in the plugin's own directory FontManager looked for a plugin's bundled fonts under Path("plugins") / plugin_id: relative to the process cwd, and not the default install directory (plugin-repos/), so a manifest's plugin:// fonts never loaded. register_plugin_fonts() takes an optional plugin_dir, and PluginManager passes the directory it loaded the plugin from. Callers that omit it get a lookup in the configured plugin_system.plugins_directory, then plugins/, resolved against the install root. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(api-helper): cache responses for the requested cache_ttl APIHelper.get(cache_ttl=...) and set_cache(ttl=...) dropped the ttl on the claim that CacheManager does not support one, but CacheManager.set() takes a ttl, stores it with the entry, and both cache tiers honour it over a reader's max_age. Without it every response expired after the 300-second default read age, whatever the plugin asked for. The ttl is now passed through, and the cache read passes cache_ttl as max_age for entries written without one. The class docstring describes what the helper actually does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(style): one scale range for the schema, element_scale and LogoHelper The generated Scale field allowed 0.1 to 10, element_style's reader capped at 10 with no floor, and LogoHelper accepted 0.05 to 8 and reset anything else to 1.0. A logo scale of 9, which the form accepts, drew at the shipped size. MIN_ELEMENT_SCALE / MAX_ELEMENT_SCALE (0.1, 10.0) in src.element_style are now the schema bounds and the clamp every reader applies through coerce_scale(): a positive number outside the range is clamped, and anything that is not a finite positive number means the default. That also stops element_scale() passing NaN through, since min(nan, 10.0) is nan. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(logos): placeholder lands at the requested path; empty logos list download_missing_logo() wrote its fallback placeholder to <normalize_abbreviation(abbr)>.png in the logo directory rather than to the logo_path the caller passed, so it could return True while nothing existed where the plugin looks (e.g. "TA&M.png" vs "TAANDM.png"). create_placeholder_logo() takes an optional filepath, and download_missing_logo passes the requested one. download_missing_logo_for_team() only caught KeyError, so a team whose "logos" list is empty raised IndexError; it now treats KeyError, IndexError and TypeError as "no logo URL". The placeholder is drawn with PLACEHOLDER_SIZE / PLACEHOLDER_BG, the constants is_placeholder_logo() recognises it by, instead of repeated literals. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(fonts): resolve bundled font paths against the install root TextHelper's default font_dir, the logo placeholder's font and FontManager's font_overrides.json were all relative to the process cwd, so a process started anywhere but the install root (the plugin safety harness, a manual run, a unit without WorkingDirectory) drew with PIL's default face and read no overrides. They now go through font_layout.resolve_asset_path; the overrides file sits in the install root's config/. The resolver docstrings described an order the code does not follow: resolve_asset_path never consults the cwd, and sports_shared's _resolve_font_path tries the cwd first. Both docstrings now say what the code does, and _resolve_font_path calls resolve_asset_path instead of probing FontManager for it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(sync): the web UI reads the sync status file the display writes sync_manager writes its status to tempfile.gettempdir(), but GET /api/v3/sync/status read a hardcoded /tmp/led_matrix_sync_status.json and defaulted the port to a literal 5765. Wherever TMPDIR is set (or on any non-/tmp host) the page only ever showed "starting". The endpoint now uses sync_manager.STATUS_FILE and SYNC_PORT. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(http): the rankings resolver sends the project's User-Agent DynamicTeamResolver fetched ESPN rankings with a bare requests.get, so it sent python-requests' default User-Agent, which ESPN rejects; the AP_TOP_N favourites then resolved to nothing. It now sends DEFAULT_HTTP_HEADERS. BaseOddsManager carried its own copy of the User-Agent string and now uses the same shared headers (which also adds Accept-Language). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(backup): record the core release and read the configured plugin dir The manifest's ledmatrix_version came from a VERSION file that does not exist, then from .git/HEAD: a 12-character sha, or "ref: refs/he" when the branch's ref was packed. It is now src.__version__. list_installed_plugins() scanned a hardcoded plugin-repos/, so on an install whose plugin_system.plugins_directory points elsewhere, plugins missing from plugin_state.json were left out of the backup. It now reads the configured directory from config/config.json, defaulting to plugin-repos. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(startup): report a missing display section once A config without a display section produced three errors for the one problem ("Missing required configuration key: display", "Display configuration is missing or empty" and "Display configuration is missing"), and an empty one produced two. _validate_config now reports it once, as a missing key or an empty section, and _validate_display_config leaves it to that. The module docstring said the validator fails fast; nothing in the display service calls raise_on_errors(), so it now says the errors are reported and startup continues. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(wifi): share the copied blocks and name the AP constants - _parse_nmcli_wifi_list() is the one parser behind _scan_nmcli and _scan_nmcli_cached. - _verify_connected(), _wait_for_device_idle(), _failsafe_ap() and _mark_forced() replace blocks that were pasted two or three times in the connect and enable-AP paths. The device-idle wait now checks before its first one-second sleep instead of after it. - _check_command() calls _find_command_path() instead of repeating it. - AP_IP, PORTAL_PORT, AP_PROFILE_NAME and AP_PROFILE_NAMES name values that were spelled out 14, 12, 8 and 2 times; the two deletion loops now walk the same tuple. The iwconfig status path compares the AP address exactly: startswith() also skipped 192.168.4.10-19. - Dropped a second WIFI.SIGNAL query that repeated the first, a no-op "if ssid: continue", the try/except around _connect_wpa_supplicant's constant return, and a second save of a scan scan_networks already saves. - _ensure_wifi_radio_enabled's docstring says it returns True when the radio state cannot be read at all. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(config): drop dead branches and history comments in ConfigManager - The module docstring pointed plugin authors at update_plugin_config(), which does not exist; it now names save_config_atomic() and save_raw_file_content(). - load_config's FileNotFoundError handler tested the message for "config_secrets.json", but a missing secrets file is handled where it is read, so only config.json reaches it; the check is gone. - save_raw_file_content's `file_type == "main" or "secrets"` guard was always true (anything else raised earlier). - get_raw_file_content('secrets') already returns {} for a missing file, so the os.path.exists() in front of two calls to it is gone. - Comments that narrated earlier behaviour are rewritten as what the code does now. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(background-data): present-tense comments, drop unused API - Comments that told the history of each fix (what "used to" happen, "the old per-delivery release") now state the invariant the code keeps. - get_statistics() no longer reports a constant 'queue_size': 0, and the uncalled clear_completed_requests() is gone (_cleanup_completed_requests does that job on every completion). Neither is referenced in core, the web UI or the plugin monorepo. shutdown_background_service() has no production caller either, but it is the only way to tear down the get_background_service() singleton, which the tests rely on, so it stays. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(odds): drop the unread cache_ttl and merge the odds_data branches BaseOddsManager loaded base_odds_manager.cache_ttl from config and never used it: cached odds live for the update interval (get_odds' ttl=interval). No core or monorepo code reads the attribute, so it is gone along with its log line. The two consecutive `if odds_data:` blocks are one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(backup): one table for the single-file sections config, secrets, wifi and ytm_auth were each spelled out in create, preview, validate and restore. _SINGLE_FILE_SECTIONS lists them once, with the RestoreOptions flag that restores each, and all four walk it. Restore error messages keep their wording ("Failed to restore <file name>"). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(fonts): drop FontManager's write-only state and duplicate logs - fonts_config, font_metadata and font_dependencies were written and never read; the performance_stats keys font_load_times, render_times, total_renders and the per-call "resolve" timings (_record_performance_metric) likewise. get_performance_stats() reads only the counters that remain. Nothing in core or the plugin monorepo references any of them. - A failed BDF load was logged twice, by _load_bdf_font and again by get_font; get_font's line is the one kept. - Removed "NEW:" and commented-out cozette entries, the "Copy font to assets/fonts" comment on code that copies nothing, and local imports of names the module already imports. The deprecated add_font() now resolves assets/fonts against the install root. The @deprecated methods stay. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(text-helper): cache loaded fonts; drop the pre-textlength fallback TextHelper declared _font_cache, cleared it and reported its size, but never stored anything in it. load_fonts() now keeps each (file, size) it loads there, so clear_font_cache() and get_font_cache_stats() mean what they say and repeated load_fonts() calls reuse the fonts. get_text_width() no longer catches AttributeError for Pillow releases without ImageDraw.textlength; requirements.txt pins Pillow>=12.2. The class docstring describes what the helper does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(common): fix wrong docstrings in api_helper, permission_utils, snapshot_policy - permission_utils called 0o2775 "sticky bit"; the 2 is setgid, which is what makes new files take the directory's group. - snapshot_policy pointed at web_interface/blueprints/api_v3.py, which is a package now; the health check is in api_v3/misc.py. - APIHelper.clear_cache() lost a history note and a fallback to a clear() method that neither CacheManager nor the testing MockCacheManager has. The session headers are built from DEFAULT_HTTP_HEADERS instead of a copy of them, and the module docstring says what the module offers. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(sports): present-tense comments in the shared scoreboard renderers - sports_scroll and sports_game_renderer comments that referred to "this PR", "the old flat 128px card" or what the renderer "previously" did now describe the current behaviour and its reason. - The block explaining why non-finite settings are rejected sat above _score_reserve_width; it describes _center_gap_width and now lives in it. - unshare_element_fonts wrapped its import of font_layout.load_truetype in an `except ImportError` that cannot fire inside core; the import stays at call time so tests can spy on the pinned loader. - sports_card docstrings that told the history of a fix say what the code does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sports-shared): drop dead code, name the ESPN limit - _get_weeks_data asked for limit=1000, which fetch_espn_scoreboard clamps to ESPN_MAX_LIMIT anyway; it now names that constant. Its unused `immediate_events = []` is gone. - _get_season_schedule_dates() returned ("", "") and has no caller in core or the plugin monorepo. - _should_log keeps its warning_type parameter (part of the inherited signature, though nothing in core or the monorepo calls it) and its docstring says the cooldown is shared across types. - An unused ImageFont import is gone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sync): one follower-mode switch, shared panel defaults - The class docstring said the leader sends PNG frames. Frames go over UDP as raw RGB; PNG is only the Vegas scroll image sent over TCP. It now describes both paths. - _enter_follower_mode() replaces the two copies of "note the leader, switch from standalone to follower, log, write status" in the frame and scroll-position handlers. - The rows/cols fallbacks use DEFAULT_ROWS / DEFAULT_COLS from src.display_geometry, as chain_length already did. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(style): drop _layout_axis, name the layout group title - ElementStyleResolver._layout_axis() had no caller in core or the plugin monorepo. - _element_block_from_spec checked spec['size'] was a dict again after size_spec already had; it reads size_spec. - The "Layout Offsets" title written into three generated schema blocks is _LAYOUT_TITLE. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(logo-helper): say what the placeholder draws; name the 1.5 box factor - _create_placeholder_logo's docstring said it draws the team abbreviation; it draws an outlined grey box and nothing else. The docstring says so, and the "in a real implementation you'd want text" comments are gone. - The 1.5 x panel default logo box, written out six times, is DEFAULT_LOGO_BOX_FACTOR. - ImageDraw is imported with Image at the top of the module. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(logos): drop dead code and a duplicate regex in logo_downloader - _SAFE_LEAGUE_CODE_RE was the same pattern as _SAFE_LEAGUE_RE; both checks use the one. - get_logo_filename_variations reassigned the TA&M case to the list it already had; the function returns the two names directly. - _get_team_name_variations() had no caller in core or the plugin monorepo. - fetch_single_team's docstring was copied from fetch_teams_data; a log message read "for{team_id}". Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor: drop the Pillow<9.1 resample shim and a catch-and-reraise - adaptive_images fell back to Image.LANCZOS/NEAREST for Pillow < 9.1; requirements.txt pins Pillow>=12.2. RESAMPLE_LANCZOS and RESAMPLE_NEAREST keep their names (src.common re-exports them). - CacheManager.save_cache caught CacheError only to re-raise it; the disk write is now called directly, with the same result. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(api-helper): stop the real CacheManager's cleanup thread The cache-lifetime tests built a CacheManager and left its cleanup thread's class-wide claim on the directory in place, which broke test_cache_cleanup_thread_ownership when it ran later in the session. The fixture now stops the thread on teardown. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): core-common Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
220 lines
9.1 KiB
Python
220 lines
9.1 KiB
Python
"""Visibility, alignment and scale reach the draw.
|
|
|
|
The resolver has understood these three since the framework landed, but nothing
|
|
on the scoreboard path consumed them: an element could be marked hidden in the
|
|
web UI and still render. This covers the readers, the mixin accessors the draw
|
|
paths use, and the one shared logo-sizing seam.
|
|
|
|
The rule throughout is that an untouched config takes exactly the path it took
|
|
before -- so each test that asserts an effect has a sibling asserting the
|
|
default is inert.
|
|
"""
|
|
|
|
import logging
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from PIL import Image
|
|
|
|
PROJECT_ROOT = Path(__file__).parent.parent
|
|
sys.path.insert(0, str(PROJECT_ROOT))
|
|
|
|
from src.common.logo_helper import LogoHelper # noqa: E402
|
|
from src.common.sports_shared import SportsCoreSharedMixin # noqa: E402
|
|
from src.element_style import ( # noqa: E402
|
|
element_align, element_scale, element_visible)
|
|
|
|
HIDDEN = {"customization": {"records": {"visible": False}}}
|
|
ALIGNED = {"customization": {"score_text": {"align": "right"}}}
|
|
SCALED = {"customization": {"layout": {"home_logo": {"scale": 0.5}}}}
|
|
|
|
|
|
class TestTheReaders:
|
|
def test_an_element_is_visible_unless_it_says_otherwise(self):
|
|
assert element_visible({}, "records") is True
|
|
assert element_visible(HIDDEN, "records") is False
|
|
|
|
def test_a_mode_can_hide_what_the_base_shows(self):
|
|
cfg = {"customization": {"records": {"visible": True},
|
|
"modes": {"recent": {"records": {"visible": False}}}}}
|
|
assert element_visible(cfg, "records") is True
|
|
assert element_visible(cfg, "records", mode="recent") is False
|
|
|
|
def test_a_mode_that_says_nothing_inherits(self):
|
|
"""None is the inherit sentinel and must not read as False."""
|
|
cfg = {"customization": {"records": {"visible": False},
|
|
"modes": {"live": {"records": {"visible": None}}}}}
|
|
assert element_visible(cfg, "records", mode="live") is False
|
|
|
|
def test_alignment_is_unset_by_default(self):
|
|
assert element_align({}, "score_text") is None
|
|
assert element_align(ALIGNED, "score_text") == "right"
|
|
|
|
def test_scale_reads_the_layout_block(self):
|
|
assert element_scale({}, "home_logo") == 1.0
|
|
assert element_scale(SCALED, "home_logo") == 0.5
|
|
|
|
def test_scale_takes_a_per_mode_override(self):
|
|
cfg = {"customization": {"layout": {"home_logo": {"scale": 0.5}},
|
|
"modes": {"live": {"layout": {"home_logo": {"scale": 2.0}}}}}}
|
|
assert element_scale(cfg, "home_logo", mode="live") == 2.0
|
|
assert element_scale(cfg, "home_logo") == 0.5
|
|
|
|
@pytest.mark.parametrize("cfg", [
|
|
None, {}, "nonsense", {"customization": "nonsense"},
|
|
{"customization": {"records": "nonsense"}},
|
|
{"customization": {"records": {"visible": "maybe"}}},
|
|
])
|
|
def test_a_hostile_config_never_raises(self, cfg):
|
|
assert element_visible(cfg, "records") is True
|
|
assert element_align(cfg, "records") is None
|
|
assert element_scale(cfg, "records") == 1.0
|
|
|
|
|
|
class _Draw:
|
|
"""Records what would have been drawn."""
|
|
|
|
def __init__(self):
|
|
self.calls = []
|
|
self.fontmode = ""
|
|
|
|
def text(self, position, text, font=None, fill=None):
|
|
self.calls.append({"position": position, "text": text, "fill": fill})
|
|
|
|
|
|
class _Host(SportsCoreSharedMixin):
|
|
def __init__(self, config, mode=None):
|
|
self.config = config
|
|
self.fonts = {}
|
|
self.logger = logging.getLogger("test")
|
|
self.SKIN_MODE = mode
|
|
|
|
|
|
class TestTheDrawPath:
|
|
def test_a_hidden_element_is_not_drawn_at_all(self):
|
|
draw = _Draw()
|
|
_Host(HIDDEN)._draw_text_with_outline(
|
|
draw, "9-1", (0, 0), None, element="records")
|
|
assert draw.calls == [], (
|
|
"a hidden element must produce no draw, outline included")
|
|
|
|
def test_a_visible_element_still_draws(self):
|
|
draw = _Draw()
|
|
_Host({})._draw_text_with_outline(
|
|
draw, "9-1", (0, 0), None, element="records")
|
|
assert draw.calls, "the default must be inert"
|
|
|
|
def test_naming_the_element_resolves_its_colour(self):
|
|
draw = _Draw()
|
|
cfg = {"customization": {"score_text": {"text_color": [1, 2, 3]}}}
|
|
_Host(cfg)._draw_text_with_outline(
|
|
draw, "21", (0, 0), None, element="score_text")
|
|
# Last call is the text itself; the earlier eight are the outline.
|
|
assert draw.calls[-1]["fill"] == (1, 2, 3)
|
|
|
|
def test_an_explicit_fill_still_wins(self):
|
|
"""Odds colours and the favourite-result tint mean something the
|
|
palette does not."""
|
|
draw = _Draw()
|
|
cfg = {"customization": {"score_text": {"text_color": [1, 2, 3]}}}
|
|
_Host(cfg)._draw_text_with_outline(
|
|
draw, "21", (0, 0), None, fill=(9, 9, 9), element="score_text")
|
|
assert draw.calls[-1]["fill"] == (9, 9, 9)
|
|
|
|
def test_a_mode_hides_only_that_mode(self):
|
|
cfg = {"customization": {"modes": {"recent": {"records": {"visible": False}}}}}
|
|
recent, live = _Draw(), _Draw()
|
|
_Host(cfg, "recent")._draw_text_with_outline(
|
|
recent, "9-1", (0, 0), None, element="records")
|
|
_Host(cfg, "live")._draw_text_with_outline(
|
|
live, "9-1", (0, 0), None, element="records")
|
|
assert recent.calls == []
|
|
assert live.calls
|
|
|
|
|
|
class TestAlignment:
|
|
def test_unset_leaves_the_caller_where_it_was(self):
|
|
"""These draws carry per-sport nudges; a centre recomputed here would
|
|
not be the same pixel."""
|
|
assert _Host({})._aligned_x("score_text", 20, 64, 22) == 22
|
|
|
|
def test_right_pushes_to_the_edge(self):
|
|
assert _Host(ALIGNED)._aligned_x("score_text", 20, 64, 22) == 44
|
|
|
|
def test_left_goes_to_zero(self):
|
|
cfg = {"customization": {"score_text": {"align": "left"}}}
|
|
assert _Host(cfg)._aligned_x("score_text", 20, 64, 22) == 0
|
|
|
|
def test_text_wider_than_the_panel_is_not_pushed_off(self):
|
|
assert _Host(ALIGNED)._aligned_x("score_text", 100, 64, 0) == 0
|
|
|
|
|
|
class TestLogoScale:
|
|
@pytest.fixture
|
|
def logo(self, tmp_path):
|
|
path = tmp_path / "team.png"
|
|
Image.new("RGBA", (40, 40), (255, 0, 0, 255)).save(path)
|
|
return path
|
|
|
|
def test_an_unscaled_load_is_unchanged(self, logo):
|
|
helper = LogoHelper(display_width=64, display_height=32)
|
|
plain = helper.load_logo("AAA", logo, 32, 32)
|
|
assert plain.size == (32, 32)
|
|
|
|
def test_a_half_scale_logo_is_half_the_box(self, logo):
|
|
helper = LogoHelper(display_width=64, display_height=32)
|
|
small = helper.load_logo("AAA", logo, 32, 32, scale=0.5)
|
|
assert small.size == (16, 16)
|
|
|
|
def test_scaling_up_grows_the_logo(self, logo):
|
|
"""The fit rule never grows an image, so this only happens when the
|
|
user asks for it."""
|
|
helper = LogoHelper(display_width=64, display_height=32)
|
|
big = helper.load_logo("AAA", logo, 64, 64, scale=2.0)
|
|
assert big.size[0] > 40
|
|
|
|
def test_two_scales_do_not_share_a_cache_entry(self, logo):
|
|
helper = LogoHelper(display_width=64, display_height=32)
|
|
full = helper.load_logo("AAA", logo, 32, 32)
|
|
half = helper.load_logo("AAA", logo, 32, 32, scale=0.5)
|
|
assert full.size == (32, 32) and half.size == (16, 16)
|
|
|
|
@pytest.mark.parametrize("bad", [0, -1, None, "big", float("inf"),
|
|
float("nan")])
|
|
def test_an_unusable_scale_is_ignored(self, logo, bad):
|
|
helper = LogoHelper(display_width=64, display_height=32)
|
|
assert helper.load_logo("AAA", logo, 32, 32, scale=bad).size == (32, 32)
|
|
|
|
def test_a_scale_the_schema_allows_is_applied(self, logo):
|
|
"""The Scale field's maximum is honoured, not reset to 1.0."""
|
|
from src.element_style import MAX_ELEMENT_SCALE
|
|
helper = LogoHelper(display_width=64, display_height=32)
|
|
big = helper.load_logo("AAA", logo, 4, 4, scale=MAX_ELEMENT_SCALE)
|
|
assert big.size == (40, 40)
|
|
|
|
def test_a_scale_beyond_the_range_is_clamped(self, logo):
|
|
from src.element_style import MAX_ELEMENT_SCALE, MIN_ELEMENT_SCALE
|
|
helper = LogoHelper(display_width=64, display_height=32)
|
|
assert helper.load_logo("AAA", logo, 4, 4, scale=MAX_ELEMENT_SCALE * 3).size == (40, 40)
|
|
assert helper.load_logo("AAA", logo, 40, 40, scale=MIN_ELEMENT_SCALE / 2).size == (4, 4)
|
|
|
|
|
|
class TestScaleCoercion:
|
|
"""One range for the schema, element_scale and LogoHelper."""
|
|
|
|
def test_schema_bounds_are_the_clamp_bounds(self):
|
|
from src.element_style import (MAX_ELEMENT_SCALE, MIN_ELEMENT_SCALE,
|
|
_offset_block_from_spec)
|
|
prop = _offset_block_from_spec("home_logo", {"scale": True})["properties"]["scale"]
|
|
assert (prop["minimum"], prop["maximum"]) == (MIN_ELEMENT_SCALE, MAX_ELEMENT_SCALE)
|
|
|
|
@pytest.mark.parametrize("raw,expected", [
|
|
(0.5, 0.5), (25, 10.0), (0.01, 0.1),
|
|
(0, 1.0), (-2, 1.0), ("x", 1.0), (True, 1.0),
|
|
(float("nan"), 1.0), (float("inf"), 1.0),
|
|
])
|
|
def test_element_scale_clamps_and_rejects(self, raw, expected):
|
|
cfg = {"customization": {"layout": {"home_logo": {"scale": raw}}}}
|
|
assert element_scale(cfg, "home_logo") == expected
|