mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-11 01:26:37 +00:00
* fix(sports): share the ESPN rejected-range memo with the background service BackgroundDataService always sent a season range first and, on a 400, fell back to chunks without recording the rejection, so every background season fetch spent a doomed request and live scoreboards learned nothing from it (or it from them). The worker now consults and sets the same 6-hour memo fetch_espn_scoreboard() uses: a known rejection goes straight to month/day chunks, and if every chunk fails the range is asked once for a real error without re-spending the chunks. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(web): keep plugin asset and action routes inside their directories POST /plugins/assets/upload, GET /plugins/assets/list and POST /plugins/assets/delete joined the request's plugin_id onto assets/plugins unchecked, so '../../config' created, wrote, listed and deleted outside it. #561 guarded only the route that serves the files. All three now go through path_safety.resolve_under and answer 400 for anything but a plain name, and delete only unlinks a metadata path that resolves into that plugin's uploads directory. PluginManager.get_plugin_directory refuses ids that are not one plain path segment, so /plugins/action (which runs a manifest script from the returned directory) and every other caller get the guard; the action route also rejects such ids up front, covering its no-manager fallback. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(web): report a no-op plugin update as already up to date update_plugin() returns True both for a real update and for "nothing to do" (a ZIP-installed monorepo plugin already at the registry version, a bundled plugin). With no git commit to compare, POST /plugins/update called every such success "updated successfully", so Check & Update All counted most official plugins as updated on every run. The route now reads what changed off the plugin itself (commit, else manifest version, else last_updated) and returns data.update_status (updated / up_to_date / local_only). The update-all toast is summarised by PluginInstallManager.summarizeUpdateResults from that status, falling back to the message for older servers. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(sports): scoreboard scroll speed no longer follows target_fps sports_scroll computed the crisp speed ladder against the global target_fps whenever limit_refresh_rate_hz was the 100 Hz default. Since frame-locked presentation (#545) the helper steps a fixed number of whole pixels per presented frame and the panel presents at its real refresh, so the General tab's "Scroll Frame Rate" became a speed multiplier: 60 ran a 50 px/s scoreboard at 100 px/s, 200 ran it at 25 px/s. The ladder now uses the display manager's refresh_hz, then display.hardware.limit_refresh_rate_hz, then the default. target_fps is not consulted. Docstrings now say scroll_delay is ignored for pacing (no behaviour change there) and describe the fixed-step model. Tests: replace the tests that pinned target_fps as the ladder refresh and described time-based stepping; assert speed independence from target_fps (unit and end-to-end presented px/s against the real helper), that the fixed per-frame step is applied, and that scroll_delay does not change speed. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(web): escape registry and upload values in plugin manager inline handlers The store, saved-repository and custom-registry buttons built onclick='...(${JSON.stringify(id)})...'. JSON.stringify leaves ' alone, so a custom registry entry whose id contained ' closed the attribute and added its own handler. One helper, jsStringAttr(), now HTML-escapes the JSON literal for every one of those handlers, and the store View button opens only http(s) repo links. The live window.updateImageList (plugins_manager.js loads last, so its copy wins over the file-upload widget's) wrote the uploaded file's original name, path and ids into markup raw; they are escaped now. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(changelog): note plugin asset, action and inline handler guards Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(update): let the root pip wrapper install web_interface/requirements.txt Update Code, the automatic update's health check and Install Base Requirements install web_interface/requirements.txt through safe_pip_install.sh, which only allowed the root requirements.txt. The first commit changing that file would fail its dependency install, and the automatic updater rolls back any update whose dependencies did not install -- on every device, for every newer commit. The wrapper now lists both core requirement files. Only their folders are resolved, so a requirements.txt symlinked out of the project is compared by its target and refused (previously the root file's own symlink target was what got allowed). The updater's file list is a named constant, and a test runs the real wrapper (pip stubbed) on every file Update Code and the rollback install. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(web): do not retry plugin requests that got an HTTP answer PluginAPI.request wrapped everything that was not a structured error as NETWORK_ERROR: a proxy's 502 HTML page (response.json() throws) and a JSON error without error_code included. Check & Update All retries NETWORK_ERROR, so those updates were re-sent five more times with backoff, contrary to the #587 contract that an HTTP error response is the server's answer. NETWORK_ERROR now means only that fetch() rejected. Any HTTP response without an error_code, or with a body that is not JSON, is API_ERROR with the HTTP status attached. Tested against the shipped api_client.js. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(scroll): restart the stats window when an idle gap is dropped by size #582 dropped an idle gap from the frame stats two ways: the reset_scroll() sentinel, which also restarts the 5s window timer, and a size guard for scrollers that never call reset_scroll(), which did not. On that path the first real frame after the gap found the boundary overdue and logged a stats line for a one-frame window. Both paths now share one seeding helper. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(update): leave plugins alone when update_core's own rollback fails update_core returns rollback_failed directly when a partial pull or an update whose health check never started cannot be rolled back. run() only held plugins back for 'verifying', so those devices still got new plugin versions and a display restart on top of a core in an unknown state -- the opposite of what the health-check path does, and of the 3.4.0 changelog (plugins are left alone if the rollback fails). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(api): make the REST reference match the api_v3 package Every documented request body, query parameter and response shape was re-checked against the handlers in web_interface/blueprints/api_v3/. Fixes calls that failed as documented (repo_url, action_id/params, files/image_id, font_file+font_family, ?font=, cache key, auto_enable_ap_mode, plugin limit keys), removes the font-override endpoints dropped in #566, corrects response shapes (plugins/config, plugins/schema, health, metrics, operation history, github-status, fonts/catalog, cache/list, logs, wifi, on-demand, SSE streams), and adds the 26 routes it omitted (backup, system auto-update/git, wifi radio, starlark editor, MQTT bridge, status endpoints, skins). Documents the merge semantics of partial JSON saves to /config/main and /plugins/config and the dim-schedule POST accepting GET's days shape, which land in the same change set. Replaces app.py line numbers and the removed api_v3.py path with file and function names. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(web): remove the General-tab plugin system toggles that did nothing plugin_system.auto_discover, auto_load_enabled and development_mode had General-tab toggles whose help tips promised dormant plugins and verbose logging, but nothing reads them: every enabled plugin is discovered and loaded regardless. Remove the three toggles. The keys stay tolerated in stored configs. The save handler now stores a flag only when a client sends it; treating a missing key as an unchecked box would otherwise rewrite all three to false on every General-tab save, which still posts plugins_directory. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * refactor(scroll): remove dead code left by #523/#570 - Drop the optional scipy.ndimage import and HAS_SCIPY; nothing read them since the numpy blend replaced the scipy path. - Drop ScrollHelper._last_integer_position and frame_time_target, which were written but never read. - Keep target_fps and set_target_fps() but document them as informational: nothing paces off them, yet ledmatrix-elections' test_scroll_pacing.py reads helper.target_fps back and third-party plugins may call the setter. - Fix stale comments: fixed_pixels_per_frame's "use scroll_delay to throttle", set_sub_pixel_scrolling's "default: True", and set_frame_based_scrolling's claim that it steps. The plugins monorepo was grepped for every removed name; none is used. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(fonts): point plugins at plugin_manager.font_manager; drop removed overrides UI FONT_MANAGER.md told plugins to read display_manager.font_manager, which does not exist, so a plugin following it failed to load with AttributeError. The shared FontManager lives on the PluginManager and BasePlugin._get_font_manager() returns it (with a fallback for harnesses). Also removes the Fonts-tab override workflow and element-override panels that #566 deleted, from FONT_MANAGER.md and WEB_INTERFACE_GUIDE.md. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(store): search via /plugins/store/list?query=; send Content-Type on registry curls /plugins/store/search does not exist (404) and the list endpoint reads query, not q. The registry guide's curl examples omitted the JSON Content-Type, so the handlers saw an empty body and answered 400. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(config): use the shared core-key list in the last three private copies StartupValidator warned "Plugin 'auto_update' is enabled but not found" on every display start with auto-update or a dim schedule on; the reserved plugin-id check missed auto_update, sync, location and the rest; and ConfigManager's (uncalled) orphan cleanup would have deleted display, schedule and auto_update. All three now read src/core_config_keys.py, which also gains CORE_SECRETS_KEYS for the github/youtube secrets sections. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(web): partial JSON saves to /config/main change only what they send A JSON body with one field reset every checkbox in the sections it touched: the MQTT bridge's brightness slider turned off disable_hardware_pulsing, inverse_colors, show_refresh_rate and use_short_date_format, and a timezone-only save turned off web-UI autostart and weekly auto-updates. Missing-means-unchecked now applies only to form posts: form-encoded bodies and the v3 forms, which mark themselves with a hidden __form_section input. Also on the config routes: - vegas_min/max_cycle_duration no longer match the generic *_duration rule, so they stop landing in display_durations and a blank one no longer rejects the whole Display save; - saving from the Raw JSON editor calls start_setup_if_needed like the General form, so enabling auto-update there finishes its setup; - the schedule and dim-schedule POSTs accept the per-day days.<day> shape their GETs return, as well as the flat form keys. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(scripts): install plugin dependencies from the configured plugins directory install_plugin_dependencies.sh scanned only plugins/, but the Plugin Store installs into plugin_system.plugins_directory (default plugin-repos), so the documented "Recommended" fix found 0 plugins on every store install. It now reads plugins_directory from config/config.json (relative to the project root or absolute, default plugin-repos) and also scans plugins/ for dev symlinks, installing a plugin reached through both only once. With set -e alone, `pip ... | tee` took tee's exit status, so a failed pip install was reported as success; set -o pipefail. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs: replace stale API names, line numbers and the api_v3.py path - ADVANCED_FEATURES: StreamManager methods that exist (get_next_segment, take_next_group, refresh, advance_cycle, ...), and the real on-demand status envelope ({status, data: {state, service}}) - app.py:199 / :144 / :607-619 line citations and web_interface/blueprints/api_v3.py (now a package) replaced with file and function names in ADVANCED_FEATURES, CONFIG_DEBUGGING, PLUGIN_ARCHITECTURE_SPEC, PLUGIN_QUICK_REFERENCE, PLUGIN_CONFIGURATION_TABS, TROUBLESHOOTING and web_interface/README - CONFIG_DEBUGGING: partial /config/main saves change only sent keys; use /config/raw/main to replace the file; describe where validation runs - TROUBLESHOOTING: clear_cache.py needs --clear-all (no args only prints usage) Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(scripts): verify the web interface that actually ships, on port 5000 verify_installation.sh failed every healthy install: it required the long-removed web_interface_v2.py and looked for a listener on port 5001, while the web interface binds 5000 (web_interface/start.py). It now checks the files ledmatrix-web.service runs (start_web_conditionally.py, web_interface/start.py, app.py) and port 5000. verify_web_ui.sh had the same 5001 port in its listen check, HTTP probe and printed URLs. Port matches are anchored so :50001 no longer counts as :5000. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(plugins): one display-size contract: display_manager.width/height CLAUDE.md (#580) says to read display_manager.width/height because matrix is None when hardware init fails; the development guide, the safety-harness doc and two DisplayManager docstrings still recommended matrix.width/height. The bundled starlark-apps plugin read matrix.width unguarded, so its magnify recommendation and frame scaling raised in fallback mode (e.g. after the Pi 5 hardware refusal). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(install): make install_service.sh --help print usage instead of installing install_service.sh parsed no arguments, so `sudo ./scripts/install/ install_service.sh --help` (presented as harmless in MIGRATION_GUIDE.md) rewrote ledmatrix.service, ledmatrix-web.service and both update-verify units and enabled/started them. It now handles -h/--help (usage, exit 0, no changes) and rejects any other argument with exit 2 before doing anything. Running it with no arguments, as first_time_install.sh does, is unchanged. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(scroll): describe the fixed-step model and document frame_hold Since #545 a crisp speed from scroll_config.configure() makes the helper advance a fixed whole-pixel step per presented frame with no clock, and the display manager's frame hold is part of the speed. The docs still described the removed wall-clock model: - scroll_config's module and configure() docstrings said speed is applied in time-based mode and that omitting the hold "falls back to fractional pixels"; omitting it actually runs the scroll frame_hold times too fast. - SCROLL_PERFORMANCE.md said ScrollHelper accumulates elapsed time in both modes, and read a 20 ms stats median as missed refreshes although that is a healthy 50 px/s (hold 2) scroll. It now explains the fixed step, the hold-dependent healthy median, that target_fps plays no part, and that a hand-added scroll_pixels_per_second loses to a schema-default pair. - PLUGIN_API_REFERENCE.md documented set_scrolling_state(is_scrolling) without frame_hold; it now documents the parameter (core 3.4.0) with a configure() + set_scrolling_state example. - update_scroll_position/set_scroll_speed and set_scrolling_state docstrings say the same. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(config): mark target_fps legacy; describe what Vegas scroll_delay does - General tab "Scroll Frame Rate" (target_fps) is labelled legacy: after the sports_scroll fix nothing in core scrolling reads it. The field and its API validation stay so saved configs and plugins that read global_config['target_fps'] keep working. CONFIG_REFERENCE says the same. - Vegas frame_based_scrolling/scroll_delay were described as frame-count stepping at ~50 FPS. Neither steps nor sets a frame rate: frame-based mode converts the speed to px per scroll_delay, clamps it to 0.1-5, and still advances by elapsed time, so the applied speed is clamp(scroll_speed * scroll_delay, 0.1, 5) / scroll_delay px/s. The config comments, render_pipeline comment and CONFIG_REFERENCE rows now say so. No behaviour change. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(deps): describe how plugin dependencies are really installed The guides said the web service runs as root, that installs pick --user from os.geteuid(), and quoted a warning and a PluginManager._install_plugin_dependencies() method that don't exist. The web unit runs as the installing user; store installs go through install_requirements_file() and sudo safe_pip_install.sh (root), with a user-level fallback that says so, and load-time installs run in the display service's own (root) interpreter. Manual paths now use the configured plugins directory (plugin-repos/ by default) instead of plugins/, which store installs no longer use, and install_plugin_dependencies.sh is described as scanning that directory. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(update): count local changes one way for the preflight and the pull The automatic update's preflight ignored mode-only changes and anything whose status line contained plugins/ or plugin-repos/, then promised "Automatic updates will not stash your changes". perform_core_update used plain git status (modes count) and ignored only 'plugins/', then ran 'git stash push -- :!plugins', which nothing ever pops. So an edit to a bundled plugin under plugin-repos/, or the installer's chmods on tracked scripts, passed the preflight and was stashed away for good. - auto_update.local_changes() is the one predicate both use: core.fileMode=false, porcelain -z, and plugins/ and plugin-repos/ excluded by leading folder rather than substring (a core file under web_interface/static/v3/js/plugins/ now counts). - Update Code's explicit stash leaves out both plugin folders; the pull's --autostash carries their edits and mode changes across and reapplies them. - The automatic updater calls perform_core_update(stash_local_changes= False), which refuses instead of stashing edits that appeared after the preflight; update_core reports that as 'blocked'. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(scripts): diagnostics follow the web autostart default and api_v3 package #556 made a missing web_display_autostart mean "start" (only an explicit false/off keeps the web interface down), but the diagnostics still said otherwise: diagnose_web_ui.sh reported a missing key as "defaults to false", diagnose_web_interface.sh said the web interface "will not start unless this is set to true" and recommended enabling it, and debug_web_manual.py printed False. Troubleshooting a down web UI pointed users at a non-cause. Both shell scripts now evaluate the setting with the launcher's own autostart_enabled() (inline fallback if it cannot be imported) and report on / off / not set (on) / unparseable config; debug_web_manual.py uses the same function. They also check web_interface/blueprints/api_v3/ __init__.py: api_v3.py became a package in #553, so every healthy checkout was reported as missing a file. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(install): what install_service.sh installs; verify script port; no sudo for --help install_service.sh installs and starts ledmatrix, ledmatrix-web and the update-verify units, not only ledmatrix.service (systemd/README.md, README.md). MIGRATION_GUIDE presented 'sudo install_service.sh --help' as a harmless check; it now shows --help without sudo and warns what a real run does. SSH_UNAVAILABLE_AFTER_INSTALL: verify_installation.sh checks the web interface on port 5000. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(changelog): note update-all, plugin system settings and script fixes Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(display): size the preview after orientation and pixel mappers display_geometry.physical_size claimed to give DisplayManager's answer but only computed cols*chain x rows*parallel. RGBMatrix.width/height are measured after the library's pixel mappers, so a Rotate:90 / orientation 90 chain previewed 128x32 for a 32x128 panel and a U-mapper chain of four 256x32 for 128x64. Model the built-in mappers' size effect as the pinned lib/pixel-mapper.cc does (Rotate, U-mapper, V-mapper, StackToRow, Remap; Mirror and unknown names leave it alone), and move the orientation composition here so DisplayManager and the preview share it. The module docstring no longer claims the sync handshake uses it; that imports only DEFAULT_CHAIN_LENGTH. Audit finding F18. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(display): refuse settings the rgbmatrix library aborts on, on every board The library answers several settings with a NULL matrix or abort() rather than an error, so the display service crash-looped (Restart=on-failure) instead of reaching fallback mode: rows above 64, chain_length above 255 (uint8_t binding setter, documented as "no upper limit"), a misspelled hardware_mapping, and parallel 2-3 on a single-output mapping, reachable from the Display form on the default adafruit-hat(-pwm) mapping. #586 only guarded the Pi 5 subset. - src/matrix_support.py holds the rules for every board (Options::Validate ranges, binding integer types, mapping names and outputs from lib/hardware-mapping.c) plus the Pi 5 ones, and is the one source of the API's numeric ranges. - DisplayManager checks them before building options and raises MatrixSettingsRefused, so a hand-edited config falls back with a logged, reported reason. Emulator mode only warns. - The config API refuses them with a 400 naming the setting; combinations are checked against stored values but reported only when the request sets a field involved. - The hardware status file gains "cause" (settings/library/forced). The fallback log and Display banner give the Pi 5 rebuild hint only for a library failure instead of rebuild + gpio_slowdown advice for every failure; one Pi 5 slowdown recommendation (1-3, start at 1). - The Display form offers classic/classic-pi1 and orientation 90/270 and renders any other stored mapping selected with a warning, so an unrelated save no longer rewrites them; the API accepts 90/270. Audit findings F03, F16, F19, F21. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(display): library limits, template defaults and Pi 5 slowdown - rows 8-64, chain_length 1-255, parallel limited by the mapping's outputs, classic/classic-pi1 mappings and orientation 90/270 documented. - Defaults are the config.template.json values: config migration adds missing keys from the template, so the listed "code defaults" never applied. - One Raspberry Pi 5 gpio_slowdown recommendation: 1-3 in PIO mode, starting at 1. - Troubleshooting describes the refused-settings fallback, and CHANGELOG corrects the Unreleased "no upper limit" entry. Audit findings F19, F20, F21. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(scripts): scroll_speeds.py opens the panel with the service's options --measure and --demo built RGBMatrixOptions from a private copy of the display service's builder that had drifted: gpio_slowdown came from display.hardware (default 2) instead of display.runtime (default 3), and rp1_rio, panel_type, disable_hardware_pulsing, inverse_colors, pixel_mapper_config and orientation were skipped, with different defaults (hardware_mapping "regular", pwm_bits 11). A panel needing a high slowdown was measured -- or garbled -- in a setup the service never drives. The option filling in DisplayManager._setup_matrix moves, unchanged, into DisplayManager.apply_matrix_options(options, config), which _setup_matrix calls and the script reuses (overriding only limit_refresh_rate_hz for --measure). The script now loads the whole config rather than the hardware block. Tests pin the script's options to the service's attribute for attribute. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(scripts): scroll_speeds.py recommends keys the resolver honours The ladder ended by telling users to set display_options.scroll_pixels_per_second. scroll_config ranks that key below the scroll_speed + scroll_delay pair, deliberately, and several plugin schemas default the pair into config, so the advised key was silently ignored (a schema-default 1/0.02 pair plus an advised 66 still resolved to 50 px/s). The advice is now the pair that selects the crisp speed exactly (pixels_per_frame every frame_hold/refresh seconds), explains that the pair outranks scroll_pixels_per_second, and gives the scoreboards' per-league scroll_settings.scroll_speed (px/s) form. Tests resolve the printed pair over a schema-default pair and check it lands on the advertised speed and hold. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs: withdraw the target_fps claim for sports_scroll; fix the Vegas speed formula - SPORTS_UNIFICATION.md still presented honouring global target_fps as sports_scroll's added behaviour and its one user-visible gain; note that it was withdrawn because it had become a speed multiplier. - ADVANCED_FEATURES.md gave Vegas scrolling as (scroll_speed / target_fps) * elapsed; the real rule is scroll_speed px/s by elapsed time, through a 0.1-5 px per scroll_delay clamp when frame_based_scrolling is on. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(changelog): scroll model fixes Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(dev): link-github links plugins from the ledmatrix-plugins monorepo link-github <name> cloned https://github.com/ChuckBuilds/ledmatrix-<name>.git, and those per-plugin repositories no longer exist: official plugins are directories in the ledmatrix-plugins monorepo. It now clones (or pulls) the monorepo once into the dev directory, finds plugins/<name>, plugins/ledmatrix-<name> or the plugin whose manifest id is <name>, and links it under its manifest id. With an explicit repo URL it still links a single-repository plugin as before. dev_plugins.json: github_user is honoured again (monorepo owner, e.g. a fork), plus plugins_repo and plugins_branch; github_pattern, which was documented but never read, is dropped and warned about. Ships dev_plugins.json.example and git-ignores dev_plugins.json, both of which the guide promised. Reading JSON falls back to python3 when jq is missing (get_plugin_id silently returned nothing without jq). update/status/list find the git checkout above a monorepo plugin directory (its .git is not in the plugin dir), and update pulls a shared checkout once. status no longer exits 1 when nothing is broken. Docs: PLUGIN_DEVELOPMENT_GUIDE (quick start, link-github, configuration, workflow, store integration, hello-world link, submission), and the nonexistent scripts/git-hooks/pre-push-plugin-version and scripts/bump_plugin_version.py replaced with the real rule: bump the manifest version and run update_registry.py. scripts/dev/README.md and CLAUDE.md updated to match. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(scripts): monorepo workspace layout; fix_perms and install READMEs MULTI_ROOT_WORKSPACE_SETUP described one sibling repository per plugin; setup_plugin_repos.py links ../ledmatrix-plugins/plugins/* into plugin-repos/ and update_plugin_repos.py pulls only the monorepo, and the workspace file opens LEDMatrix plus ../ledmatrix-plugins. scripts/fix_perms/README.md listed cache directories fix_cache_permissions.sh never touches and a 'ledmatrix' service user that doesn't exist (also in scripts/install/README.md); adds safe_pip_install.sh. install/README: install_service.sh installs the web and update-verify units too. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(update): keep the rollback's pip retries inside the unit time limit The health check reinstalled the previous requirements by trying the next bash path after any failure, including a 600 s pip timeout. Two files, two paths: up to 40 minutes of pip alone, while systemd stops ledmatrix-update-verify.service at TimeoutStartSec=30min -- killing the rollback half-way and leaving the update 'verifying' until the web UI calls it lost. - Like permission_utils.install_requirements_file, only a sudo refusal moves on to the next bash; a pip that ran and failed or timed out is not repeated. The refusal wording is one list (permission_utils.SUDO_REFUSAL_PHRASES), mirrored in the stdlib-only verifier and pinned equal by a test. - All reinstalls in one rollback share a 600 s budget. - WORST_CASE_SECONDS adds up every timeout on the longest path (27.5 min); a test holds it under the unit's TimeoutStartSec and that under the web UI's VERIFY_LOST_SECONDS. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(plugins): prepare plugin configs one way for load, saves, GET, hot reload and dev tools Plugin config was prepared differently depending on how it arrived: - JSON POST /plugins/config built a partial body on schema defaults, so {"enabled": true} reset every other setting of the plugin. It now merges onto the stored section first, as the form path already did. - Legacy-boolean normalization (#588) ran only at load: GET /plugins/config returned the raw boolean, posting it back failed validation, and hot reload handed plugins the raw section (a legacy dynamic_duration: true came back as a boolean). schema_manager.prepare_plugin_config (normalize, then defaults) is now used by PluginManager.load_plugin, both save paths, GET, the save notifications and DisplayController's hot-reload callback. - The JSON save's filter kept only enabled/display_duration/live_priority and dropped a submitted skin, skin_options or vegas_* tuning key. There is now one core-owned per-plugin list, schema_manager.CORE_PLUGIN_PROPERTIES, used by validation and by the save filter; PluginManager's CORE_OWNED_CONFIG_KEYS is its vegas subset. - Plugin sections posted to /config/main were stored verbatim, including values /plugins/config rejects. They now go through the same preparation (_prepare_plugin_config_for_save, extracted from save_plugin_config), and a failing section rejects the whole save before anything is written. - dev_server read only top-level defaults and let a schema enabled:false win; build_full_config shallow-merged overrides, dropping sibling defaults; the harness extracted defaults differently from the device. loading.build_config now uses the device's extraction and preparation, and dev_server, check_plugin, render_plugin and the harness all use it. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(mqtt-bridge): brightness changes apply live and touch nothing else The display service's hot reload applies a saved brightness within a few seconds, and /config/main no longer resets other display settings on a brightness-only JSON body. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(changelog): automatic update hardening Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(config): rewrite PLUGIN_CONFIG_ARCHITECTURE for the v3 web UI It described web_interface_v2.py and index_v2.html (both gone), client-side form generation, one POST per field with {key, value}, and 'no nested objects'. The v3 UI renders plugin forms server-side from the schema (pages_v3 partial + plugin_config.html macros, nested sections and x-widgets), posts the whole form once, and save_plugin_config() merges onto the stored section, validates, splits x-secret fields and notifies the plugin. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(mqtt): brightness saves apply via hot reload and leave other settings alone The bridge README said brightness is applied on the display's next restart; the display controller's config hot reload applies it within seconds. It also now states that the bridge's partial JSON save changes only brightness (the /config/main merge fix in this change set). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(update): don't log pip's output from the health check's reinstall pip can echo a private index URL with embedded credentials; permission_utils redacts it, the stdlib-only verifier cannot, so it logs the exit code only. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(config): mark the plugin_system toggles as unused legacy keys auto_discover, auto_load_enabled and development_mode are read by nothing and leave the General tab in this change set (F40). CONFIG_REFERENCE said they were read by the plugin loader; PLUGIN_CONFIGURATION_GUIDE and the REST reference listed them as live settings. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(changelog): docs and developer tools group Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(web): legacy plugin-system toggles no longer count as a General save auto_discover, auto_load_enabled and development_mode have left the General form, so a post carrying only one of them is not a general-settings save and must not treat web_display_autostart and auto_update as unchecked. The plugin_system block itself is left as on main for the branch that reworks it. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(changelog): config-save and plugin-config preparation fixes Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(claude): re-check matrix_support.py rules when the library submodule is bumped Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix: address Codacy findings on the core audit PR - plugin_manager.prepare_plugin_config: when the fallback legacy-boolean pass also fails, log a warning instead of a bare except/pass. - api_client.js: request() refuses any endpoint that is not a plain path under /api/v3 ("//host", backslashes, ".." or "." segments, whitespace, control characters) with INVALID_ENDPOINT before calling fetch(), and plugin ids are URL-encoded wherever they are put into a URL (also in the app-shell batch load). - test_update_all.js: pins both against the shipped client. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(web): check endpoint control characters without a control-character regex Codacy (ESLint no-control-regex, Biome noControlCharactersInRegex) flags the \x00-\x1f range in checkEndpoint's regex. Test the char codes instead; the endpoints refused are unchanged. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * test(auto-update): make the seed script executable on disk, not only in the index On Linux Repo.publish() commits with -a, which recorded scripts/run.sh as 100644 upstream because the seed file was never chmod +x. The pull then brought in the same mode the installer chmod had made locally, so installer_chmod saw no mode change left to check. The updater was fine: with the upstream commit at 100755 the --autostash carries the device's chmod across. Verified under Linux (WSL, git 2.43): the old helper fails exactly as CI did, the fixed one passes all 63 tests in the file. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
1092 lines
50 KiB
Python
1092 lines
50 KiB
Python
"""
|
||
Scroll Helper
|
||
|
||
Handles scrolling text and image content for LED matrix displays.
|
||
Extracted from LEDMatrix core to provide reusable functionality for plugins.
|
||
|
||
Features:
|
||
- Pre-rendered scrolling image caching with numpy array optimization
|
||
- Fast numpy-based image slicing for high-performance scrolling (100+ FPS)
|
||
- Scroll position management with wrap-around
|
||
- Dynamic duration calculation based on content width
|
||
- Frame rate tracking and logging
|
||
- Scrolling state management integration with display_manager
|
||
- Support for both continuous and bounded scrolling modes
|
||
- Pre-allocated buffers to minimize memory allocations
|
||
"""
|
||
|
||
import logging
|
||
import math
|
||
import time
|
||
from typing import Optional, Dict, Any
|
||
from PIL import Image
|
||
import numpy as np
|
||
|
||
|
||
# How often the frame-stats line is emitted, and therefore also the ceiling
|
||
# on a believable frame time: a scroll that renders at all cannot take this
|
||
# long over one frame, so a sample this large is an idle gap between scrolls.
|
||
FPS_LOG_INTERVAL = 5.0
|
||
|
||
|
||
def frame_stats(frame_times: list) -> Dict[str, Any]:
|
||
"""Summary statistics over one window of frame durations (seconds).
|
||
|
||
Split out of log_frame_rate() so the arithmetic can be tested without a
|
||
clock. Median and p95 are the real ones: the median takes both middle
|
||
samples on an even window, and p95 is nearest-rank, so a 100-frame window
|
||
reports the 95th sorted sample rather than the 96th. That matters twice
|
||
over, because the median is also the threshold the stall and skip counts
|
||
are measured against.
|
||
"""
|
||
window = sorted(frame_times)
|
||
n = len(window)
|
||
median = (window[n // 2] if n % 2
|
||
else (window[n // 2 - 1] + window[n // 2]) / 2.0)
|
||
mean = sum(window) / n
|
||
# Anything past 1.5x the median missed a panel refresh; anything under
|
||
# half of it never reached the panel at all (dirty tracking skipped the
|
||
# swap, so the frame did not wait for vsync).
|
||
return {
|
||
"frames": n,
|
||
"fps": (1.0 / mean) if mean > 0 else 0.0,
|
||
"median": median,
|
||
"p95": window[max(0, math.ceil(0.95 * n) - 1)],
|
||
"max": window[-1],
|
||
"min": window[0],
|
||
"stalls": sum(1 for f in window if f > median * 1.5),
|
||
"skips": sum(1 for f in window if f < median * 0.5),
|
||
}
|
||
|
||
|
||
def format_frame_stats(frame_times: list) -> str:
|
||
"""The one-line rendering of frame_stats(), in milliseconds."""
|
||
s = frame_stats(frame_times)
|
||
n = s["frames"]
|
||
return (
|
||
f"{s['fps']:.1f} fps over {n} frames | "
|
||
f"median {s['median'] * 1000:.2f}ms p95 {s['p95'] * 1000:.2f}ms "
|
||
f"max {s['max'] * 1000:.2f}ms min {s['min'] * 1000:.2f}ms | "
|
||
f"stalls {s['stalls']} ({100.0 * s['stalls'] / n:.1f}%) "
|
||
f"skips {s['skips']} ({100.0 * s['skips'] / n:.1f}%)"
|
||
)
|
||
|
||
|
||
class ScrollHelper:
|
||
"""
|
||
Helper class for scrolling text and image content on LED displays.
|
||
|
||
Provides functionality for:
|
||
- Creating and caching scrolling images (with numpy array optimization)
|
||
- Fast numpy-based image slicing for high-performance scrolling
|
||
- Managing scroll position with wrap-around
|
||
- Calculating dynamic display duration
|
||
- Frame rate tracking and performance monitoring
|
||
- Integration with display manager scrolling state
|
||
- Pre-allocated buffers for minimal memory allocations
|
||
|
||
Performance optimizations:
|
||
- Uses numpy arrays for fast array slicing instead of PIL crop operations
|
||
- Pre-computes numpy array from PIL image to avoid repeated conversions
|
||
- Reuses pre-allocated frame buffer to minimize allocations
|
||
- Optimized for 100+ FPS scrolling performance
|
||
"""
|
||
|
||
def __init__(self, display_width: int, display_height: int,
|
||
logger: Optional[logging.Logger] = None):
|
||
"""
|
||
Initialize the ScrollHelper.
|
||
|
||
Args:
|
||
display_width: Width of the LED matrix display
|
||
display_height: Height of the LED matrix display
|
||
logger: Optional logger instance
|
||
"""
|
||
self.display_width = display_width
|
||
self.display_height = display_height
|
||
self.logger = logger or logging.getLogger(__name__)
|
||
|
||
# Scrolling state
|
||
self.scroll_position = 0.0
|
||
self.total_distance_scrolled = 0.0 # Track total distance including wrap-arounds
|
||
self.scroll_speed = 1.0
|
||
self.scroll_delay = 0.001 # Minimal delay for high FPS (1ms)
|
||
self.cached_image: Optional[Image.Image] = None
|
||
self.cached_array: Optional[np.ndarray] = None # Numpy array cache for fast operations
|
||
self.total_scroll_width = 0
|
||
|
||
# Pre-allocated buffer for output frame (reused to avoid allocations)
|
||
self._frame_buffer: Optional[np.ndarray] = None
|
||
|
||
# Sub-pixel scrolling: OFF by default, and that is deliberate.
|
||
# Blending renders a half-step by mixing two adjacent columns 50/50.
|
||
# On a high-resolution screen that reads as smooth motion; on a coarse
|
||
# LED matrix showing pixel-font text it does not. A one-pixel stroke
|
||
# becomes two half-brightness pixels, so frames alternate between crisp
|
||
# and smeared and the text appears to shimmer and jump a pixel ahead --
|
||
# tested on a 2x128x64 panel and clearly worse than integer stepping.
|
||
#
|
||
# The rule this display obeys: motion is smooth when it advances a
|
||
# whole number of pixels per refresh. Anything slower must either
|
||
# blend (blur) or repeat frames (judder); blending is the worse of the
|
||
# two here. Vegas mode still opts in via set_sub_pixel_scrolling().
|
||
self.sub_pixel_scrolling = False
|
||
|
||
# Frame-based scrolling settings
|
||
self.frame_based_scrolling = False
|
||
#: Whole pixels to advance per presented frame, or None to pace
|
||
#: off elapsed time. See set_pixels_per_frame.
|
||
self.fixed_pixels_per_frame = None
|
||
self.last_step_time = 0.0 # Time of the last position update
|
||
|
||
# Time tracking for scroll updates
|
||
self.last_update_time: Optional[float] = None
|
||
|
||
#: Informational only: the presentation rate scroll_config chose
|
||
#: (panel refresh / frame hold). Nothing paces off it -- the helper
|
||
#: steps per call and SwapOnVSync paces the calls. Kept because
|
||
#: plugins and their tests read it back.
|
||
self.target_fps = 120
|
||
|
||
# Dynamic duration settings
|
||
self.dynamic_duration_enabled = True
|
||
self.min_duration = 30
|
||
self.max_duration = 300
|
||
self.duration_buffer = 0.1
|
||
self.calculated_duration = 60
|
||
self.scroll_start_time: Optional[float] = None
|
||
self.last_progress_log_time: Optional[float] = None
|
||
self.progress_log_interval = 5.0 # seconds
|
||
|
||
# Frame rate tracking. last_frame_time is None until the first frame
|
||
# of a scroll is rendered -- see log_frame_rate() for why timing from
|
||
# construction (or from the end of the previous scroll) is wrong.
|
||
self.frame_count = 0
|
||
self.last_frame_time: Optional[float] = None
|
||
self.last_fps_log_time = time.time()
|
||
self.frame_times = []
|
||
# Every frame time since the last stats line, so the 5s summary can
|
||
# report the tail rather than one arbitrary sample. Cleared on log.
|
||
self._window: list = []
|
||
|
||
# Scrolling state management
|
||
self.is_scrolling = False
|
||
self.scroll_complete = False
|
||
|
||
def create_scrolling_image(self, content_items: list,
|
||
item_gap: int = 32,
|
||
element_gap: int = 16,
|
||
lead_gap: Optional[int] = None) -> Image.Image:
|
||
"""
|
||
Create a wide image containing all content items for scrolling.
|
||
|
||
Args:
|
||
content_items: List of PIL Images to include in scroll
|
||
item_gap: Gap between different items
|
||
element_gap: Gap between elements within an item
|
||
lead_gap: Blank columns before the first item. Defaults to a full
|
||
display width, which makes a standalone ticker scroll in from
|
||
off-screen. Callers that loop many plugins back-to-back (Vegas
|
||
mode) pass a smaller value, since a full display width of black
|
||
reads as the panel being switched off at the start of every
|
||
cycle.
|
||
|
||
Returns:
|
||
PIL Image containing all content arranged horizontally
|
||
"""
|
||
if lead_gap is None:
|
||
lead_gap = self.display_width
|
||
lead_gap = max(0, int(lead_gap))
|
||
if not content_items:
|
||
# Create empty image if no content
|
||
# Still set total_scroll_width to 0 to indicate no scrollable content
|
||
self.total_scroll_width = 0
|
||
self.cached_image = Image.new('RGB', (self.display_width, self.display_height), (0, 0, 0))
|
||
self.cached_array = np.array(self.cached_image)
|
||
self.scroll_position = 0.0
|
||
self.total_distance_scrolled = 0.0
|
||
self.scroll_complete = False
|
||
return self.cached_image
|
||
|
||
# Calculate total width needed
|
||
# Sum of all item widths
|
||
total_width = sum(img.width for img in content_items)
|
||
# Add item gaps between items (not after last item)
|
||
total_width += item_gap * (len(content_items) - 1)
|
||
# Add element_gap after each item (matches positioning logic)
|
||
total_width += element_gap * len(content_items)
|
||
|
||
# Add initial gap before first item
|
||
total_width += lead_gap
|
||
|
||
# Create the full scrolling image
|
||
full_image = Image.new('RGB', (total_width, self.display_height), (0, 0, 0))
|
||
|
||
# Position items
|
||
current_x = lead_gap # Start with initial gap
|
||
|
||
for i, img in enumerate(content_items):
|
||
# Paste the item image
|
||
full_image.paste(img, (current_x, 0))
|
||
current_x += img.width + element_gap
|
||
|
||
# Add gap between items (except after last item)
|
||
if i < len(content_items) - 1:
|
||
current_x += item_gap
|
||
|
||
# Store the image and update scroll width
|
||
self.cached_image = full_image
|
||
# Convert to numpy array for fast operations
|
||
self.cached_array = np.array(full_image)
|
||
|
||
# Use actual image width instead of calculated width to ensure accuracy
|
||
# This fixes cases where width calculation doesn't match actual positioning
|
||
actual_image_width = full_image.width
|
||
self.total_scroll_width = actual_image_width
|
||
|
||
# Log if there's a mismatch (indicating a bug in width calculation)
|
||
if actual_image_width != total_width:
|
||
self.logger.warning(
|
||
"Width calculation mismatch: calculated=%dpx, actual=%dpx (diff=%dpx). "
|
||
"Using actual width for scroll calculations.",
|
||
total_width, actual_image_width, abs(actual_image_width - total_width)
|
||
)
|
||
|
||
self.scroll_position = 0.0
|
||
self.total_distance_scrolled = 0.0
|
||
self.scroll_complete = False
|
||
|
||
# Pre-allocate frame buffer if needed
|
||
if self._frame_buffer is None or self._frame_buffer.shape != (self.display_height, self.display_width, 3):
|
||
self._frame_buffer = np.zeros((self.display_height, self.display_width, 3), dtype=np.uint8)
|
||
|
||
# Calculate dynamic duration
|
||
self._calculate_dynamic_duration()
|
||
now = time.time()
|
||
self.scroll_start_time = now
|
||
self.last_progress_log_time = now
|
||
self.logger.info(
|
||
"Dynamic duration target set to %ds (min=%ds, max=%ds, buffer=%.2f)",
|
||
self.calculated_duration,
|
||
self.min_duration,
|
||
self.max_duration,
|
||
self.duration_buffer,
|
||
)
|
||
|
||
self.logger.info(
|
||
"Created scrolling image: %dx%dpx (total_scroll_width=%dpx, %d items, item_gap=%d, element_gap=%d)",
|
||
actual_image_width, self.display_height, self.total_scroll_width,
|
||
len(content_items), item_gap, element_gap
|
||
)
|
||
return full_image
|
||
|
||
def update_scroll_position(self) -> None:
|
||
"""
|
||
Advance the scroll by one presented frame and handle wrap-around.
|
||
|
||
With a fixed per-frame step (set_pixels_per_frame, which
|
||
scroll_config.configure sets for a crisp speed) every call moves
|
||
exactly that many pixels and no clock is read; the caller's
|
||
vsync-blocking swap, held for ``frame_hold`` refreshes, sets the rate.
|
||
Otherwise the position advances by elapsed time at the configured
|
||
speed.
|
||
"""
|
||
if not self.cached_image:
|
||
return
|
||
|
||
# Calculate frame time for consistent scroll speed regardless of FPS
|
||
current_time = time.time()
|
||
if self.last_update_time is None:
|
||
self.last_update_time = current_time
|
||
|
||
delta_time = current_time - self.last_update_time
|
||
self.last_update_time = current_time
|
||
|
||
if self.scroll_start_time is None:
|
||
self.scroll_start_time = current_time
|
||
self.last_progress_log_time = current_time
|
||
|
||
# Update scroll position
|
||
if self.fixed_pixels_per_frame:
|
||
# One presented frame, one fixed whole-pixel step. No clock is
|
||
# consulted, so no jitter reaches the position and every frame
|
||
# moves the eye by the same amount. See set_pixels_per_frame.
|
||
pixels_to_move = self.fixed_pixels_per_frame
|
||
self.last_step_time = current_time
|
||
elif self.frame_based_scrolling:
|
||
# Frame-based: move fixed amount when scroll_delay has passed
|
||
# This matches stock ticker behavior: move pixels, then wait scroll_delay
|
||
# Initialize last_step_time on first call to prevent huge initial jump
|
||
if self.last_step_time == 0.0:
|
||
self.last_step_time = current_time
|
||
|
||
# Frame-based mode advances by elapsed time, exactly like the
|
||
# time-based branch below, at the same configured speed
|
||
# (scroll_speed px per scroll_delay seconds).
|
||
#
|
||
# It used to step discretely: 0, 1 or 2 whole pixels depending on
|
||
# whether a wall clock had passed scroll_delay. Plugins set
|
||
# scroll_delay to the target frame period, so that comparison sits
|
||
# exactly on its own threshold and the decision flips on sub-
|
||
# millisecond jitter -- a frame a hair early moved nothing and
|
||
# rendered an identical frame, a frame a hair late moved two
|
||
# pixels. Rounding the step count fixed the stalls but still
|
||
# discarded the remainder, so the error never corrected.
|
||
#
|
||
# Accumulating elapsed time keeps position exactly proportional to
|
||
# real time: jitter shifts a pixel boundary by a fraction of a
|
||
# frame instead of flipping a whole step, and nothing is lost or
|
||
# gained. This is what the one visibly smooth scroller on the
|
||
# hardware (the stock ticker) was already doing by virtue of never
|
||
# enabling frame-based mode.
|
||
if self.scroll_delay > 0:
|
||
pixels_per_second = self.scroll_speed / self.scroll_delay
|
||
else:
|
||
pixels_per_second = self.scroll_speed * 100.0
|
||
pixels_to_move = pixels_per_second * delta_time
|
||
self.last_step_time = current_time
|
||
else:
|
||
# Time-based: move based on time delta (correct speed over time)
|
||
# scroll_speed is pixels per second
|
||
pixels_to_move = self.scroll_speed * delta_time
|
||
|
||
self.scroll_position += pixels_to_move
|
||
self.total_distance_scrolled += pixels_to_move
|
||
|
||
# Calculate required total distance: total_scroll_width only.
|
||
# The image already includes display_width pixels of blank padding at the start
|
||
# (added by create_scrolling_image), so once scroll_position reaches
|
||
# total_scroll_width the last card has fully scrolled off the left edge.
|
||
# Adding display_width here would cause 1-2 extra wrap-arounds on wide chains.
|
||
required_total_distance = self.total_scroll_width
|
||
|
||
# Guard: zero-width content has nothing to scroll — keep position at 0 and skip
|
||
# completion/wrap logic to avoid producing an invalid -1 position.
|
||
if required_total_distance == 0:
|
||
self.scroll_position = 0
|
||
return
|
||
|
||
# Check completion FIRST (before wrap-around) to prevent visual loop
|
||
# When dynamic duration is enabled and cycle is complete, stop at end instead of wrapping
|
||
is_complete = self.total_distance_scrolled >= required_total_distance
|
||
|
||
if is_complete:
|
||
# Only log completion once to avoid spam
|
||
if not self.scroll_complete:
|
||
elapsed = current_time - (self.scroll_start_time or current_time)
|
||
scroll_percent = (self.total_distance_scrolled / required_total_distance * 100) if required_total_distance > 0 else 0.0
|
||
position_percent = (self.scroll_position / self.total_scroll_width * 100) if self.total_scroll_width > 0 else 0.0
|
||
self.logger.info(
|
||
"Scroll cycle COMPLETE: scrolled %.0f/%d px (%.1f%%, position=%.0f/%.0f px, %.1f%%) - elapsed %.2fs, target %.2fs",
|
||
self.total_distance_scrolled,
|
||
required_total_distance,
|
||
scroll_percent,
|
||
self.scroll_position,
|
||
self.total_scroll_width,
|
||
position_percent,
|
||
elapsed,
|
||
self.calculated_duration,
|
||
)
|
||
self.scroll_complete = True
|
||
|
||
# Clamp position to prevent wrap when complete
|
||
if self.scroll_position >= self.total_scroll_width:
|
||
self.scroll_position = self.total_scroll_width - 1
|
||
self.logger.debug("Clamped scroll position to %d (max=%d)", self.scroll_position, self.total_scroll_width - 1)
|
||
else:
|
||
self.scroll_complete = False
|
||
|
||
# Only wrap-around if cycle is not complete yet
|
||
if self.scroll_position >= self.total_scroll_width:
|
||
elapsed = current_time - self.scroll_start_time
|
||
self.scroll_position = self.scroll_position - self.total_scroll_width
|
||
self.logger.info(
|
||
"Scroll wrap-around detected: position reset, total_distance=%.0f/%d px (elapsed %.2fs, target %.2fs)",
|
||
self.total_distance_scrolled,
|
||
required_total_distance,
|
||
elapsed,
|
||
self.calculated_duration,
|
||
)
|
||
|
||
if (
|
||
self.dynamic_duration_enabled
|
||
and self.last_progress_log_time is not None
|
||
and current_time - self.last_progress_log_time >= self.progress_log_interval
|
||
):
|
||
elapsed_time = current_time - (self.scroll_start_time or current_time)
|
||
# The image already includes display_width padding, so we only need total_scroll_width
|
||
required_total_distance = self.total_scroll_width
|
||
# Progress telemetry, emitted every few seconds for the whole of
|
||
# every scroll. It says how far along a marquee is, which is what
|
||
# you turn debug on to watch and not something an operator needs
|
||
# in the journal on a device that scrolls all day.
|
||
self.logger.debug(
|
||
"Scroll progress: elapsed=%.2fs, target=%.2fs, total_scrolled=%.0f/%d px (%.1f%%)",
|
||
elapsed_time,
|
||
self.calculated_duration,
|
||
self.total_distance_scrolled,
|
||
required_total_distance,
|
||
(self.total_distance_scrolled / required_total_distance * 100) if required_total_distance > 0 else 0.0,
|
||
)
|
||
self.last_progress_log_time = current_time
|
||
|
||
def get_visible_portion(self) -> Optional[Image.Image]:
|
||
"""
|
||
Get the currently visible portion of the scrolling image using fast numpy operations.
|
||
Uses integer pixel positioning for high-performance scrolling.
|
||
|
||
Returns:
|
||
PIL Image showing the visible portion, or None if no cached image
|
||
"""
|
||
if not self.cached_image or self.cached_array is None:
|
||
return None
|
||
|
||
start_x_int = int(self.scroll_position)
|
||
end_x_int = start_x_int + self.display_width
|
||
|
||
# Integer positioning quantises motion to whole pixels, so the number of
|
||
# distinct frames per second equals the scroll speed in px/s, no matter
|
||
# how fast the loop renders. At 50px/s and 78fps that made 36% of frames
|
||
# identical: the extra frames cost work and bought nothing. Blending
|
||
# between the two neighbouring positions gives motion at the frame rate
|
||
# instead of the step rate.
|
||
if self.sub_pixel_scrolling:
|
||
fractional = self.scroll_position - start_x_int
|
||
if fractional > 0.0:
|
||
return self._blend_visible_portion(start_x_int, fractional)
|
||
|
||
return self._get_visible_portion_integer(start_x_int, end_x_int)
|
||
|
||
def _blend_visible_portion(self, start_x: int, fractional: float) -> Image.Image:
|
||
"""
|
||
Linear blend between the frames at ``start_x`` and ``start_x + 1``.
|
||
|
||
Implemented with numpy rather than scipy.ndimage.shift: scipy is not
|
||
installed on the target devices, and the old scipy-based sub-pixel path
|
||
was dead code -- get_visible_portion never consulted the flag. The scipy
|
||
import was removed with it; installing scipy has no effect.
|
||
|
||
Args:
|
||
start_x: Left column of the earlier of the two frames
|
||
fractional: How far between the two, in [0, 1)
|
||
|
||
Returns:
|
||
The blended frame
|
||
"""
|
||
width = self.display_width
|
||
strip_width = self.cached_array.shape[1]
|
||
|
||
if start_x + width + 1 <= strip_width:
|
||
# Slice the backing array directly. Going via
|
||
# _get_visible_portion_integer would build two PIL images only for
|
||
# them to be converted straight back to arrays, which measured 15x
|
||
# the cost of the integer path.
|
||
near = self.cached_array[:, start_x:start_x + width]
|
||
far = self.cached_array[:, start_x + 1:start_x + 1 + width]
|
||
else:
|
||
# Close enough to the end that one of the slices wraps; let the
|
||
# integer path handle that and pay the conversion. Continuous mode
|
||
# extends the strip before reaching here, so this is the rare case.
|
||
near = np.asarray(
|
||
self._get_visible_portion_integer(start_x, start_x + width))
|
||
far = np.asarray(
|
||
self._get_visible_portion_integer(start_x + 1, start_x + 1 + width))
|
||
|
||
# Fixed-point rather than float32: integer multiply-add on uint16 is
|
||
# markedly faster than float maths on the Pi's ARM cores, and 8 bits of
|
||
# weight is finer than the panel can show.
|
||
weight = int(fractional * 256.0)
|
||
blended = (
|
||
(near.astype(np.uint16) * (256 - weight)
|
||
+ far.astype(np.uint16) * weight) >> 8
|
||
).astype(np.uint8)
|
||
|
||
return Image.frombytes(
|
||
'RGB', (width, self.display_height),
|
||
np.ascontiguousarray(blended).tobytes()
|
||
)
|
||
|
||
def _get_visible_portion_integer(self, start_x: int, end_x: int) -> Image.Image:
|
||
"""Fast integer pixel extraction (no interpolation).
|
||
|
||
Uses Image.frombytes instead of Image.fromarray: frombytes skips
|
||
numpy's array-protocol overhead and is ~50% faster for the display-sized
|
||
slices (128×32 = 12 KB) used here.
|
||
"""
|
||
_size = (self.display_width, self.display_height)
|
||
img_w = self.cached_image.width
|
||
|
||
if end_x <= img_w:
|
||
# Normal case: single contiguous slice (fastest path)
|
||
frame_array = np.ascontiguousarray(self.cached_array[:, start_x:end_x])
|
||
return Image.frombytes('RGB', _size, frame_array.tobytes())
|
||
else:
|
||
# Ensure frame buffer is allocated for all non-simple paths
|
||
if self._frame_buffer is None or self._frame_buffer.shape != (self.display_height, self.display_width, 3):
|
||
self._frame_buffer = np.zeros((self.display_height, self.display_width, 3), dtype=np.uint8)
|
||
|
||
width1 = img_w - start_x
|
||
if width1 > 0:
|
||
# Wrap-around: tail of image + head of image
|
||
self._frame_buffer[:, :width1] = self.cached_array[:, start_x:]
|
||
remaining_width = self.display_width - width1
|
||
self._frame_buffer[:, width1:] = self.cached_array[:, :remaining_width]
|
||
else:
|
||
# Edge case: start_x at or past image end — show from beginning,
|
||
# clamped to available width (scroll_position should wrap before
|
||
# reaching this state in normal operation).
|
||
available = min(self.display_width, img_w)
|
||
self._frame_buffer[:, :available] = self.cached_array[:, :available]
|
||
if available < self.display_width:
|
||
self._frame_buffer[:, available:] = 0
|
||
|
||
return Image.frombytes('RGB', _size, self._frame_buffer.tobytes())
|
||
|
||
def calculate_dynamic_duration(self) -> int:
|
||
"""
|
||
Calculate display duration based on content width and scroll settings.
|
||
|
||
Returns:
|
||
Duration in seconds
|
||
"""
|
||
if not self.dynamic_duration_enabled:
|
||
return self.min_duration
|
||
|
||
# Validate total_scroll_width is set and valid
|
||
if not self.total_scroll_width or self.total_scroll_width <= 0:
|
||
if self.total_scroll_width == 0:
|
||
self.logger.warning(
|
||
"Dynamic duration calculation skipped: total_scroll_width is 0. "
|
||
"Ensure create_scrolling_image() or set_scrolling_image() has been called. "
|
||
"Using minimum duration: %ds",
|
||
self.min_duration
|
||
)
|
||
else:
|
||
self.logger.warning(
|
||
"Dynamic duration calculation skipped: total_scroll_width is invalid (%s). "
|
||
"Using minimum duration: %ds",
|
||
self.total_scroll_width,
|
||
self.min_duration
|
||
)
|
||
return self.min_duration
|
||
|
||
try:
|
||
# Calculate total scroll distance needed
|
||
# The image already includes display_width padding at the start, so we need
|
||
# to scroll total_scroll_width pixels to show all content, plus display_width
|
||
# more pixels to ensure the last content scrolls completely off the screen
|
||
total_scroll_distance = self.total_scroll_width + self.display_width
|
||
|
||
# Calculate effective pixels per second based on scrolling mode
|
||
if self.frame_based_scrolling:
|
||
# Frame-based mode: scroll_speed is pixels per frame, scroll_delay is seconds per frame
|
||
# Effective pixels per second = pixels per frame / seconds per frame
|
||
if self.scroll_delay > 0:
|
||
pixels_per_second = self.scroll_speed / self.scroll_delay
|
||
else:
|
||
# Fallback if scroll_delay is invalid
|
||
pixels_per_second = self.scroll_speed * 50 # Assume 50 FPS default
|
||
self.logger.warning("Invalid scroll_delay (%s), using fallback calculation", self.scroll_delay)
|
||
scroll_mode_str = "frame-based"
|
||
else:
|
||
# Time-based mode: scroll_speed is already pixels per second
|
||
pixels_per_second = self.scroll_speed
|
||
scroll_mode_str = "time-based"
|
||
|
||
# Calculate time based on effective pixels per second
|
||
total_time = total_scroll_distance / pixels_per_second
|
||
|
||
# Add buffer time for smooth cycling
|
||
buffer_time = total_time * self.duration_buffer
|
||
calculated_duration = int(total_time + buffer_time)
|
||
|
||
# Apply min/max limits
|
||
if calculated_duration < self.min_duration:
|
||
self.calculated_duration = self.min_duration
|
||
elif calculated_duration > self.max_duration:
|
||
self.calculated_duration = self.max_duration
|
||
else:
|
||
self.calculated_duration = calculated_duration
|
||
|
||
self.logger.debug("Dynamic duration calculation (%s mode):", scroll_mode_str)
|
||
self.logger.debug(" Display width: %dpx", self.display_width)
|
||
self.logger.debug(" Content width: %dpx", self.total_scroll_width)
|
||
self.logger.debug(" Total scroll distance: %dpx", total_scroll_distance)
|
||
if self.frame_based_scrolling:
|
||
self.logger.debug(" Scroll speed: %.2f px/frame, delay: %.3fs", self.scroll_speed, self.scroll_delay)
|
||
self.logger.debug(" Effective speed: %.1f px/second", pixels_per_second)
|
||
else:
|
||
self.logger.debug(" Scroll speed: %.1f px/second", pixels_per_second)
|
||
self.logger.debug(" Base time: %.2fs", total_time)
|
||
self.logger.debug(" Buffer time: %.2fs", buffer_time)
|
||
self.logger.debug(" Final duration: %ds", self.calculated_duration)
|
||
|
||
return self.calculated_duration
|
||
|
||
except (ValueError, ZeroDivisionError, TypeError) as e:
|
||
self.logger.error("Error calculating dynamic duration: %s", e)
|
||
return self.min_duration
|
||
|
||
def is_scroll_complete(self) -> bool:
|
||
"""
|
||
Check if the current scroll cycle is complete.
|
||
|
||
Returns:
|
||
True if scroll has wrapped around to the beginning
|
||
"""
|
||
return self.scroll_complete
|
||
|
||
def append_content(self, content_items: list,
|
||
item_gap: int = 32,
|
||
element_gap: int = 0) -> bool:
|
||
"""
|
||
Append items to the right of the existing strip, preserving scroll state.
|
||
|
||
Lets a caller keep one continuous strip instead of replacing it. Vegas
|
||
mode uses this so the next group of plugins scrolls in from the right
|
||
rather than the strip being swapped out underneath the viewer — a swap
|
||
shows as a flash and a hard cut to already-full-screen content.
|
||
|
||
``scroll_position`` and ``total_distance_scrolled`` are untouched, so
|
||
motion continues uninterrupted; only the strip gets longer. Because
|
||
completion is measured against ``total_scroll_width``, extending the
|
||
strip also defers completion, which is the intent.
|
||
|
||
Args:
|
||
content_items: Images to append, in order
|
||
item_gap: Gap between appended items, and between the existing
|
||
content and the first appended item
|
||
element_gap: Extra gap after each item, mirroring
|
||
create_scrolling_image
|
||
|
||
Returns:
|
||
True if content was appended
|
||
"""
|
||
if not content_items:
|
||
return False
|
||
|
||
if self.cached_image is None or self.cached_array is None:
|
||
# Nothing to extend yet — this is just the first build.
|
||
self.create_scrolling_image(
|
||
content_items, item_gap=item_gap, element_gap=element_gap, lead_gap=0)
|
||
return True
|
||
|
||
gap = max(0, item_gap)
|
||
addition_width = (
|
||
sum(img.width for img in content_items)
|
||
+ gap * len(content_items) # one leading gap per item
|
||
+ element_gap * len(content_items)
|
||
)
|
||
|
||
addition = Image.new('RGB', (addition_width, self.display_height), (0, 0, 0))
|
||
x = 0
|
||
for img in content_items:
|
||
x += gap # separate from whatever precedes
|
||
addition.paste(img, (x, 0))
|
||
x += img.width + element_gap
|
||
|
||
# numpy concatenate then one conversion back, rather than allocating a
|
||
# full-width PIL image and pasting twice: the strip can be tens of
|
||
# thousands of columns wide and this runs on the render path.
|
||
self.cached_array = np.concatenate(
|
||
(self.cached_array, np.array(addition)), axis=1)
|
||
self.cached_image = Image.fromarray(self.cached_array)
|
||
self.total_scroll_width = self.cached_image.width
|
||
self.scroll_complete = False
|
||
|
||
self.logger.info(
|
||
"Appended %d item(s) (%dpx) to scroll strip: now %dpx, position %.0f",
|
||
len(content_items), addition_width, self.total_scroll_width,
|
||
self.scroll_position
|
||
)
|
||
return True
|
||
|
||
def drop_scrolled_prefix(self, keep_before: int = 0) -> int:
|
||
"""
|
||
Discard columns that have already scrolled past, to bound memory.
|
||
|
||
A continuously extended strip would otherwise grow without limit. All
|
||
the positional state is shifted by the amount removed so the visible
|
||
frame and the completion arithmetic are unchanged:
|
||
``total_distance_scrolled`` and ``total_scroll_width`` both shrink by the
|
||
same amount, preserving their difference.
|
||
|
||
Args:
|
||
keep_before: Columns to retain behind the current position, as a
|
||
safety margin against a caller reading slightly behind it
|
||
|
||
Returns:
|
||
Number of columns actually removed
|
||
"""
|
||
if self.cached_image is None or self.cached_array is None:
|
||
return 0
|
||
|
||
# While the viewport wraps, get_visible_portion fills its right-hand side
|
||
# from the *head* of the strip, so trimming the head would change what
|
||
# is on screen. Continuous mode extends before ever reaching that state;
|
||
# refusing here keeps "trimming is invisible" true unconditionally.
|
||
if self.scroll_position + self.display_width > self.cached_image.width:
|
||
return 0
|
||
|
||
cut = int(self.scroll_position) - max(0, keep_before)
|
||
if cut <= 0:
|
||
return 0
|
||
# Never trim so far that the remaining strip is narrower than the
|
||
# viewport, or get_visible_portion has nothing to slice.
|
||
cut = min(cut, max(0, self.cached_image.width - self.display_width))
|
||
if cut <= 0:
|
||
return 0
|
||
|
||
# .copy() so the original buffer is released rather than kept alive by
|
||
# a numpy view.
|
||
self.cached_array = self.cached_array[:, cut:].copy()
|
||
self.cached_image = Image.fromarray(self.cached_array)
|
||
self.total_scroll_width = self.cached_image.width
|
||
self.scroll_position -= cut
|
||
self.total_distance_scrolled = max(0.0, self.total_distance_scrolled - cut)
|
||
|
||
self.logger.debug(
|
||
"Dropped %dpx of scrolled strip: now %dpx, position %.0f",
|
||
cut, self.total_scroll_width, self.scroll_position
|
||
)
|
||
return cut
|
||
|
||
def remaining_unscrolled(self) -> int:
|
||
"""Columns of strip still to the right of the viewport."""
|
||
if self.cached_image is None:
|
||
return 0
|
||
return max(0, self.total_scroll_width - int(self.scroll_position)
|
||
- self.display_width)
|
||
|
||
def reset_scroll(self) -> None:
|
||
"""
|
||
Reset scroll position to beginning.
|
||
"""
|
||
self.scroll_position = 0.0
|
||
self.total_distance_scrolled = 0.0
|
||
self.scroll_complete = False
|
||
now = time.time()
|
||
self.scroll_start_time = now
|
||
self.last_progress_log_time = now
|
||
self.last_step_time = now # Reset step timer
|
||
# Reset last_update_time to prevent large delta_time on next update
|
||
# This ensures smooth scrolling after reset without jumping ahead
|
||
self.last_update_time = now
|
||
# Same reasoning for the frame-rate clock: the first frame after a
|
||
# reset has no predecessor in this scroll, and timing it against the
|
||
# last frame of the previous one measures the idle gap between them.
|
||
self.last_frame_time = None
|
||
self.logger.debug("Scroll position reset")
|
||
|
||
def reset(self) -> None:
|
||
"""Alias for reset_scroll() for convenience."""
|
||
self.reset_scroll()
|
||
|
||
def set_scrolling_image(self, image: Image.Image) -> None:
|
||
"""
|
||
Set a pre-rendered scrolling image and initialize all required state.
|
||
|
||
This method should be used when plugins create their own scrolling image
|
||
instead of using create_scrolling_image(). It properly initializes both
|
||
cached_image and cached_array, and updates all related state.
|
||
|
||
Args:
|
||
image: PIL Image containing the scrolling content
|
||
"""
|
||
if image is None:
|
||
self.logger.warning("Attempted to set None as scrolling image, clearing cache instead")
|
||
self.clear_cache()
|
||
return
|
||
|
||
# Set the cached image
|
||
self.cached_image = image
|
||
|
||
# Convert to numpy array for fast operations (required for get_visible_portion)
|
||
self.cached_array = np.array(image)
|
||
|
||
# Update scroll width
|
||
self.total_scroll_width = image.width
|
||
|
||
# Reset scroll position
|
||
self.scroll_position = 0.0
|
||
self.total_distance_scrolled = 0.0
|
||
self.scroll_complete = False
|
||
|
||
# Pre-allocate frame buffer if needed
|
||
if self._frame_buffer is None or self._frame_buffer.shape != (self.display_height, self.display_width, 3):
|
||
self._frame_buffer = np.zeros((self.display_height, self.display_width, 3), dtype=np.uint8)
|
||
|
||
# Calculate dynamic duration
|
||
self._calculate_dynamic_duration()
|
||
|
||
# Reset timing
|
||
now = time.time()
|
||
self.scroll_start_time = now
|
||
self.last_progress_log_time = now
|
||
self.last_step_time = now # Initialize step timer for frame-based scrolling
|
||
|
||
self.logger.debug("Set scrolling image: %dx%d, total_scroll_width=%d",
|
||
image.width, image.height, self.total_scroll_width)
|
||
|
||
def set_scroll_speed(self, speed: float) -> None:
|
||
"""
|
||
Set the scroll speed, and leave fixed-step mode.
|
||
|
||
In time-based mode: pixels per second (clamped to 1-500).
|
||
In frame-based mode: pixels per ``scroll_delay`` seconds (clamped to
|
||
0.1-5), still applied by elapsed time as scroll_speed / scroll_delay
|
||
px/s.
|
||
|
||
Args:
|
||
speed: Scroll speed (interpretation depends on frame_based_scrolling mode)
|
||
"""
|
||
# A speed set directly is a request to pace off that speed, so drop any
|
||
# fixed per-frame step left by an earlier configure(). scroll_config
|
||
# calls this first and set_pixels_per_frame second, so the crisp path
|
||
# is unaffected; what this protects is a legacy caller changing speed
|
||
# on a helper that scroll_config had already put in fixed-step mode,
|
||
# where the new speed would otherwise be silently ignored.
|
||
self.fixed_pixels_per_frame = None
|
||
if self.frame_based_scrolling:
|
||
# In frame-based mode, clamp to reasonable pixels per frame (0.1-5)
|
||
# Higher values cause visible jumps - 1-2 pixels/frame is ideal for smoothness
|
||
self.scroll_speed = max(0.1, min(5.0, speed))
|
||
self.logger.debug(f"Scroll speed set to: {self.scroll_speed} pixels/frame (frame-based mode)")
|
||
else:
|
||
# In time-based mode, clamp to pixels per second (1-500)
|
||
self.scroll_speed = max(1.0, min(500.0, speed))
|
||
self.logger.debug(f"Scroll speed set to: {self.scroll_speed} pixels/second (time-based mode)")
|
||
|
||
def set_scroll_delay(self, delay: float) -> None:
|
||
"""
|
||
Set the delay between scroll frames.
|
||
|
||
Args:
|
||
delay: Delay in seconds (typically 0.001-0.1)
|
||
"""
|
||
self.scroll_delay = max(0.001, min(1.0, delay))
|
||
self.logger.debug(f"Scroll delay set to: {self.scroll_delay}")
|
||
|
||
def set_pixels_per_frame(self, pixels) -> None:
|
||
"""Advance exactly `pixels` per presented frame, ignoring the clock.
|
||
|
||
Pass None to go back to pacing off elapsed time.
|
||
|
||
Smooth motion is not a frame-rate property. The strip has to advance
|
||
the same number of WHOLE pixels every frame, and deriving that from a
|
||
wall clock cannot deliver it: the position accumulates
|
||
``speed * delta_time`` and is then truncated to a pixel, so any jitter
|
||
in delta_time lands either side of an integer boundary. Measured on
|
||
hardware at a rock-steady 100.0 fps, individual frames still ranged
|
||
5.6ms to 15.2ms -- 0.57px to 1.44px of movement -- and 53% of frames
|
||
advanced by something other than one pixel: about half moved nothing
|
||
at all and then jumped two. That is the micro-stutter, and it survived
|
||
every frame-timing fix because frame timing was never the problem.
|
||
|
||
It is worst precisely at a crisp speed. At 100 px/s on a 100Hz panel
|
||
the accumulator sits exactly on integer boundaries, so sub-millisecond
|
||
jitter flips it either way and the motion beats at around 50Hz.
|
||
|
||
Stepping per frame is only correct because SwapOnVSync blocks until
|
||
the panel has taken the frame, which makes the frame count a truer
|
||
clock than time.time(). Before the swap was locked to vsync this would
|
||
have run at whatever speed the loop happened to spin at.
|
||
"""
|
||
self.fixed_pixels_per_frame = int(pixels) if pixels else None
|
||
self.logger.debug("Fixed step set to: %s px/frame",
|
||
self.fixed_pixels_per_frame)
|
||
|
||
def set_target_fps(self, fps: float) -> None:
|
||
"""
|
||
Record the presentation rate, for diagnostics only.
|
||
|
||
Nothing paces off this value: with a fixed per-frame step the helper
|
||
advances once per call, and without one it advances by elapsed time.
|
||
The rate frames are shown at is the panel refresh divided by the frame
|
||
hold passed to ``display_manager.set_scrolling_state``. scroll_config
|
||
sets it to that rate so it can be read back.
|
||
|
||
Args:
|
||
fps: Frames per second (clamped to 30-200)
|
||
"""
|
||
self.target_fps = max(30.0, min(200.0, fps))
|
||
self.logger.debug("Target FPS recorded: %s FPS (informational)", self.target_fps)
|
||
|
||
def set_sub_pixel_scrolling(self, enabled: bool) -> None:
|
||
"""
|
||
Enable or disable sub-pixel scrolling for smoother movement.
|
||
|
||
When enabled, uses interpolation to blend between pixels for fractional
|
||
scroll positions, resulting in smooth scrolling even at slow speeds.
|
||
When disabled, uses integer pixel positioning (faster but may skip pixels).
|
||
|
||
Args:
|
||
enabled: True to enable sub-pixel scrolling (default: False)
|
||
"""
|
||
self.sub_pixel_scrolling = enabled
|
||
self.logger.debug(f"Sub-pixel scrolling {'enabled' if enabled else 'disabled'}")
|
||
|
||
def set_frame_based_scrolling(self, enabled: bool) -> None:
|
||
"""
|
||
Enable or disable frame-based scrolling.
|
||
|
||
This does not step. When enabled, ``scroll_speed`` is read as pixels
|
||
per ``scroll_delay`` seconds (set_scroll_speed clamps it to 0.1-5), and
|
||
update_scroll_position() still advances by elapsed time at
|
||
``scroll_speed / scroll_delay`` px/s. A fixed per-frame step set by
|
||
set_pixels_per_frame() takes precedence over both modes.
|
||
|
||
Args:
|
||
enabled: True to enable frame-based scrolling (default: False)
|
||
"""
|
||
self.frame_based_scrolling = enabled
|
||
self.last_step_time = time.time() # Reset step timer
|
||
self.logger.debug(f"Frame-based scrolling {'enabled' if enabled else 'disabled'}")
|
||
|
||
def set_dynamic_duration_settings(self, enabled: bool = True,
|
||
min_duration: int = 30,
|
||
max_duration: int = 300,
|
||
buffer: float = 0.1) -> None:
|
||
"""
|
||
Configure dynamic duration calculation.
|
||
|
||
Args:
|
||
enabled: Enable dynamic duration calculation
|
||
min_duration: Minimum duration in seconds
|
||
max_duration: Maximum duration in seconds
|
||
buffer: Buffer percentage (0.0-1.0)
|
||
"""
|
||
self.dynamic_duration_enabled = enabled
|
||
self.min_duration = max(10, min_duration)
|
||
self.max_duration = max(self.min_duration, max_duration)
|
||
self.duration_buffer = max(0.0, min(1.0, buffer))
|
||
|
||
self.logger.debug(f"Dynamic duration settings: enabled={enabled}, "
|
||
f"min={self.min_duration}s, max={self.max_duration}s, "
|
||
f"buffer={self.duration_buffer*100}%")
|
||
|
||
def get_dynamic_duration(self) -> int:
|
||
"""
|
||
Get the calculated dynamic duration.
|
||
|
||
Returns:
|
||
Duration in seconds
|
||
"""
|
||
return self.calculated_duration
|
||
|
||
def _calculate_dynamic_duration(self) -> None:
|
||
"""Internal method to calculate dynamic duration."""
|
||
self.calculated_duration = self.calculate_dynamic_duration()
|
||
|
||
def log_frame_rate(self) -> None:
|
||
"""
|
||
Log frame rate statistics for performance monitoring.
|
||
"""
|
||
current_time = time.time()
|
||
|
||
# The first frame of a scroll has no predecessor, so it has no frame
|
||
# time. Measuring one anyway records the whole idle gap since the last
|
||
# scroll as a single frame: on hardware that produced windows reading
|
||
# "0.0 fps over 1 frames | median 136776.02ms", and -- worse, because
|
||
# it is not obviously wrong -- put that gap in the max field of
|
||
# otherwise healthy windows and counted it as one stall per scroll.
|
||
# At ~500 frames to a window that is ~0.2%, which is the same order as
|
||
# the real stall rates being measured, so the number could not be
|
||
# trusted at all. Seed the clock and take no sample.
|
||
if self.last_frame_time is None:
|
||
self._restart_stats_window(current_time)
|
||
return
|
||
|
||
# Calculate instantaneous frame time
|
||
frame_time = current_time - self.last_frame_time
|
||
|
||
# A caller that scrolls without ever calling reset_scroll() never arms
|
||
# the sentinel above, so catch the same gap by its size. Nothing that
|
||
# renders a scroll produces a frame longer than the log interval; a
|
||
# sample that large is an idle period, not a frame. It starts a new
|
||
# scroll exactly as the sentinel does, window timer included.
|
||
if frame_time >= FPS_LOG_INTERVAL:
|
||
self._restart_stats_window(current_time)
|
||
return
|
||
|
||
self.frame_times.append(frame_time)
|
||
|
||
# Keep only last 100 frames for average
|
||
if len(self.frame_times) > 100:
|
||
self.frame_times.pop(0)
|
||
|
||
# Every frame since the last log, not just the last 100 and not just
|
||
# the one that happens to land on the 5s boundary. The old line
|
||
# reported a single instantaneous sample -- roughly 1 frame in 500 --
|
||
# which cannot see a stall that hits 1% of frames, and reported it
|
||
# next to an average that hides the same stall by construction (a 2ms
|
||
# duplicate and a 21ms double-wait mean exactly 10ms). Chasing scroll
|
||
# judder needs the tail, so keep the window and report percentiles.
|
||
self._window.append(frame_time)
|
||
|
||
# Log FPS every 5 seconds to avoid spam
|
||
if current_time - self.last_fps_log_time >= FPS_LOG_INTERVAL:
|
||
# An empty window means every sample in this interval was dropped
|
||
# as an idle gap. There is nothing to report, and reporting the
|
||
# gap itself is the bug above.
|
||
if self._window:
|
||
self.logger.info(
|
||
"Scroll frame stats - %s",
|
||
format_frame_stats(self._window),
|
||
)
|
||
self.last_fps_log_time = current_time
|
||
self.frame_count = 0
|
||
self._window = []
|
||
|
||
self.last_frame_time = current_time
|
||
self.frame_count += 1
|
||
|
||
def _restart_stats_window(self, current_time: float) -> None:
|
||
"""Seed the frame clock at the start of a scroll, taking no sample.
|
||
|
||
The window timer restarts with it. Otherwise the 5s boundary is
|
||
already long overdue when the next frame arrives, and the new scroll
|
||
opens by reporting a window of exactly one frame.
|
||
"""
|
||
self.last_frame_time = current_time
|
||
self.last_fps_log_time = current_time
|
||
|
||
def clear_cache(self) -> None:
|
||
"""
|
||
Clear the cached scrolling image.
|
||
"""
|
||
self.cached_image = None
|
||
self.cached_array = None
|
||
self.total_scroll_width = 0
|
||
self.scroll_position = 0.0
|
||
self.total_distance_scrolled = 0.0
|
||
self.scroll_complete = False
|
||
self.scroll_start_time = None
|
||
self.last_progress_log_time = None
|
||
self.logger.debug("Scroll cache cleared")
|
||
|
||
def get_scroll_info(self) -> Dict[str, Any]:
|
||
"""
|
||
Get current scroll state information.
|
||
|
||
Returns:
|
||
Dictionary with scroll state information
|
||
"""
|
||
# The image already includes display_width padding, so we only need total_scroll_width
|
||
required_total_distance = self.total_scroll_width if self.total_scroll_width > 0 else 0
|
||
return {
|
||
'scroll_position': self.scroll_position,
|
||
'total_distance_scrolled': self.total_distance_scrolled,
|
||
'required_total_distance': required_total_distance,
|
||
'scroll_speed': self.scroll_speed,
|
||
'scroll_delay': self.scroll_delay,
|
||
'total_width': self.total_scroll_width,
|
||
'is_scrolling': self.is_scrolling,
|
||
'scroll_complete': self.scroll_complete,
|
||
'dynamic_duration': self.calculated_duration,
|
||
'elapsed_time': (time.time() - self.scroll_start_time)
|
||
if self.scroll_start_time
|
||
else None,
|
||
'cached_image_size': (self.cached_image.width, self.cached_image.height) if self.cached_image else None
|
||
}
|