From b0a404ef2654952688dcc8df91e0c56c73b070df Mon Sep 17 00:00:00 2001 From: ChuckBuilds Date: Tue, 14 Jul 2026 16:40:34 -0400 Subject: [PATCH] fix: remove content accidentally bundled into the dead-code-removal commit The previous commit's git add/commit swept in a lot of unrelated, unreviewed work alongside the intended dead-code deletions: a new Plugin Composer web UI, new security-audit/CI tooling, a new march-madness plugin, and 23 local-development-only symlinks under plugin-repos/ (per scripts/setup_plugin_repos.py's own docstring, these are meant to be generated locally, never committed -- .gitignore has no entry for them, which is how they slipped in). Removed here, split into their own PRs instead (except plugin-repos/* symlinks and march-madness/ncaa_logos, which are dropped rather than carried forward -- see PR discussion): - web_interface/blueprints/composer.py + composer-app.js + composer-canvas.js + composer.html + manager.py.j2 - scripts/prove_security.py, audit_plugins.py, generate_report.py - .github/workflows/security-audit.yml, .github/workflows/tests.yml, bandit.yaml - All plugin-repos/* symlinks (local dev artifacts, not meant to be committed at all) - plugin-repos/march-madness/* and the 4 new assets/sports/ncaa_logos/* PNGs it needed (left out of every split PR pending a decision on whether march-madness belongs in the core repo or the plugin monorepo) This PR now contains only what its title describes: the dead-code removal from the previous commit, untouched. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01KEZK1P1Q1fu5pcuVrkrCFZ --- .github/workflows/security-audit.yml | 277 --- .github/workflows/tests.yml | 46 - assets/sports/ncaa_logos/COLGATE.png | Bin 32300 -> 0 bytes assets/sports/ncaa_logos/LEHIGH.png | Bin 34109 -> 0 bytes assets/sports/ncaa_logos/MICHIGAN.png | Bin 20380 -> 0 bytes assets/sports/ncaa_logos/RUTGERS.png | Bin 16356 -> 0 bytes bandit.yaml | 33 - plugin-repos/7-segment-clock | 1 - plugin-repos/baseball-scoreboard | 1 - plugin-repos/basketball-scoreboard | 1 - plugin-repos/calendar | 1 - plugin-repos/christmas-countdown | 1 - plugin-repos/clock-simple | 1 - plugin-repos/countdown | 1 - plugin-repos/f1-scoreboard | 1 - plugin-repos/football-scoreboard | 1 - plugin-repos/hello-world | 1 - plugin-repos/hockey-scoreboard | 1 - plugin-repos/ledmatrix-flights | 1 - plugin-repos/ledmatrix-leaderboard | 1 - plugin-repos/ledmatrix-music | 1 - plugin-repos/ledmatrix-stocks | 1 - plugin-repos/ledmatrix-weather | 1 - .../assets/logos/CHAMPIONSHIP.png | Bin 476 -> 0 bytes .../march-madness/assets/logos/ELITE_8.png | Bin 459 -> 0 bytes .../march-madness/assets/logos/FINAL_4.png | Bin 545 -> 0 bytes .../assets/logos/MARCH_MADNESS.png | Bin 496 -> 0 bytes .../march-madness/assets/logos/ROUND_32.png | Bin 561 -> 0 bytes .../march-madness/assets/logos/ROUND_64.png | Bin 538 -> 0 bytes .../march-madness/assets/logos/SWEET_16.png | Bin 521 -> 0 bytes plugin-repos/march-madness/config_schema.json | 138 -- plugin-repos/march-madness/manager.py | 910 -------- plugin-repos/march-madness/manifest.json | 37 - plugin-repos/march-madness/requirements.txt | 5 - plugin-repos/mqtt-notifications | 1 - plugin-repos/news | 1 - plugin-repos/odds-ticker | 1 - plugin-repos/of-the-day | 1 - plugin-repos/olympics | 1 - plugin-repos/soccer-scoreboard | 1 - plugin-repos/static-image | 1 - plugin-repos/stock-news | 1 - plugin-repos/text-display | 1 - plugin-repos/ufc-scoreboard | 1 - plugin-repos/youtube-stats | 1 - scripts/audit_plugins.py | 296 --- scripts/generate_report.py | 297 --- scripts/prove_security.py | 504 ----- web_interface/blueprints/composer.py | 837 -------- .../static/v3/js/composer/composer-app.js | 1337 ------------ .../static/v3/js/composer/composer-canvas.js | 757 ------- web_interface/templates/v3/composer.html | 1852 ----------------- .../templates/v3/composer/manager.py.j2 | 298 --- 53 files changed, 7651 deletions(-) delete mode 100644 .github/workflows/security-audit.yml delete mode 100644 .github/workflows/tests.yml delete mode 100644 assets/sports/ncaa_logos/COLGATE.png delete mode 100644 assets/sports/ncaa_logos/LEHIGH.png delete mode 100644 assets/sports/ncaa_logos/MICHIGAN.png delete mode 100644 assets/sports/ncaa_logos/RUTGERS.png delete mode 100644 bandit.yaml delete mode 120000 plugin-repos/7-segment-clock delete mode 120000 plugin-repos/baseball-scoreboard delete mode 120000 plugin-repos/basketball-scoreboard delete mode 120000 plugin-repos/calendar delete mode 120000 plugin-repos/christmas-countdown delete mode 120000 plugin-repos/clock-simple delete mode 120000 plugin-repos/countdown delete mode 120000 plugin-repos/f1-scoreboard delete mode 120000 plugin-repos/football-scoreboard delete mode 120000 plugin-repos/hello-world delete mode 120000 plugin-repos/hockey-scoreboard delete mode 120000 plugin-repos/ledmatrix-flights delete mode 120000 plugin-repos/ledmatrix-leaderboard delete mode 120000 plugin-repos/ledmatrix-music delete mode 120000 plugin-repos/ledmatrix-stocks delete mode 120000 plugin-repos/ledmatrix-weather delete mode 100644 plugin-repos/march-madness/assets/logos/CHAMPIONSHIP.png delete mode 100644 plugin-repos/march-madness/assets/logos/ELITE_8.png delete mode 100644 plugin-repos/march-madness/assets/logos/FINAL_4.png delete mode 100644 plugin-repos/march-madness/assets/logos/MARCH_MADNESS.png delete mode 100644 plugin-repos/march-madness/assets/logos/ROUND_32.png delete mode 100644 plugin-repos/march-madness/assets/logos/ROUND_64.png delete mode 100644 plugin-repos/march-madness/assets/logos/SWEET_16.png delete mode 100644 plugin-repos/march-madness/config_schema.json delete mode 100644 plugin-repos/march-madness/manager.py delete mode 100644 plugin-repos/march-madness/manifest.json delete mode 100644 plugin-repos/march-madness/requirements.txt delete mode 120000 plugin-repos/mqtt-notifications delete mode 120000 plugin-repos/news delete mode 120000 plugin-repos/odds-ticker delete mode 120000 plugin-repos/of-the-day delete mode 120000 plugin-repos/olympics delete mode 120000 plugin-repos/soccer-scoreboard delete mode 120000 plugin-repos/static-image delete mode 120000 plugin-repos/stock-news delete mode 120000 plugin-repos/text-display delete mode 120000 plugin-repos/ufc-scoreboard delete mode 120000 plugin-repos/youtube-stats delete mode 100644 scripts/audit_plugins.py delete mode 100644 scripts/generate_report.py delete mode 100644 scripts/prove_security.py delete mode 100644 web_interface/blueprints/composer.py delete mode 100644 web_interface/static/v3/js/composer/composer-app.js delete mode 100644 web_interface/static/v3/js/composer/composer-canvas.js delete mode 100644 web_interface/templates/v3/composer.html delete mode 100644 web_interface/templates/v3/composer/manager.py.j2 diff --git a/.github/workflows/security-audit.yml b/.github/workflows/security-audit.yml deleted file mode 100644 index e82700c8..00000000 --- a/.github/workflows/security-audit.yml +++ /dev/null @@ -1,277 +0,0 @@ -name: Security Audit - -on: - push: - branches: - - main - - 'feat/**' - pull_request: - branches: - - main - schedule: - # Weekly full scan — catches new CVEs in existing deps - - cron: '0 6 * * 1' - workflow_dispatch: - -permissions: - contents: read - pull-requests: write - security-events: write - -jobs: - - # ───────────────────────────────────────────────────────────────────────── - # SAST — Static Application Security Testing - # ───────────────────────────────────────────────────────────────────────── - sast: - name: Static Analysis (bandit + semgrep) - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: Install SAST tools - run: pip install bandit==1.8.3 semgrep - - # Bandit — Python-specific security linter - # --exit-zero: findings are warnings, not CI blockers. - # The security-report job interprets severity. - - name: Run bandit - run: | - bandit -r src/ web_interface/ \ - -c bandit.yaml \ - -f json \ - -o bandit-results.json \ - --exit-zero - - # Semgrep — broader pattern-based analysis - # || true: prevents network/rate-limit errors from blocking the workflow - - name: Run semgrep - run: | - semgrep --config "p/python" \ - --config "p/flask" \ - --json \ - --output semgrep-results.json \ - src/ web_interface/ \ - || true - - - name: Upload SAST artifacts - uses: actions/upload-artifact@v4 - if: always() - with: - name: sast-results - path: | - bandit-results.json - semgrep-results.json - retention-days: 30 - - - # ───────────────────────────────────────────────────────────────────────── - # Dependency Vulnerability Scanning - # ───────────────────────────────────────────────────────────────────────── - dependency-audit: - name: Dependency Audit (pip-audit + safety) - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: Install audit tools - run: pip install pip-audit safety - - # Install project deps. Hardware-specific packages (rgbmatrix) will fail - # to build on Ubuntu runners — || true handles this gracefully. - # pip-audit operates on installed packages; partial install is acceptable. - - name: Install project dependencies - run: | - pip install -r requirements.txt || true - pip install -r web_interface/requirements.txt || true - pip install -r requirements-emulator.txt || true - - - name: Run pip-audit - run: | - pip-audit --format json --output pip-audit-results.json || true - - - name: Run safety check - run: | - safety check --output json > safety-results.json 2>&1 || true - - - name: Upload dependency audit artifacts - uses: actions/upload-artifact@v4 - if: always() - with: - name: dependency-audit-results - path: | - pip-audit-results.json - safety-results.json - retention-days: 30 - - - # ───────────────────────────────────────────────────────────────────────── - # Secrets Detection - # ───────────────────────────────────────────────────────────────────────── - secrets-scan: - name: Secrets Scan (gitleaks) - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Full history for scanning all commits - - # continue-on-error: config/config_secrets.template.json contains - # placeholder strings (YOUR_*) that may trigger gitleaks rules. - # The generate_report.py script suppresses these false positives. - - name: Run gitleaks - uses: gitleaks/gitleaks-action@v2 - continue-on-error: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Upload secrets scan artifacts - uses: actions/upload-artifact@v4 - if: always() - with: - name: secrets-scan-results - path: results.sarif - retention-days: 30 - - - # ───────────────────────────────────────────────────────────────────────── - # LEDMatrix-Specific Security Proofs - # ───────────────────────────────────────────────────────────────────────── - ledmatrix-security-proofs: - name: LEDMatrix Security Proofs - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: Install dependencies - run: pip install -r requirements.txt || true - - # Script exits 1 only on CRITICAL findings. - # Warnings are reported but do not block the workflow. - - name: Run security proofs - run: | - python scripts/prove_security.py \ - --output security-proofs-results.json \ - --verbose - - - name: Upload proofs artifacts - uses: actions/upload-artifact@v4 - if: always() - with: - name: security-proofs-results - path: security-proofs-results.json - retention-days: 30 - - - # ───────────────────────────────────────────────────────────────────────── - # Plugin Security Audit - # ───────────────────────────────────────────────────────────────────────── - plugin-audit: - name: Plugin Security Audit - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - # Script exits 1 only on CRITICAL findings (eval/exec in plugins). - # Missing manifest.json etc are warnings. - - name: Run plugin audit - run: | - python scripts/audit_plugins.py \ - --output plugin-audit-results.json \ - --verbose - - - name: Upload plugin audit artifacts - uses: actions/upload-artifact@v4 - if: always() - with: - name: plugin-audit-results - path: plugin-audit-results.json - retention-days: 30 - - - # ───────────────────────────────────────────────────────────────────────── - # Aggregate Report - # ───────────────────────────────────────────────────────────────────────── - security-report: - name: Security Report - runs-on: ubuntu-latest - needs: - - sast - - dependency-audit - - secrets-scan - - ledmatrix-security-proofs - - plugin-audit - if: always() # Run even if upstream jobs fail or are skipped - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: Download all artifacts - uses: actions/download-artifact@v4 - with: - path: audit-artifacts/ - - - name: Generate consolidated report - run: | - python scripts/generate_report.py \ - --artifact-dir audit-artifacts/ \ - --output security-report.md \ - --verbose - - - name: Upload consolidated report - uses: actions/upload-artifact@v4 - with: - name: security-report - path: security-report.md - retention-days: 90 - - - name: Comment on PR - if: github.event_name == 'pull_request' - uses: actions/github-script@v7 - with: - script: | - const fs = require('fs'); - const report = fs.readFileSync('security-report.md', 'utf8'); - // Use sticky comment — update existing comment rather than adding a new one each run - const { data: comments } = await github.rest.issues.listComments({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - }); - const botComment = comments.find(c => - c.user.type === 'Bot' && c.body.includes('🔒 Security Audit') - ); - if (botComment) { - await github.rest.issues.updateComment({ - comment_id: botComment.id, - owner: context.repo.owner, - repo: context.repo.repo, - body: report, - }); - } else { - await github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: report, - }); - } diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml deleted file mode 100644 index c59cac7d..00000000 --- a/.github/workflows/tests.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Tests - -on: - push: - branches: [main] - pull_request: - branches: [main] - workflow_dispatch: - -permissions: - contents: read - -jobs: - test: - name: pytest (Python ${{ matrix.python-version }}) - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ['3.10', '3.11', '3.12'] - steps: - - name: Check out repository - uses: actions/checkout@v4 - with: - submodules: false # rgbmatrix submodule not needed in EMULATOR mode - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - cache: pip - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - # Optional deps that some test modules import - pip install scipy psutil Flask-Limiter - - - name: Run tests - env: - EMULATOR: "true" - run: | - pytest \ - -m "not hardware and not slow" \ - --tb=short diff --git a/assets/sports/ncaa_logos/COLGATE.png b/assets/sports/ncaa_logos/COLGATE.png deleted file mode 100644 index 9d17a9d0e076e79293603b4e976208eaff23a23b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32300 zcmaI71yozl+Amyz7HNw^f#StUaJK@XI20)sJV+@H!6k*3;#M4r7AeIwIK|x|&?2F@ z6qlgkhW|O|{m!@UyDn?7lg!NH&$DOmnfZmiQCE11M}>Fq-o2+viXg3f_wJwE{o_2s zv z#(ycLul9ys&dJq^UKGd+fbj6}(hG|M%|$E)ga!EpM7iksc=-6adHA{c_yN59VmyLk z0)q7a{$s=lbhWe=(*nKzw>Zo%Nyc|jsIwS1x2LBk(32nNF+q2TR6ExB^fcw{>usnXEn9|VeIJkZ(m`& z#_eV9%*_kr;dXGiGwq+zZcr_&|4)tob+ns~x3d+umX({6yDJ0}5^JXa5M$i;{}yyN z5TlKlhN~?mF6QB0b1Hxit$*8S_xR2ivX;JMfm^%7FNOla|oX> zz?v5#Dj*=p%V#cR`5!+28$F+>oUpKr3`iIRlIP`>mlqKdl@k$>m6a0`1o6wu%l(H| z$W9?=M|x6 zQ!|IyI^H$1-v#Plc7v>3Z9S|kU%NUv(EsCUG28z|3m!oWL32@2A%Fm{kRU)nM8Fat zDg+S)U=qt5!q3BF%`Ys<_-}g4|MK9!k`>c}vBdd53W@Pq3R+oPLqq`PLKYAJ#9TlC zU|}t239#U`;1jXpv%^=!mh&%Txw_pl54Q z1m!6b-N)XdZ$T~M3KG)e;^v_@PBU*dn5=E~hDHLANysY+6t1O>weVyB>Z`9Zyhyt+ zjZhYcAuWAR3>)+L3CkFBAtZ)kF0zVa!FPQ!6qw7)&AZ;%Z2Y^9ARy*~gWLE&z5ff@ zzk2^~vj1lK|0DZvrvFX$f9vuuvj0Vwf06yS2~cdwL5bP&M)hv*3 z>2LhZ-_m1(zwm1C620jS9dXV>zIHqeWgB8dgtuW*WcjaF&v@29}Qo4*(i@2-%7?r zTs{CE+!!t)C2T@&X(#@)!86+HvREK~e2YiYrfNMK{a)gfbgU~RaCDnu&knlqE+C+V zpZU!oKJuESz0ApO`|R5Vd*GtK`;XQRd#Ux)TRO3Y4b#SY*q@GQ`P)|Tc{%e+hGp|I zdFwy4j!7ClROCi0DvkQ1TL>ZD`XH6TK&z1M>$c?dJ^m8ZxMM%;?=m_8d=z@kFXn$2 z|INPTe*MAT0dhpSjmzO)`Q)V4lM~+hPGlvm^hob>__oUmGC7hp{;=7J>CR5_V78-0 zN20RK$muVYnc(1uH~YRj0)i4Pe!1O0qel7qtozS1gR{jETc+wgurG%x;FJ9eoBGqj zZBjf;Dh;zP;Rx=)OT5b++JmKP+OzIs6{dr;Np9K->ji%g!;Ac+a#r`PDa~2Z>%Q_# zW7n95?C-5W-iNf=VfkF8{OXwK6QhypG`@A_+f(h4bDVaQl1>!l#w3gYODKvEe`nFI zKD2!8!4ytxliD-XhS0E8BpYn`ffCR2`xaP;mUj$06a}Q*BIe4_?#z&yz>NBz~pWyg-p68%_8Sq*XVjL=+>F8(1AnltMqX}e8JY9PIXLk#o1+8XfJS)yyed^qv^{bmU zknS%GxEf#Fu;9zrhuX2XKD^4a=w1nj2~oxv>WB1N-F7?~3BD^_cXOaE+N=|T7W?;Wn!jfu)>qg=C^6r z9#ZTjH>#%k{aLA|^y}f1g;BVbT#5Q|?UB?4+Z*14w3ru}IneQRNRriW?Q8S^$d6Wo zF$GK{LqKuh^b(>C8~1!IIu&D7UpcVnV&_%@cFr#&+Vwz6GhIr6}(B@sFq=9vi>=(I`j+uCf>|Oc>gRf zrFea?Zj2y;9XLdC)9u$56LM`8RVyj8yl_Awm1N-4u*7u0c|QBI0DJY&yCwG!H=79^ zXqD6y?_$75JKn-n^~Q~S{D+zMiY&56-mhN__uNLxq{>!wAoQHI5lhW(JO&lG@kw}9 zTHLQSG~!wey>!JteQ~UMUSt{!({_~X_TzeCreSP%q;vhd3S^y z(LHFL(6(xD`||MxE!_(Aa_-BXV}si$kz&|f>z5!sZv0HH&tQL^z?aj`CBWd=V4&gs z`5e%9r?|-79cRB1r`&iY(Z-qJYyS)n^L7=tLW1w0y7G0@nuXLr&7075Q1N7$@>!7LP0ALrFG~qcsG-B%-2pmI7 z3*SbbA`J>i_A?!E$uqii2KoXf{ya}~tGK0wJcMsPW0$47o3r1z@PkRT~}Zefcwsg}L8NuuC0^ z3nd!#^+flLJp3#RC7tC~4Eu5`n%|BFBt8=23a*Gealm(BcxZ3<^xDvzv5Weam;&Xg zD!9(PNetDr;Uwk#b}-mZj^{LGQ5g%rssyv?HO0nMmKhTis@h7!$Lhyj;LM6+$a?Ox*)vze}%`7p}Oe6*rqMx}FthywWf_erS9!NQ_E1o>!{Yi7mu3 z4gxBF)4H~5vV37yTOI{T{FBteK&fXiQx;O~Az4V^n(UIuy+iH=Grj~`1>s*!2DC|R zFMl4ZzCJQ|s0Qs{o<+#^wzcb;G#Cy%%Q9z(jb?tb23Hwl-pnP`XV__o-M6i6plGYH zP5ec87}B(aoLrE6;zdsG`iI5KiJ4Q_U1^G7kICq?e$O^fHtL25c%u5GNeu90MuL(S zeA!aloTz;fD-ztsyn-a>lUN)prI$(0j?n+ZWawXLY41?`_Lt8uQ`x+oHxGSPS#QCQ zu2jel3&wl3ga8vpHIL{Tn6H|_N28apwoTmtJ(*Vvzopo%hy63YM5|m<^Rmn^uiQ5d zz-`1b)`6r1Pf;E9+9`SFiBC&&;yyyrtE5 zu5`d97XhAr<0?Us5xFwP;JS))Qo?EpD+F4j+Zw(|_3SUS!=z6e!g%&dRX7;UXj&&| zDP~TGfk$-iRoJ7yFX`JtLJYoZ=|$+-=Yn@te`r*{Ik5Qwgkz$=_&YYKR+%qaqo+~V zKI+;Hjt8uYHQ_HCY4iL57A)C?4a+XVIq1XrQvN=SxG}`9q}{Jy6K{ zEurdfSM$5yMj9#0kzI0Ue@pkz1qJ74Zx>qax?PJ>Pf4Jk?Dhx5(7Mgopl>8YXTz3$ z3pLMxVg$MCPRc!}=Fn3&&B}f&Y2dmMnj6vH*wQHr6cL;?bq(BqvKjH}_vRZI@O>ce zxikLOx2(;of4Dp*T0|=M5CB$9HrAfPb#Us7^h#~#H`1^29x|93CaVds)h~r5!LmEO z%1K(2%`_0dg`ES-gJF%+XkmlD#86zHSjebdQoBYUEtlFwI-ph3rm~)I1FVvz5qTm1_-wie*2Ewts_P zcBQ!Xp1$Xr9PWN$EJ!!USzoj7_x?%okvr)2~SDOue|IdlAn( zGNu&#O$M8$D8N4F`aPX7$GEksb53)IEWyKxKRt-8rpx*YZM`5t6eA!?3HhyR(TS_1 zHfEYRAvpP@;Ja(cVCwJ3IJ+ zZEpBRc(+7_3FPSLW|wkQO)$MB{!SOP>s6&3?lr6rDdbqqM~eqz8BgJmeG6FU-!pLA z1LJzI7ZY4?p@U|}ZElrCNpgi2E5@eh4>Fi4J-xxl5vSzMtN+5_77Wze!1eLW7%BK@_d1r+KOGh;H)OEWQQPXl zHv*Iya@k#3wpoaTrpUismxcZoH@lxTgk0MXQUlz&f(1hxVg0PztL2k|yc&8!&2E;z z2+e$>uss6^jO#`kctLIkYYJdC=F~!lhZo;EzZ_!TH*{B=vRf~KDi3mvU(EU#YWcpY!(+aVr{>RP^~AZ(TEsIq~C5c&^BU@dwh_w zN8ndl#{FJi+jei?ajQI6g%Q-*!ld8UIwM;*xXnzPj(aWS_EGj3Sn^zGb6##g%rC!I9V?A^JlYycmP!9x@AoRqV};sRp5hp z!+zPc#CecmAP6P2a;FQO=B5tIc?qh)-ALP2wHxBWf&{MydyY)G_vuYR9iY4Cli zxY@<mK!KDCpuaU_#A5p8%8D!DcK7(SRqcr zT<80<;U4@K;*s@qN#~c_#7bl7G-7da)nRiS1w{iO7`^b>O}K}RMaF7jzZVxJb?Rjt z{y30659_zoQqt*fv}f%>z6P;AUmo$Axae6%XQ_L@;6S4U@rkt+Cw@Cey1b+Gg#2@q z!Fcmg0Gekd_cs5NQD~jD0z7u~D9pc9_XrDC?##74y1}mcv38`2&ZM^iYWs3?7;B5J z#1=r-a6>{Ku0YstB9QAs33EzZ9s2h7=OPd$Fpwo$ZrqYvm_a>d!!m7y0`Rxpg-3`>SVlbpl0pY); zQAkA~m^Yu|Ile@+6s?nLuXw5QJyYu;@b3X*F)Fg-xs-u1>mzYJ66leJ`KTD|_Y#W= z{UTD7V8eIM$Ogami?quo4kSViUT#KVtx>wTJCQWp@RM&dOupSZ4nitXy|@ppF`PDR zAY>%KZ#a}`IseGjg`Db;>!0nF)l3t1`wP!+6DJU=wMohrzE`58+2LN>w|l$B=m&1! z|CYgC2AsE!*gnB$c>h6!4pED%&y-!K_q3O4SNHNWIy!uKq9~!(%E5Tpb3j9|cXGGelsfZvOUewdvYFwb*RW&nepAn*>G9iwn!Y)(l52I6LPh7tR?z3?SAI z?&{@k4-l<(wcZbHQL6bOh?%UuN~8u?{q9U+c7zYF3g3u}OiZAoVtsFfkXrW2_%wO= z6b=K(M)u^w8Glz(xb#rJ#@4#wu=&N+8{T8rEJDRG`65DWf~R zp-}FcF&SIhJE;^^A0x!t-D>OGP2HKWW7at1u3~i+?(sNY1!A79ACXGe&)TH$etpM4 zwwmz(SsMgCK~C0^$_n62{WANt{|rC4BAlN<0Nxa#{iG-%mUrhP?BV2;--ac=md9|K{dW zXH}{i?A)fE;V6XL*au0~e#y|&eXPs(tcEZ#HTmM^5%UinGUO-1;RicgU6&Ov3{>o< z6c#S6OZ|+x&b;_-mDI8qv`PcMFmJAfijF7Rf$UWbf5Y*^MX_Iek3ONvaAg3+%Tn4c z2jF;d{`RG@ySXRbQyh0?pBcIHr4ln4=7ov!w+S-U`Tv%EdG!#xHALy&&Ko)RfnY+l zXWiu^&UXG8RMGtNvSY^fw)Rvy<3BFn;5MdY4y1WUS_Py>9Fbs10=8Bmz+7$Mr*{l> z@TG-om#4j6LqRh~t9`qVFYBgoY#ZF&aeW*tXsfN!8t|bkZf6IaG$ukz-8=2@Wj`h& zSyou^ZR_RFf6CU1T$c7)KG9rol*V7P2LF(#!)i%Mi6^0)5%NN-Ce^!{+u$Stm_+KqkAtb)Q!(H zMcW>tMiZsnNM%Dk9%?Rh%6k+CQ3*}}{FAsKVsIh{jf#09#Ol^h;u8_JH?PbLRk1~k zM8qiw-B|D{x12ChABg22nOJw}f39P8iwoRL2=wQ)@KyGp+lRcV&J@7)5h7(dj|%<} z!KKg7x_lJ>6)AJdm(fOTquzzuc2s-o@d4f`puSQBfL3IEDzp+25sA~uat6=&Q1nu$`uppu1qii80GEFj}N zR0GY!%EvXrv2KdZc(teKIiCmp6rTSZvmt@@G#YYW3?|GKI>`PK2rVEx_LyLcSO>xt z><1eqpIV*8XA3_r8ND8_!tbp(lXdQP7maC)qchzw!eJQr_`%Xpi$cl4cU-nS%8s#a zcW3`#<+|-|N|_D|NQk6ith*@+CJmRcUlyK!mGPe86I(_O`TV9h`E2q!uuJxa!2+D5 z49kop0f?I!1}(}vlf0mYq3TylsRn|;MuRuMc%?P*YKh?3T zxZEc`S+ZcwZGrW8bOP!PSvEw3$d>x}_1S?w`{WZ#RJlbeqe88lH+~+qsy!a7X>{){e9{Oim#j_SjwZ1M7WF^RiVQ=4q1@mm zL0?yO3UTYRW%ByB+6yE1T#(U-1pKQAr)}sQ;~A9v<>WWL5Q(ng)(%2@XvS-_xo6S1=P?=jfNi;YbH5l^%28cI5$IUSWA- zL70TSpKHT`V^NFDGevU3gEqszoOII zpwAK*%~9cOjC~3a7|zYu-W5ezNunk39jdD*mZ@Z?=H8CMU2;Z(=)+(eB0%n%NiL8P zo@SILum^{q`6IG+tn-5T_7=_si_h{oejjohAY>)Z<(*VP?z)4c@zakyNcQmslIgNu z)^|sjFykHynY9qw#D;m`OU=(7avn61lKjcK9(qYZd@^EgfWMbelH9K(#XtCP>j`rD zm;+CXTKjy=uReJDsnQtnV`@_Z{m2WM6-y7R#oy$ju}cs_?Ubadc%r0v=JM^}zH0Y9`!hV`%Bqc{-~S50H1 z>$=yE`t?OA?b7)aKn}Ulf8>|uV(`N+g99`Q0mopMtSzF5Z3A2H&8e>6vvvV7^GT5kH~Xz)TSc4;H&&`Vv}HcZ z>;$!AlrGsYgm$44D5%e5rQ=Fw#J|njTvSNqfN+L?L92W_K>94+(<*1HxEX;&?Wvb&f^&8^kv4^Ji|AvBu~#h{k3>2!L+jg6ve&P}V zn*pKFb70cwbSsz-ox73EOn)AyTYu|9Dp}`~IQM$p$x^`0I2iRR_6@(P=ApijIl4f)B zEHOc-G^f{1>vM{px-%`WO#!TG@221}imIE%v39A9W{$oMzmjDgVh)qxTDsK;5V~*v z@w%Z@$5PH~bnX% z^+z42Qu;Q9EZ95yUcZHSPwU=!CLMZq@Lat&v?8ZDo~q^;pjjP7Gv&yZ(r5x-MFyeL$NzpjSZry3ne{OJ`tx9Y*58- zd5i5Yh|m81qjnwT?p(_Y@1Z>)mhX0e6GuVgsefg#6|vEFhQU&PG67clJ>~fp&Zbz1 zi=I|xBm7+OyFgM=WQd>aX-S(1@&NZIDC-53th!$KlN5pPTutL?Zp-(2B;BCs7IHvV zd=Hx`6E~;=_66s1vnl|}**NblLz~L5PO`9e=o-C3%#%}9Hq6Xee$}<73MbuB6NXn% zM*OOgWy3tLw-`5laX;Ruf;6l-*wCNX@9n!qWHL$$^gLf7sTy%b>Loo7uxam9=(>K^ zf8H3p)`a${`5k0+?H^OIfost;9(*ZG84t}2+Xv%xh-(Cy+`Qb~Auyv#)@OS}g3rCm zq-tkBEYQ@7kTv|%>y8E*t<>A$s)G3`cbY;8rmXq^=bY!?c}7Y-gA&;Cufk0=5FO&* zVhKp1#Qn`)zJb2qu;f~s0oRoA9uQp)4gV=)JwReuT2@uc)VNiWaov7 z!{iHusAhK_Yf0f%^B?aHx-Pec#$t+j5-c6SKC1hDz<$_eP$IfH;(7)Bgz2c<{b*l* zT2}MRQ#E%sLn1M2;;>BNcTvxuAjT-dW|KTgu^kFH2K;+Y+&IP5hEfl2r;bX~Z&fW8 z4mjJl|c3eNS@$upu4T6R#rk@-JMGTki@H$J~=1Umx| z`T+F{0OutSd?GB&j0P>*MnGF(8+U%XtV!o(U3YZ#Ao;q)hcum*14e6L!&|sB7pNQZ zVP2OQYCULRH@`}4nz)i;iX!2rBI!!ktuFz$=!C4G4w6rWfQFIlhEV26aD*RAKI6i~!Bg@%gWk~s}`hW!+@F436i^>aU|t`6ePdla`)QVmT*ki=cXIB5%$0*7R(Y z(5)mz+MxCOnfA-|r;qtNO=mi%%3W#?^*j*qi)@HpzxQKV#s4@%mRSRzD?J43g+qfim_Nm1-njs_NaEv zQ3XF^PniJhgRAh{$T4Z<5A*Gbs$I!xr-ya8MvvEKS>@3sKIHAQvt%IoboQ5E?BX<1 zw(uYGI~F0a&9;*qRkci#MkoCjCX=OxNdgGZh_)o7pw-;(O)l~|7&6V^ns-i{QQTs{^it3 zrV7ee?v;ZJqAo- z8DXX*xIC147;&HT)>WIL_Otz3^Q6+V7KXAz^qXKLIcQ8b7-4465FE`ay0;BPzv+Pf0|a zG6ekDMn8ylY0$CiL~3L7++L)PpVa;9DDT^k+wV=>8E)efS03g6-G*ZpG$XH=$+<-4 zH=yr)e+TOo2gWVY-Ay)Q=c;>%4&U5g^XHq{jdTt*${aMgq*Zn37%IMwNV=qch z(KuMiqIG+N>+|7s%G7db0$zEp{vNcp>~wocZYILw z@@4@P=6}_k2XAX;AF7PW)o|_2*04dPkW5D%r>Chi1kh1W%Kgidvqs{Qh5G?qh~DI~ zL;c%BrAJ9rI~U)eMN~FRIs9sRwat&&VH4Y^;VT}?A^9%(W-)~s! zG(5Y&KI>!?5tSVZGm{Mkiwgl#5>k*KL_Ky8~=(B2gC?_;6Ha^y;p@`5q*w}C5;{~ZGo3I z<9KUb9}uGvNOMUjrAp-x(J?;WU*8X=5vhE2Ov>oz6vsxtICp`Ya)7BFbyLLRN_Y4GUvs616OV=)a zW&Dv3yX9A72rqa+Qf>(MQ`5^{UeuQqPh3)+U&E}X^4(vPX@`0BP1>I}D&OaY^`bDx zik5!h1L~)l*GsY2oY}eL77rhxhiI^Kns!6KYC-tiRW+ zr?Ex6ZfzvPyZ^@`z%?%=Ufw-i@D=ZO>*}$F23*zctfR4IS4sXOFRYF@Zi)208}(rK zBRa6d=}huLNZC7jA{mGJO9MKXesW%^!7l*n)L%Sw7M&Dm4qc|CToWpX7Boba&W0gYcEw_e--&!|2)TNGnnXiQ& z_;^+kiU>ylr(x`AX+7f0A3}FS8$`#Dtoflf;*Yw=&!EEzqrF$ysn5NeZ=$>aIc;4U_Z*%9t*!;w%#jnl3 zDduV%_=sIulH~NmruDM7 zb7%FCXIyYny*IKY;z|;o-L_#}{zv#v#!D&e7;^cz-}&&LidlWDWQIRJR-F)4TdTiX z-irdR57Tdcg(3tejI{M3F|TQ3P7-!80=X=YdEYUgt)a;ty( zM^oT&6YuRa-cMFJ_kFUHMGrU3ovGACId`sYkxQfKF56C#qNtVYOhWeclGMqmErhiQ zLlkDQ&CZA!QsDPKy8r%oOvE;gj<9~OMbtq;5Xypi)^hsAmGL@aI85v&7vFn$AL(?y zTBYdlkk7je9_v`^6Vl0qug#aIw{co%VRrLr5L_0En?WOCtU+!C zk;xbFq9w-}CyPbYiL%c&$YzssDY2>vzw*($(ixWQtr48AU_{8!OMdz8hWB$R--mGn zO{&x(E-z~EUTDa))5&{5mV;a6&1lV-DD9T6n+b);ev%tgx8J8WQ%8palF7cHXnebm z38T`Uhbb>EVwci1iBc~m&5)dI>-sCO;~Pj0;$ErC;C3<)^s9M~L?`L|yLAdYlxTV> zV3~ZgRS-@7;4?0jcq#S>rwU#ZDdF#5^LCXQ&v@JNf2pf~!xMY^2S@gKig`wFSq2G~ zui*;_Z0nt2tn(j@ibzjC#1j0GO)}l8Ij}+EkD!eARDb`#Zo~i7 zk)4KdmH?HkM%#EHCucD9Jb9TkE6(XJNyw=CwtT#dGa0*90;iN{VFl_K#V~r$@jMkD z{TUZ%FQMS6@8%7EUpaIk>_lUmD(v^(uo_qFqNl!Sf`gB!{{{HFB|H9}hbAy|yOKQX z)-*6|I)-aCvZpzv?^v?mW`^SzM;Z-i1xMHry)H|JZ|hM1Xa8s;=iScC1|V-WKh0ucy9Q`JSjhmM6{bMlaqW9CCYY|v0m3Qv-SMa*G_GHTS z8@i<(qB*HQuUGAc1GELxvRA_M@wC&Zlc2HGOfkJ&UXNSEmDg0@6~{u-DZL$rOAK*y z$d#ErjttlFj`=^i#}DDn$IYAs#~Ul@f_~Ch@n;vPM-sv(AL#kFMjj+x99Y^@U(krx z1f>Y)X0HTE@~pYNuZu5~5IXYe)n{Yi7mmL)bhI=1#d*6+a)win7xGmhA;=>riZ#Vd__Lqa*BqGU@)ueLANfy`h57z9@{z~E)DS{Xhg+-Bw>^&;TA-T55M8? zL8}CoY2FU8uS=MvgTh4#4pqd4WkI~`lx-D+JRXqf8)u02y=^<}Hq?{b5g!3B?=#n`7;Q_qSZu%Svxd5C&+%~1KNU762c z+0_kod>LcadWAK@S3YIhc||sX`!A!dS+hcuv3IV0NlA}Y7`wlQ4Mp$LuSYR%CRnT4 ziTyNuMiXKY#E+Z`n=nzkOuu_r|FCp&QqpPl@bl>4(X5bUyBz?h}7rb#ldcLr2 zUryj$7Q6KrJ4?|>yJP>h*!S7ddMfwERT*I=pxbp*2W8MSPZ~wPIW#sgzdJ8Mr|=@= zgBT*kXUm`*H{9@Aq<4t!yQ{lm*9|E1Z%*8dHcs5|M@Lcqoam=15MSlqGQFiM%o!5> zEpEYUYnIc;`hKx)!DN1XReoJ{Gne}>rqzYz^zg+T&)gR}iXRE9tC}2H==vg;JZye| z*9kBu449uWnpe+zHG4gK4}Yv0s{SEJprn)};zW5>Dsxxvm@oCqWfN}f)?#ZAvKEZ6*WR;=MvkXeOMXSF4~!AYq&poal~ zx(F!$X24jiMHY&CTNUf=>c4tsiDPWu?vO>Hwfrn4Fh81J8ygB8Svd?49qp)kMc&-B zxg%Au!0n}nD<cYACzeID4>%L&>M?VF>WRKcxxwo3S;!8e4s6N`% zBL93^PQVDy_ggJz+M|A8h0fFF1j)T3q_SJ^;)7_t-s~^I-BG#{`*CajpnggNuEAAX+iM#nw-dGH;+hQzvlUKp3{fpjYMPhbkc9!( zntGeuX|*Y%&Fa^nl=z2b(xjEUL@pV-Un`%of5z&K9N!|#WytyQ;$qwLwY^Fu@V)Ai z!(cqIMD2&MWoy=Y$7meh4PhE)UZ*EAy^^i&pU1lDCM;hIze%nn1hx0Pt|b|cwv!sZ z`5ZbKa)CJ*&Ok+_rP#KW1VwzxvuAu$J#M2Io%U@TCi(5Bjz}OTX zKCG$FZ}YZSg^Er8S?8u-e~xFsKDpW6-@2RJC=kWInO@-cI@7YG$={t5p_rZF-6?yZ zqzYwQm{hMg0lp{wmg973iHVfqXJ3F$k}reBoM60*d){}FX1^Nnx`9RX#{NrWKoC#~ zf+yx3nV#o|)?HPb>IFcF2p9t(e3@bMXy-wogbdHHFUG+&dEZw8V!~>}h)(yUE?A!n z7azSCM|!^{AdCzdi%UweqKK(JZ3eB zUG$-{cDe{B`7L$UQKZIp4c@p=?ns)C>NwkjwaqD^uG=iDh7~5H=G9eeE-sdT`;+2J znFvmMp5$PtAQ3^J^ZsjlJ@&&Ca{Kd=?!*XE*_x#9lhc0-6g3NRpQz~uSpTwHPlznI z?X(gb9%kAs$tolZY+sN9YKC|j@fyDN-6!K#s^YIZ#I<%R<;|y0@5QD5iLY0Hx*=ZK$ z8c|A8_gq%KTvub+#Bnwxdd}4v!x-K9$?QAOKtM;gf zF|s07*Te2~92r^+ zm~+;Te(qwQ$qyx_A-aO1-80Dv71$>#iFyqtwr67C(`FaTS}?DwlsTKh>7N~KFI^{? zKfR;VL^2hAZ(Hv9$aTy@ev%*0>y|kBeVkgmr6j%N*vMIZKWaYdRlR|>RH6Auw^+Vx z=+^huqTYI>f#Cu(?{F$MvWW`QCd7m*3AYVfo#)j|K zPVFk<5OHq{d!9E5$5(#rYIeu+543#pt^7QyEv?$k0^oSw%$$k%embTulgtoK=11P{` zjD3@8d&@Oza$;sQ%r7#m%Vf4Dfc7E#hug?`4>11yh-vz#YczL}jLq(RrQ+ED$?2VP zDtzW=YWzcWll297*ntzD-EO*mY&mTWgFt-uP$sKW-v2fIDidRjoOmm`Q783{>UvA) zu5KM+{F|qEuO#v(*)a&l6FikXzcce^R5A4s??{JUmx}U^{^(_otfL|gFps9Qe zKTf7Ycay5dv|FiSuKs~Q-g5IBd?(g>nmY&Kh}CTKS2r$DMbk9U-2ZHw`uMi;{P#T! zc=GqFu`p%R>;W6Bt`<`7uk8g1wa?39W0;v=QrN?mm<;|-*M z&2ZsK&ta%5=+atR&02Wo%vCFf>= zK)XC_$9KB~t`!Qk?sT54R{cENTetRAC7Cr|fvf2i0q;{g%st+lZx2yKib0(E&@yCN zx&Tp`#3!mE$>j?6A=x(F0?j%9iuhKHu-@ljv_Y54yW}5uE?Z+nyWjfy$HUpPq>KM$ zEv3Q7V~iVx%PBB*#C>`J_0}@qTAmEuMX0{sPryz3(TR&eW!}K(Ljk4FpUAjC7^5dg zOQCU&25l6T#)i|a%AcC@kI7ks*s;14^u3F`TGz*!s1 zoWetoRhN|KCsS)m%tAL#(~-CcwhZOFJl7y#Y_=TO&}NM3r1Ehx&YU`a&e?^jJYUs+ zxnY{?B#=F;Ef!)y|3mJRZzTMqqkFZr{zbgI7zU6VB*ip=WnuIT-&n`SZ?z$B)h;Gs z6t_gXU+<3hEy19r{!Ba*Y_hpgps0CQ*N0q%`J2YT2Hmy}9>zBR*H8LH*4>DDe_DLa zRf!*XNoO#m)p3e3YW#ChCUaMo!i$e)B5%V~Z1RFzj||>?Ellgha_ZOrm*%552)m}~ zbAK!sKnaGJB5rOti*a+`&;vqo7i5l275z&ppU4kTe)$HQL(Nr>>O8;CaF7c1KRL_r zk&o+Swnk9iMDHWNF~%qb!pHH^HK)7-H46l0Yk$$X?{L=|kAEr7 z0{5-X4okipEFW()S94OgNS=&l`3L^oNSIch_cj6ilF}cV_D>5{x@MAzI84YGb{B<+ zvX8acme+qWU{~Jedhodd-$dD74Al5+er04I>cFt0x4ad7uOf}2j>B^7ApzgNTgQJ;wmc6S;TYR~eFzPcPi$P=K`Uv(|>u(MC12@u!i5hl4 zCAf|7`fNe(0^E`|t+#`67fy^Bw#e+;HGyx_Ot14`%m34dmu02@Cqm%`M3wLL=0x6v zxNB1kpv4v0A(r@0gosLh6_mn8$y}b`vHs};D>`5m!JQ=%>k-$gnFx*&CgMiUw$cY$6(51 zvq$fBt^7$CeGH=AcxaraDnmzFxnN0wft+yN!OSs+`Q-TtfmeAGLNcFST)QbaUMUaQ zsHpstBvMSy$!%Fj7vXWe7y7xGc)X8}$}chaDFjkJkPdg z@BOU3_FDISufqSaRv)PS4U>^L5m1Tc7g$IeJn?iLkZ4cbrv?Sg`W^K*`oG3vWJ?X> zrp{fRm>FfgOR0Vn+r0wpJ08MGk)9m;pDr&h`?IW_SkTA*_~`5myy7I9qgy8^@Pm7; zI%8I6?YEr5WU9RnNA5j3W8%~;1!Fgo5{yj#YnG_#aCRn=kk=5yWWM7<$qA-DEV_NFs(EODsukAEQw}IZ4Ksyw z()WS#kTaJb`HG#|Q8EK-E=Wsi$wK`&fw*;#LXG~9|J^YTaFQ2F8vFHSXo2Q0&>FnBrsogSP-`hmnHFN3d(b z_&HyB_xgzV<4a$lF*Wox&e= zShudq+^=gOyz4P<@V^>ojbWOut*K-&ONp=-F0}C;54nGXwy-TPXr0Jc0Tc{mTZ-EVn-$|cz zdY%H|jw@Jb36|)TYo*jC`_8TDM!J_3%LEFzy{1jcN>v@ddDxq#gE{fnn;DUx2=LWM zu|1M!#*aTT&~gMzhu=edrfOB_V|XMe2zIL1;9aEQU!0Q>snL>_hAg8?@B&N^q0%?c zZP%mZ?34={5;>cdnezfFWLt%?GtUlcd4E*dw#qgImMN!3b%M$QyPe9zs=wO2bj+3GTaPRs+)cdo_XPUocR4v)wbnIV()FyvkHU!W61Gqx!ZB$yqz0`Xii* z#10KjEpW#6Pe9(31i8~t?FH2I?iph#3DVd(cUpEattj+fu&&Vjp096GEhkhd$A)yR zem?(7dO|B3>8)UmCD%3BO@w%=VYO8m%cX`1+YAfrC6WRXl+5`s@$g5i+&jd;VAA+< zOo+1Xqi#O?jvXQ@V*)@&2@w0y-6;1`t1?)skyaiuJ8=Q!h11e)Z?F`3aum9n|iLbrWj{5d%*T`JI2>ZA^zn?#-1GSaQMuD?He>}`ycRW4w>^=6ah zR|8;vr0Akclx-641ZXYf)?fWeAWWUsO#4qgWE(NcWGf~eZk2HKp>Ly9-;gM2;}(+l zqD%us-nggb5LDPW14+FPF_EN`T>%&GmAbxAYvBmcfBJa)`&(t|bJ5FPFW~j|u|P^r zB60F07AE7EykgpbBHc4iy6b&2zdTiF{mo0KORxr7#97y%T1kl4>u?v%MNzf)0+ttO z(v1!&TA9CQHEUKny|%d9C&r`ST;*K&M*l|}Z+3XO?}3Z6!VV@5jPXco`Kn2s{4E4} z^hZHw-`sq{Ftl4Shm)n=G!|3eg;LI3qRT86-Qx5$0@DulX-Um-HYtzd1@5m5n^IKc zwF~P>L0{Q~BLJI~O-W(xDgj=+x-qCMV12m3*}Jf3rwx*G%XyYz7}n{-Y;)R;yfo|? z5W4nsJ8NQk4E!NY*mYmwRCMo~*`qc1lJV!DrrNJ`oB0_96Xqst6dbZNJ4!}<-_xdo zmF;7C_KMGFw6eX00)wmvl_M%bz?!6AW;tB0pK|8cFBrGIdG#pEqNU>|GeIahIhrzZ zqJ^vqlp?Zb^K^^Yvo%L+?<;XdB5&DgK)lf6kERTPcH-`K;reboPo*xwdDInJtxzw5 zD~O(}q2}ZdCXQ-QotrhPwS+?BIFO(9(Z$Z5t;38yOK6aT0Xs8f(t z?)%=5#WajJu~Z^D*7{)Htt5;UtBS462>mTuhyL6f309h+(=B^7^+dwEvcQNpFF;>f z11+FAF661~KjP6uM=3X)T^Hw*;;|CIatt|z25KUG*q$qP(Sl5raO|~lD|*?x`zgh3 zw@13s0giM#H~1Y9i<%{dRO+!Qb>8%5Z$pAE3J9iP3t zu7aylOo=`V;AS!_7UyaB6WGr#Aq^4S2!L#w5BwRYX-||2y`{%+OV(7CO^_d$VfL$4 zP8;xiD+IsOS6YMj!N6wZk}jv7PK1Xk9$79#X$n8?xhjXCmu=Ch$ff#w!lnrPJZJMjCQE<`^Ht*<|D*r?>#j>0+{@JPr@6BdTZ~gy zt*QAaBn>^gJARSiickXlgVSX8gWq8j9s0ZV$x%slcK{5BQ;=0?Ee9R5Z?Q#7-{8}r z>x$1=#HnP2XGoN0EYX>g(i|o6=@r=d1?7Apwq})OHDvV&qI@rV5INfJF86D&E#rEA zk#9?Z9ws?U+d?O@mM7P)DK?1q6t^{6;*n zb30&2$Ud2>*f->^Vh+?ALT)Qs)lLc7vf9biAQyDiK<;Fj8O1FV!sHz8RRX18lWgQ5 zteuI~q%mahkhSaDbm|K_!xPEcWwxfW{_IWTAo=IAYkq{RFu9>yh$Z#v;Hz;~+Z!usu>6~9)Q zZT4*|AfY>r$mA`Kar9O~xNml(PFXzY=NQ-bVS1A(FeT-_`Dl?T$Lmp*4!)zNDlk(*Me`qY4mS@ORyf z?M^uEm;Hs-4bf3$e|fn@PM+rHDIoWFtqTfCdBdPNevcZ+TWD<$q^+6u#6%&A=mf2U z^X{w)-Vw^~sdIc6IAeOY+t2yk{cM8)mOVuaA2TnHdJ^_iW?ZXHP8HSjx_^q~Lq^yD zA=Y}~-M!pQPq5WaxQd?yM;=@;$e+MPBi6g}ruX>iisCSXS3CF_bar5S`els~N)Wjv zuBBH5LpEKwVE^sBdc}0~^X2vK4!5{*ijpJA*GG@86cB}haauhOVPeJBSfLWoA2_@e zucYk4fNv_vG|odbxB^ix|Iv{^DiJ zIkvSe?^1AWDhfoj!B2xFLE%M0I;XyTI9D9NNd%}vDb{|wJ?h@M)pHwv@&Pt4-1t3u z#6f5AcOXM|0Q#8xMPiV?JFYAXnDj4`L_AZIh$B181drM;!rK5BUWt+=*uXCR9XZE( zmcx^X0^tc374P@GXFZtQo$%nHCGpw5%CV^0X{w(9q()rq7?SkX9Apu_Ank5N1k?S? z+8{X}?_^}0X-3PAs~No>K<-7ijr+*25FpI+$~y#Hcp>}#*8HW}7AW6r@eS-U)T;u6 zbG$ViKk*1jUp$DA#1OresK_`7>_3x?at7ZuS)@7@tfC*qcXuo!)DH4gg9Nx!gz%A2IfYzdtPiVgEtR^?Ik9HxyOQh%sRSfO(9)Q6gJM^Q zF0^gmP7qY!`c<%rhSTO|1o?r6eMW#MFDB~VONg>rakzge`Z-7D@s}!F_C%1j_0_wB zLe<<#NjJoKI0N^Je<14o{%D6>G^Bg2hZsPCuPku&n2pllP0!Caec+6zJEi>wceRRQ zpc-sqTs+T8-55zh@TOXuqOVT~IrirB1J;thN)KkoEgjPv>;t-S5dk#U6vaCUbv z$z&rs>6vS;LWNX2pzOq=D`ftiscXDrIl1%2uyFV2fl>84$nu-op}Zl_mqw)p3;V$i zcgqspCEX7e9awa>k9$^@jDIAI2K(SQVMW^9Bf=|m{Lq}M-xuN5-gss^KCPS9-UJ`xa;`ybhemZ0$K#v-dmG~)2f zWHIsS@~P`XRppC9!)0b*>bADc>9MF5shghklgAo|h^mWc&V0d1dAYzyymHGK#bY4yf zS+}(=|3pCDGRDi~UkBJEdXb__c>!IHw@vx&&VhSVpj08LUwti%(GM%oufO%AnQkM46#uW$`PiI2u@#fT!)4Wzd8A9~l3K0M!@E#`s5cXL$M`E+>$zkD4a6 z3QssaRi4JtAsef#%ojoTVu{Z-7|NXN)Y5npFx}g?H6S<%whs;WTRuu#N@&SKNeVnO9McX<;w2U*yV+ z6GVGkDGno^IS_ti=gz3c(7E>RWlyT z`D**mhecfzM$}K^HA+=KRkFDAH*YMm|d1+lDvPm&qTWS0g zZF0&FsC72_BC{9ej^Ms82ruq0y!29e$i&P!3?RTIWc!_`E7YE7%jOj-wMjtr%a%{4 zeA$}roILR{7Y0eVEr&YzV}XZ!P0yh|XKI4$BXM&v-MplcxMZe|$m422>OW

mZX9Qb3OikMCZUbIrCWmx$}&veJ{fG#snC#4Mu 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 J1^9jN{{h#YP>lcp diff --git a/assets/sports/ncaa_logos/LEHIGH.png b/assets/sports/ncaa_logos/LEHIGH.png deleted file mode 100644 index cbe8f4e2a543cc584d7a87cd81f0d669efb5a5f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34109 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 diff --git a/assets/sports/ncaa_logos/MICHIGAN.png b/assets/sports/ncaa_logos/MICHIGAN.png deleted file mode 100644 index 3929cafe997d544d9e1d45ec1ec6a93b87e62fca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20380 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 diff --git a/assets/sports/ncaa_logos/RUTGERS.png b/assets/sports/ncaa_logos/RUTGERS.png deleted file mode 100644 index 19e826dc29326b87a5fc848eaaf3ccf4725e6669..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16356 zcmc(`2{hF0|1hjYDv|E)D6*uYJ28ZjU4%-OvhQSHW=0sxOh|4NNhK87k}zW|*-bN& zQnHO@3^Qhs?93E124i`?qu=lTKfm+-|K~mDJ@0d#&Y9Er&gc4EpMATo??VeSV}XOB z2YGmS1g>4Za*Ky&7nA$hzYloQF*uq8{C6VM&@R*x<{cXD9_+<)*%Nl#OX?cL-N);e zm%C@=opvuR9-cjPKP$UXJJTB)9x#Z4I~PVF0ultQ=Hb!OjRg1syeW>y}E01tIfXZ0OBRgj`GND(Z5QBgxxQ9}tV^{;=@z=pw|-Ws>A82xKI;4f`y-_Xz?4G<_iJX|4M zSpgR815#2~R|hFx1YNu+4?xI=L_$N|BjlkWr~i%NidTq7uwPK99}FtR#pr$;1`pMi z28jL51tjPnw9t@$NeYk|D8fAmq@Nsp&u9|1DYwLOS{Nm1&Ysk?_Cl>6wf|80%e757jtZE3CswUuF-;mpgudhnVM=`gNB5MH6+hKfr6UV8=R0q1Js-)lYpS$k3Oe_YEoYp$*|u6PCeg?V`z z1;ZdxJNnS@`)_Hvq-dZBzWhJp``22}|B)6Y!~bzD2p|T;wb1{~V*mXJa0Bkwe_Rmw z;~yvXf&!i!47ez5E}6i?qxtCCmCIHUqLS4WjSLk&Gm@7>n_ zzf+T~dzJ1~R;^&iI!+x@(cAD5XPDQ)_`tzLhyb<1!r z6oo{`xaw9=l?N6REUBykb@tzORdy;oJVKB=SwKYDEe?F0;o-Tb$H&97SL63bim;1^ zCsvS$XMgDLk6!+s{{sCFa4zV7fOA3r1DuQbAMF2t{u}#0p#L8T`Ea3^d!k;^ zdhW%$XV=*&f}JYgTZhN^vo|%9sxbA1vx2iBz|Eoc=1%KI%Zn6|WsQOTg%| zgDajReQ>o;Y6ap)beUfdgh;&-L)kh~#b6sAN+zF1d|loT9C*+eW3#TQ_HBADrTemT z88d6i=rG=-LK6}rvQ$2JeuOkr>uY$*18pVO5fhfmUyz#7(eULy0Zt@NUF~oF6C8Cetv`jdA1TxPFQ_O@8De*m<;myq5&wv-?re@>RK=i zr@ZR1wJr8A2)F)xcZ|~rZ*-h0`N^2TJ#3r6Xockv$mVNvhB-w)e&gfPm-K_1=hxZ6 z&Td8HtB#M5i*dJz^nw^^^${pE*RSIsl}Xt3_f}ope7oAG?}MV~Y8kbWisnF)5MC@d z{M7a>ya~|{gmUT6qo6fCw+)EaHsk`qwl|jmau!^vr0`Rc{Q9)?iG=w~KK6Iz%U^ZV z<|}=c#1RD00w(!wSKh}tI!}hgt zdcp$V1I-IlcjW}y7G3cKU->gi1Bzs>1=cvH;iRZ*M%CD5{j=mYKmywC} zZ~<9SKUeE>Nh0tWFiq!hsl699)UeS-GDF&>LEAYWH)9v3VjCD+59XZY#D(_k&H+4! zmVn)KZor;GkSt@gMximiPc|y59RvNg1v|E{!e7o^%N5vx(>WBbRseOnaEv)Z)n56c zax%u;yKwU&rGl@j@mh#a>EQB>Dc56d_B1Oz{!??I`Vtx@=dF{*Hl=KS+-9iqiUuwx6EYNoZ+ zKjfn}A&Cxt53@BVA>f|fK%ASI5D8Gzo3DErbrZMp=KGcj%VSYQqqdKVACXh9sc4@3 zQdZNsXyuRx1WKl51r_5HPU$QscCN;yonBB7_%b?tks^2_Wq)1CVk>Mqqh7lJ0m7K) z@8Kznsmtv`jpFkO$1dFA=-qxmMbXwhFq%V3b2t)m@^ z<$bsg3d`%eu%@#FL-|;3n4s^Fs`bwiS>*~4XF8E z+Um$soK6_;33zofP?=&vDRHstDk=hC?g@03t=51`?{rY-nA82DGUURnBijXd`_?Ui z2|F9W4-_j~@b>dVd41y`OBH5xCLQC7X%A@)^+tlk{fq2>PWX8NP;Psa?{w#UrPC`w z?csdbZf%tN>NcTGWsqb4vj^o(_y!Q|#)F(cfpL$K8FerGegKP$%y6b?Y47K_1SOB= zsfA^p2D09sQAgJT>eNV^ig8if-t4}Gw3CC`Ac_;snch*O2RK1QYO{mPV z*-jSA>Ql3JErtWU=p94ML&b&-HOk@8*443+!4n5pT~?FkC^ZV)h59fY)~=?Q=opjP z?G$sv;3v+B7UtPlFUVz*fP;%HEZ3Y$3GrDD)GUv7g5iH;9)JTsS)7I4coC9_cPfH- zR0L!}+jD#FhZjW4VXgzlg8FmLvGzn4KiP|ZRlI$jb4qjQQIo`|?e?p=Xoqw_?N)y& zE}d87kJii?n*zTcuAMHfkGcXsytB9r0XRq$3t{*bCr=?Gk7BepgYzt$P0)V;rgi=f zn?QY6cYhEwT5Pd>rKkRpwhdfEerMC;a~-Po&=4h&z!RMK^ql@`0s84*SNdTClBJUq;c1I{4rY!F#JB`q%Z`>=Bda;XS~FZ+>`z z-D)k{o5i)_Zv}Y6qmvnP#|Is=eaOYPP9vAR6l|mJ?O;8%pY?eSiZv|2TfQ!pb)C{7 z3OS^4MXEkP^2=$$R?r{2il10^kzX{sw{}+k8rOH%=LbXrW}y>UfToDJ%RC*5CVXN`X4o35Nc_^6Xyx#0>HE zT#=J)>3Mkp?8Xe^=C^gqYP_ zhiNQ3TPtIZ-(Myq`j&WIaV`uy^kDXbwirR|68hi?N{Ol9trqIZEB2Q`2cT06%n01s z+f{vXdudFcX1fi?qm6YTc|NRdb!($-MX|dVW_pA-EVGVoQVU1kf_J7|mM<{Ssbu#jV|`xc4i+Yec)#23HDw@EKzmLn`Y@Ob>Vv zw&dSCN}6ZP59Hg|R%lL>YhfDuk+&tHIyP@CI*@Mryv-cub(Xsel0=b3+m9sSyGQ+b z5vn+yOX%xC=UBL|mnma8mB+`Zs;w6>b$NmNO> z*U&?K657^WAj)eT#RS zSSYsjzQo49lm@ske~fePUaO|(U5hLiLdVisQ_BSp$a0jz_UpMD#Pbsp8Wv)p{WGos z%!GDgUhrbfrl!aY3>{FncWlU)UCgFEWq1zJk!`8ZZ~N%?9yK{n|QQ!;lsdw zj-Pj7&!ie^g`4jah5ZxWq18GqN*GTAYqeF)z1UZhA;m%A2Fp-s|6DKC%6bVzxUQU! z>Wz1tciC}j3CGChEHJUU?VT#m49;-Qo!W=%)*1bk6=l`>RyJIrs(4wvMSE3!t_#ay zMnc2KUHA5#r>+d!r@c)jX~~*r5~6tshh0c_UaEywR7L%{kQjQQhN3KXe@zY=Z;~uC zsN^UC3%i#rhR`i=f5oV)M54X9rADg6S7=qCrm)|;{@vJ%IE{$$VM8{J+SjNxPj%nE zB-tkK6NbKE7I>V2Tq6MvcAST;1J(z7{pfXXosTKDlc{4vOtLswqNABu@QH|fv!4?<$ZTP}iezcdxqr6a1R$G?sR zdkj0c4%KeJleI@=-{2E*8>uL>aS{(~`~-32GHqYVWK^Z2Rcl!d{H@sAlSNq;Isu3c zJ-m9%d6Ijcud7=KQB2cNRU>zQf)jP`UxSs0U7VBls>Lq7Sg#6uW)xbsbn`pTs`)H| zGZtQbeOsQjSL1x86H7Czh34<_j6WjWf)z^ao+MvWEz)iNb#^v=g)$Gt|B zhraiA0L{Tat>-TmHJ6`Y@SRDdO#ZU2yK!3Mm|A41+VN$g9iZrQt|S#Ge#<}d!l zqbSKzGs{Is!PP~pM0-D<^7zePU3oWQn|mN2zUpzG0R4gEU18l9_v-q>eLbYZbMNuP z5A)gk?M(tILA7!4@K)^HaXHM|rW!G(6lw{X>wtw`C;g#mH&1eYj)iy~fQ!}4_mO;0 zP`+5UMj5{p1T6If%b~KD!)&6+cBFUOVj*%~t_Jj8Q%L4Z7VENKZCzYc z9<=4Il={H*yFwsd&YTDjT{5-Fdh$c&iwg|ulE#W&T<5^wOj(lk!$i97gM{Y5$IY!n z;ZMBZBZqpghv)&OQ%N&@tZk!e053gH$_CZlG$=;~bgjce9OJ~NlFDo)L$!M*vxL}} zSp;Jagb%qNh_g{1@W_{AU>ngaMpa;yuOtcov-vCZpdiETXjV&+vuuSa>69+#OyZhT z7`McT3aCn#>A_jTePDQkEXB3TbrQ_i$_Nw*i1U{((o70>Z62mW`=-tS>0q6fHtEv8 zYcSdV7hfIjcIqVge$?2@O`V9{)SUFK+$+h9?mK)yc}s|)--Mu>>SaZ+xocZln_Ed> z@t5MTGXs1NALULzC1<+90Hl&KfYZldtQUQXQUc0k#U3|Ugj3?o9u*yrmOO)Fg0&gY z1KEk%kSDK{^z-+W)FoR<9@cQn&6vV2T0nFrymjh*3oWE^E13S=y)e@C!~vixrgmX+8H6G1R zNuZS<6MXp1d>ol6aGwM8;P)!+T?JXkbVM4L`$2=h&=lW6WbD-nKj`g|Ln&>6wrfkZ zgG)y~02^DK8gQ;awNAe_!P*Rmke8{ZFU}JZR6FD?PaZMftGN&H!XST-9=z*(MxxJ+cY|T-$Z2|_m?o~Td17?$W;vU^muC3aX_Q`V^YgQ5mVy}!pN(}m?q@x zja0O0&Rjt%DM8=zJfo<`O7#R_BsSC|Hq{7KJ-{`H#%&tg8UqeH{OJU2>?r_8Z$< zZ8(DU{dibKuLbD_+b=p+2dH-L1+B)-nWyWlRs}j%)*d$*^0%y~p-js+o(TJJi?Z=M zE=7m$+GKZL0D0aouph`(SkzLKq1P79bEhd6tYoV(s2{O%$EJFIXvVc$mb6GTC5#yR zf1jxQCae1xsJNw^&bwr8d6paS)&0EXquRtw4^6#3JAMF%WifLl}3ji{ljI! zUy(pGfZfbLoN9Y=<}@b3+;5sy&(%uBIm`FkEz+MbUZL){%b7^vt`+r%4~=6V|g&+|qScxWJH%^41(V(d?tf72#@)71-~*#El212LeJiMoc3- zzXI)`5X9hoq(xeWs;cku)4NZvR(#g$S;tw=12joFjXZXpI6v1W*D0pbs%@T4JgK(S z=hCVCV~6>N=_>@|*$C6{PMPq&fa+x0tlHAYH8*!6f?H}I}34Ewl6^GLtj(M zyQ(GROtzIH;OYBQ|MpM4E-{pUg5EzrhrxV(-r$fnaOF##J`HTG^8;U=p(X&d09Sf* zZN^2J>c947qa+Z`_e1wSW?B)1=Du_(wfwD}drcNCJtLv0nNxKKHV@uzYy% zSV&D4aq09uV>=oG-5R(EYuA|)H*or8_({=31!YCxX}bPjnY!hkB>3ha?v^y`xE zv*~%V!xnA+Asx0|K_txc&%70Su2%sKT^g~P-E-8Tuf{bvLeVd&nh;=Km^(^rirKne z@EtQOg0=yOu!u4)-NN+oNxl$0GNL>BVRJcaplnaL%}f`$N&mCSU~c{8%3eX9zo`~P zmX63>9aS>;=u|Dm!1gX?C0mHiomddVGt#Yrm9lX+ z>udlJEBCA0urBBE19g&*pXrO+P$YygzU72(oqoqHno4p@Q2|j3t3kmpqEwVFyx8pI zcY^r$Z7xr)J<@iL%*To?nsZ4NKW$~c>hz>fae*WzOIg>?DDqbgd=5T@FmlHiEE(8u zd8*$1CK@X!wNPOiW0AsYoIwj54HW4LbS-GV^}fNri>3?f6|2{sBHvX&hE{I$@#qb0 z+^og)@M;dIl1CDLftv}(0yXZFe}E5?ONjh2Klz!7+zew^wUo?&;zeABE`7c|hi`A36>$d5oc-}^M9KqJnaTGzo#sxOG$52tM=S{H?1MMb-YRrh$YhorJ1cJmOK zd8kZl#u6^*)_Yns`J(J`?{MtLU-xY&ZEcn-SMb!_&RULBm@J@%&C&6u%kXRzjeWcR z$|5~uc<@bTl~)!q*R6!=k8HsCp00ITjBchiim~jC0rS`%wp2A|xoU6j*7c*ch4po= z@B+YRIx#D3Xhn58Vj|4kJFUk{x9)P?;8C7^-xP`Is6;DeT2-q%Wv@={Uq zWZL-Kfue<$1slhy@U6AQxYC?IHcEg(xYat(Hm5*zI2#mdHgQH%L)C^85#D$D#1-wH z23kXuZZ&QCov~E_Ahj7W45|?|(ScibX)N$-5+^FQxpc$r%{J>U;X=d?X||d^Dq0vH zv0)MFSDg@(ZUJ(;#r0xdlxy6A*Z5nx-ff{c)>RoiJH5E(RQ&P%)fb1e^g!en5q;6= zD_Mu?y%gnbfqcMBOfA9ZYkVq${SjVbHrQlPJ*=C*+?DrNUioJW&Y02_Wr`~)YFV>d zEJ^|Er&xC^RxrOl%wn-Z!;ZD0vpDrd?9Zv9;f0>_oz4}nqSwZr+A{7ot%$B75JeaT z&$|knf`AUvhwW?g{9TFk&0hk7W+^o$HM$%j7J-VVmMPa?4rh#Lv*&Bw2?A7?5Q?z9 z-?cNqnr-9jwdgr2D#wa(j{S}E*^2eGd*H^3!L8GQX<_#qOE!n?v%KSiPrp1NTA;3p z8_D3Xy3NJPAV&FnR-3)k_i!MSKf~O0qNVV^ZUVEyfwluJWm9Vo9=W|88tyumkkfRb z3|p2rJ&Acf&%~A@MY)ln_r)!v@W5^Zt2FEWGL_TR_|-t-N_mn{O*mgwR8gNQ7LQ2(tE;p@M!ENx@NCBpJcmO?(3vjN+>8gKPv3bELL*|># zlka_sW+WAqKbtdr7p$PKe~53aWk1SbpS`qE@*$2Hy_a@JS&i24C(`hJogT!4ECl| z0xk^*{0PJSiG`>qGe5a&H^cBL z(RC6%^_2D;le-|-5{*0ni+io=few4Lg!FLC>D%7>6l&ZeaY9k!(P7Ji~iw$phnvNtYl^z1rf4|_8j^AQP z`RH5z6|aJu96?pko&|*{r=p(<8)-lHm8H_Ni>{^q?#I4G{vV^;y1P;ox67J>)5f3+ zE*{0<^3@Wrp08d8CWDE@tw4L8@h$PF?2JoW7qIP*XCrX3uHTOn&pRw(G%xY+*u`}D zj+%8yNRpnG05NMQ4fHF77``(Lv^YDwB(VssxW9+&I@|6`K1hrqJOg@={3LfBM|XOL zF1;WB0elRpLh=H6Ah?}qiOUNZT6~|{xlg)-;8B-fuDMeSK1HUUZa0$l@COYGths?}NSMQn(JraHpPuW2BeZ z12FpPh=|Jjt=PKEI7l4wgZM+lZh8L^17Kk4!`DzBkh7MzEWYxzE>c@ynHQz)cM|~& zXT??pJhEzk{X8j9J^GUBmIsMZeIZ2JL;qS!jRPInfgrqGDD-F_`$|==NuNJOR(YG~ zzV&W?3=Qr_0f%cmdrnUEPq11F^zs%Xi1crP3$vLHVES6zcZ zlmha4g|L*q+QhmNn#l{GQsEIB;!FxOSz>V?H^Lh+VG&;f>R$TOjuB zCqNM5{3%eC`hYk*IZFiBqixj}6r!8`|B^QWSl_4Da^0kFq_-F}t+{yBG#U${pc@04 zEyX==+~Xc6fZee8lm};3)-Wyfc4!R{mxtSO#VeN*B+)vi9Xk}hcnCAxggq9toxLTw z=_yd*n(jiRfH-@I?mNc@$Map*gs8H4MT#+s^`FgdzR=B^Us%k?gTnfsz8R^)Z zwvngB^kwD#j)m9d$D)1}rCLz+`MDgca4F>*KG(STjyDC z#@Yb=KF?tD{I~1@P#y+82@+{qKJrW=cg-(g$*F$A zH^P9uJFK@2OaO-NMIT%e=55sc9$IT=h`n)nYmr`C*Ff-D9>}#7FGl=Evnli=C96@V zu)G)iXK)x!f1`;`tW(URcfeXdsR7A@kat-JSKiW;WQZ+7<~XB~Kj?btIyHLmKXJj_ zpUn;CEmdpqwJ+)=y}-WjC=N(z5{)!Ew~zR1DlCx~V5L$=L+f+kb8k#4X{nkh>dHlCitrd>Q2?0lz~~FiU4YZqi%Gu43^b$z!x^9 zN>oQl{yYTCgYLN`G+;qGMwjVZKSRq~73efyT_T~0GLFgf{1))7r>;3?csC#mw_J9c z*mD~6s&;uQKffO*NAP+hsJ@-v6)2eThILf!*cJzsY;6)L1Ne&GVg2`Jst($}Zi?P= ztyfs&1^9hw5>^OLCvE2AHAFhBI$?q*)8u*Vc%w!fo0)BTItg$ zmKVb!>S}HMoSC((e3v%Y^4ZU7U(1tZl(4=vaEPeY~K>;=qB z__3+?$ku|bnrXFCbTy6I#s1=Z8CW3ntbk4Y92g|jQES>C1sXMkpTg|-xOK9uP3AJ z0D+IQ2qjyQ4&i608Ch}E(~X!F-+940^^AI^R7{A+k*4X!Th+8t7gFH#Ujxm3v$c|) zC*^WHq7~#1&z?%GS|j=)#m=F1)87?<^f0yy*jnQxy>)1p9mZ!}_U_BJo;r8JsU7sX^zeXHk1 z`M$r0*o}4}V(bkVt~XMu4xde2cZp8-zkmUn^b(~I)kc)b(TN1V)r_mDkINEhq}dnN z_2V}J%DOqYlkz(-CZUp>Bg|lm4DG|-#s`o~6A3h*FJg<2+8*LFn~mXne`6ZGQBlVU z$&L$ho1sdp&2IuX2OuP1P&+w#)3opyV34X)4c(tJQjb9%B)}eqCU=&x%@#3Z;2TXh zDIeQ5GlMoBajUk07o;UWY(qd%m*yOMp^nAdK6#EZ`(A4 z2mU?U*<_WA)@bPCFYhC8MCObG{&KwTbH^uAM6$rbHQ!?Udh1?JWLTOuCM8bG>2?v0 zM(P6!2@CXKN$#W7nAT!zPO0em$e{Z5scGN)BdOW-Rq)0Oy1Rr63fQ+@toNIFa@ZKq zdh|mWTIaHfr~&;Rac+fSb5xTi@jawPoGP|Z*NMn(B{Q!I;ut6#tp~!S1$oC1FLRF} zrADG%%9F%LtA@aH5yW1y;p3~RgSWtdWK;xj&7(0DY)vZzKSQ9GY!IJcb`zN@4wJ7f zCA&P=tN*&l!W*_SMAq1S)XDIjLO3YIr_E(7q~&lEi2@4AzAxaj^r^|vZzifLffkMq zr~;`*Fn%`GN77#JiWPJl%PDY}4QXkocS2Yc2m5S^s@x`i7F4ss{hcWq&BkqTP~Hwt zfq5C!XJZio@Blnq2Qyy@RulHc{CcLPJH!~db z4mjxo8?yU{gW9Cw(%FvLTTeeJY8s~f&{`~9KgqR({q<>9^LG_4VFMZkNPd9_l6w(H zki9MzGw-V55gm`o*Sh;_-_wD(|B;~^C9$CwRviVZeq1{%j4NP+yCQmK|H8hF%wkN+ zPwsI7BH;e2(Ng+K<5&zfV|X7mQ@p5lmY3Y~T4jFIn$^cH5xXs``Uqf%A1J+k%W`pf z3?5&WQ*M!0j+{O8-Wb;U(iRS!2VYW_$z|d;WV!u})W{&(Y`Jl4kPZ*?2`lXCEelVe z$=@3Y2L?j$$Wq`;qS|u zzD?g3>kn9{x|^+!iv^g+6oji)RjCTsqc;<2*)LhZP;!6sQR{4A5}qFrpK@sM?Q);n zO-hgvj%ohZXsCcySjK0-2=V>R^UU(tsCWI4z)RISi1^VTuiLa8E2goFw*+ulaUN}| z3Agk6xahuo@|Jc{$U}LeHtSc_p9YL0NF`U-P6zbcZ`7d$9Eo#5Zc&;`;Dem8<*~=N zTc+klLe*N%ch7|;lL;KTEY?=<4@FHoMG(vVq*%fBQ?Nz6r)tyGz)7V&u`)U8u z1R8K3CeT1d@?*btjRaTN3byh;8^`2C5inBjc$sPa*Di!>VFCL@Q)=|he$UYk>JeyW zFZWCzol`s80YsY%7}LD=##!Od1?)%-_EyQjan9A?62_z~ns%AnQGT2^B$7HqAnQHV z+4n7aj?O)OMtt5zB%`+-O_c*{wp|#_Z+LffSLgq*hu5bl(>@L??>9Cn9h_KSrU0ZX z88w$d6(V~{iC$XF)v}GI0iy@Fo{<2p2j?6J7H%nEXD;Wg4F5Q%X_4I>p<%0lLp_K3l6?L zon*kUWO*+Dmp|~CjMo}F{psJfF7QV^yx{?mb@`XIb>apL;jRLAA7Fe*cM>hTBXQK^B2z-iPupXW%uDD(z#e_x*|kK8kE0b){diWZHo!h; zl`s3Fkx5Q&RZ$k7lB0=G4-AM*Z4kj2iQif)vdQXls-j>?l%8O*xSX$c*%CO5a0A8{ zVrn&8=6xcq$HKH|$NJ%q{a^O*7MEt`_Eka(rSD&@zY5`}U<%l#qJE8LvhU7%&?YX7 z?!ek;2J}x)HZ33k?KyuD48AFj7*(M8ip(s8nj=wyJ4s-CQs#^E9LdDhfBB%Z!#A6r z#@Qo>;PoU??H&duV>-Di4Rlc&bSHSi5*Y0Qj0hl4u2-XVr zox$-P{qYL>+x&9?^XIE}T)@7BlZER5Z#ps(&TR$#J`S zd%u98q#RTMySB_UHIV1M%~guMz)=VvFSdBzx{!A%B5tsVTCZM{x44cb%gGl(?|xj%x=8d;?^*=S<#JY!5EOCJAA zf<<#@m&w9m4{QAbdQWAYF@9srh+e;cmu%Kg;AkF|$7i}0_~-8kn{_RZui`JyMGcJU zsEiqiDt(DbEA{EhL4`y5RgyW2YH7EqW;+fL5IYx~$FFd$qDJIk4&YM0g1F}L1HstA z+MyEyGy}$V0Xg%x!ETof+N_V&B#fB%5;!j+K0ZT4p6V+Und1-D-F%bqtL2Qbd3k2; zZ=P6@d3@VO0sR%%DtgIGBOoSbRnwBmDnLS_w^Q#nC;mpcsZb2e%Uv<1u5ZRE2X-RK zLJ@YFK0*Ftr6J)CVB&@AJN3o>ifv|Or5GZQ(m2reIqkBZl)pCX1@5&y!?hpBgv`B{ ztsF&({^rOpZmu~>p+ODX9{rr^7NWxJuB+@7LyW$TqEWM}0)SIRzQ$m=-{y<9UcRfa znuM6mK6a=TNN?%~;@9*Aa50yZI=9g7WsFHqY1nUbgXj0e+0Ok;HR(qOW(>X!0cmGx zbIpxc<0&L#o4}#&q=WZUXft->7>enS1nz0}4+Y6Qi^X3%ec|ElPCQksmA!OevbrCr zzxJ2%Tl33BRr3Ez(-3hqxlq1&**+V31SoTnIL6E4{=jSz7?~*&X*&hLd!6a!G2LnM zA{jdP);MyI^ZLD}H~d*j5|SYv!Y9wol@+?B63oW2h4M*<(UC4P^MN1^MtI5gI5uUg zV#>me$h%`-a%FA@DKljd1U;dSLkAAV?*(b^gvK=mO%?TTIxj`Xk!#~N8ve(CiJ4F^ z^1bAENDHV2yxG=CcAEi0YVU-RO@{yT$!v#gonfHx$jj8^07qhf6Xa1}07d#wUvzwH z0h|&1F?&QyEh;C0mgw&q8?cc`ODs|NEk@Q~d3-S9#S;ELxtd29msqnmj#mMpH`T6+R1`|YZWPTO_aRp8`PNPiIpT6g++ zH4IJdB!?!im$5-_jVLR;3Uco6joH?~p-@m(0?k%f8ElkRcCg0v#}8&1FqB`s zjxmKLeMY{^+y!)or{I-6anvI@#r}hwHxWsgPtr}}kB|maQ~FL*&EuWW$y^OCRLu>R zR~~=#^I^By;Mp^RxNx!(Fj|+|#?h!a=F1)1dR1QC*U3)mvIbG%z1g)oIagD2 z-+wcGrfDnIeP;8EL$uLO&Yzdc<7+OFpn1(&gJrwP%#wXc{7idMgf7+(2vJazAMemgjt$c29l0`d&@0(c(|-DG z>HwLEsEbcIsYajy`q4<@#p3-C=K2XZ8jw*>)e^OQaJp}5XKh0(-YpIZ558_1@0^dX z!C}gW@#DJlQ6j`Uzj>kG+yv?&Wo!mT?qK{wa(tOyiSfmO>44Uk+vSoz$g_#7+>YhU zj!hKztZFql8q^gx6tE+t_w(8PNTBs2!xE5IJ3HDgtZ)(Y&xdHt#>C`|r z+M8Gf)<)r&UZ0`ah0}}?BZfT#S*o)$pT1BN(C-R(;j8jvN%1dgE5X`L28_lU@#2E; zde`P+M{CS)G6jD|{;XaT)O0l&uIm*H9x223rafxP-tkpm(%YD> z>HEn<6X4djxAKrM_#KXEm^IcAe!C=R@KP^(=`hOdcfb$LP0y&dUN~d=Bw*kZ%E)6z z8zt7=DHl5I2PCEGCYkw`GWL#;KIlh$e>?21Bchc)Ux~)rQeN%Fg(lAskcr?|chDmE zVJ!?WUj1Fvn?a2$`2cUQ1=#8+j`OfN08d^ZaFFu}LnCd#Rj!!M>#d9(|1Uu47agYG zV$iP$;0}}ODzCZVr8SvbNeMJ_5`pu0%YYI7LbH?`RtUpxxdAEECMMd%ytdScPY!y){l4Y_r`JS`uQ-ThmJ^tS0F?*R1%e|@l-U{+uRBXMl?n=Cban}#BDle8qiSAhDYMD(A5Y5tOty{>< zS->4ifC#BDRc2jy!IqQvb?V~=-*4q8SioOQlbOQQILPgtND&ol=1I|29T7xJE+W@r zQK>t(Mw7SdDr4GfDTcG@VC>@pc1ds#S(>Wf`2LQ6(Eik7itlBh{=Kwm#5%p~l)V** zS8h1mK|rb)_!cJ6#0DIjUA~kdg849`S9h}TY>;(*qyP>iXy#$^>zVgcaRiCXJnUb= zo)CQ>9--~Pg6?!#I)20>IwBi7ByZhsfrLg1w*)qOmOP9m8`4J-u7T|}cOjaRg}L=* z8dhz+p@&z*AA%^}M@>7=bN!Y-Fu?jaD^>lidU)|yw9)iM z@hS)Ne8*5WBD|V**d(QH&#lvULAow19WJ0xdOAJTW}%6$x{^II=+=5d=Br^El4c`v zG0eGNMNG^b7ze<9;_vCDz7LB&W)XYAROm0Y(%hxSF;CMcArtk`XD6RZbcz2M{Ij~H z4sUyYpetsOg8}=>imc!U&u`X0`fj`Hm~YAVo|1IgyI!Zm0;-FWMs*7{j9Jy!HKmqS zJUMWTsV>lYYNx{vdt01F04J~Wky>Ze`=TA1d!zesEz?Uq%pWOk={51%glXGZUgh?R zUFXN>RhW|R?Cp1RoFo1fQ|GtLD5E)Fr_#SE5DwpXTv^(bhqp?+H*jR`=|uMcyoXvu z4w@#d^9N?orStGAJGbaWg&5OB03FNm|2&qtQ4Msc7{#BuCUjn}*zTY$lgEX7QEQsc zrSj|H$n&G_SW>MWU$f3r>O8dzk#{s;V3$JwVs~c(VFN3WLK;5W_;~D7!{uW$bdha7 z@@KzlmqYw}HgF_A=eg_F&s-2c;QlqAS$&}Xl_$iZYUJMuux1jDtdoa?6Ldw08##4J zBoz@zquEk$K>x(XmN8RGG)GDB6m*Vh#i(}hUcY%FX^Y3 zOhrG7Zr9&Xi|L04Gz~u8kUpfS0 z^MAe4$ejXnKmYOe8u&}!!Gsnwi)_Z4GgNb0M*qkvcD!bQMKM|lSJM;Gq`M!>&iC`Itw z{h!3_ybmfg11nGW=A~H`8p4ci0ZR6Jdc_1@sJ=@47{a^JA2jl3Rm}A6=6=0qU&gY? yi`!LKt9SFb0e2SvuL$-3SMBDnZ{_jq;WL+}dt5aJ`Q>J#T!$`yjx9%4tvHPozW6{(#|oa`n$ zJL_Es7&t`g2iEh9Ry!@$^Nd3F)lMhHcuINMl3LF*S}rt}3k?AM)%D?GluFK$*=)1m zx(Io6?#0HVeCpLnXep z2VL8}7<`G@1UZUuW+97UD3Cv>eH#}^CB7#x_asR=$lY%Ck2#lo$`8Zf|7He{*z8<& zS^#^qJ~_{4H+%{J&)zp*0n`l6U!VXG5s{RV0FYAZ4B!ahAf-G2I0t;lBt}w7s_U98 z@;oO1A2GpWPLhdI3PN;ZODSQLf4RuQ^BIrFAnJtITBB(iPo|^-z|52wj;eHx^f&gm zM-ki?MFAqRd&dSonQm>3pIsll4yB z+8&g;sd)Gjn+aMnVwr^|f~i1yP-~qPMJ1jR*m{x_9pti`^)V;Oms}Vg{xJGFc<)~Tyh)>|C!z~k`;PF@hll{+{W~PDfxY(^ zSs0&tX#;?Xh_$SJ#|(P;KN0ms1VaeS%-ptZ4B9J#0ML(tdLe7ycC`H(63FpGdH{zU ziR@Xt-|x{hjp^&I`FihBRYPMF5oWVl_B~TC3vp!RZZj#}hib07;26uq%T1WnR3s~yk~BrdtSSB% zNLsi#J9F%2N#4a>Q{1-(L*H23{1hh>Oi?7|EKDNUl_)-_V_zz=rg%)^)SD#hA`f?S ze9eXAbAA|Z{%_{y(N~=Xh8EZncx&xb`<(XpCmr!7uz!x=d&S9GD;{-SUu|QI0J7ij z1rR`tF=rt5pMm#i+%kxfpt#ZaKp+}a0PzJBMIpwRn6Q68N8`ShWho*e)>_|x5WUAt zS(b-8GoDI$w=4y6=_!vU@JpBDaoyWOIc!dmOUZH5AR?_%fNP-0)XDvAPQ3|ebM zE}xsG!8z9%=nDtfY&Ohhv%!k`6b#i;z_0chHo6pz)KNj78gN=`lv3<=yHCjt5j+L$ z!bF7Wbc!*?6Z8IK5O?$&!z(2s)OGFsx+VP{v_Y1A$IL#kCmoA9K4yNj_FMZt0q&xh jhgL=Y#xe7S{|3JSWuYs>r3pnZ00000NkvXXu0mjfmf!kD diff --git a/plugin-repos/march-madness/assets/logos/MARCH_MADNESS.png b/plugin-repos/march-madness/assets/logos/MARCH_MADNESS.png deleted file mode 100644 index 304f870b18de227c22d9aa4d868d6347627ab6f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmVXqcVdj+$~%x=GI+!V{IOX<|4Cr0|-zmLUFt%-L(#aVz$oUOTeewKpt zzP{TGW1C{AJ$Dw06-*a=$@^3*0vu9t%;u=a90lDg?s-f|GdYQZm_%mqn>IZ zd6teTc?Qtv)5Mp?4CPn`E`-p=!AwM2z|71<#DEi^s%mCts%k(#<|Bk~j*ucEr>T%r z&f>bR>$TbSlsg`e>ktCYIe@c>;Jtrpnug7018@lJxZA@3NYtvG4Hs4XpZmcUMY$hEOA=GVpWR&1d0l` zrZcZ?mf|kXrTAP8#(US|=2Ki8U?p%KoiR@mm#(j+0Pl>vq7d1=iKq@thFa|;2GE^>-$tUV$i)}b3fX=h{3agN8{ai zO~z{n`lnMwg!Ot2@HM2kZQJjY$z*4(6=Mu-+g{`}dlv^MUDu(t#yNNKSM+@!%HRaU zFkpTJeWfYpdC;cXN7Q#g6=MMT7VFMvc@M8p^)z;D0- zA|hg~72u$4SF2SdsBM2mvOzvgAt=r{Nf*#^Aahjuv-V9gcvAXv+qUnLFh*udn@I!Q zhHEm_0noNBBEn{~0r(jR-bB5%7NFVfb~H_c_ddFAb3wCraa^qLdyFwS=RW-v!!Tfs z`A~1Iy~F_6Znw;4v+R1=3=YGfzmCw7;`18LO{$BC8Et@vpnKIZj4?D#!+yUXB{znn zbM6?b_h7A^QY7c#dsJ)YY;9Qo5acX!O*Gxl6L1IID4QQiONrR4BXg&GwC%lWFZW|4 c|Kp#=AHDc)C)&o`z5oCK07*qoM6N<$f;I^EmH+?% diff --git a/plugin-repos/march-madness/assets/logos/SWEET_16.png b/plugin-repos/march-madness/assets/logos/SWEET_16.png deleted file mode 100644 index be36574bfb7a39b63da78d98843f35030e60674c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmV+k0`~ohP)LDn$3~aX3^+sIj~v|0OL1ZW5sPP zxk%>WsVVkPI9b`Er^oJmB~1iN%2vyPho@%j=W|w=Eof0{v0{~r{{~EfTa%en zlf|6HB^Q4bgX!ErGO1k*C?5Uvnw>ng_$x zzhu?i1H!TldQQ2eIPWpARmFFh#Zr#e9c)4ibsO+z+vo=?b(;e6w6H8wx}v1 zXNPi0V>X+is%*Dg3i4w{wgYg^;k}RlyNP=eJ@2eox{F&tojZl6h>XeshT&9BcDo(( z`Fz}z%LTaLg;7rTh{)Hj>%Lt=&=hja&000000 LNkvXXu0mjfR_^+Q diff --git a/plugin-repos/march-madness/config_schema.json b/plugin-repos/march-madness/config_schema.json deleted file mode 100644 index bccfe0a8..00000000 --- a/plugin-repos/march-madness/config_schema.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema#", - "title": "March Madness Plugin Configuration", - "type": "object", - "properties": { - "enabled": { - "type": "boolean", - "default": false, - "description": "Enable the March Madness tournament display" - }, - "leagues": { - "type": "object", - "title": "Tournament Leagues", - "description": "Which NCAA tournaments to display", - "properties": { - "ncaam": { - "type": "boolean", - "default": true, - "description": "Show NCAA Men's Tournament games" - }, - "ncaaw": { - "type": "boolean", - "default": true, - "description": "Show NCAA Women's Tournament games" - } - }, - "additionalProperties": false - }, - "favorite_teams": { - "type": "array", - "title": "Favorite Teams", - "description": "Team abbreviations to highlight (e.g., DUKE, UNC). Leave empty to show all teams equally.", - "items": { - "type": "string" - }, - "uniqueItems": true, - "default": [] - }, - "display_options": { - "type": "object", - "title": "Display Options", - "x-collapsed": true, - "properties": { - "show_seeds": { - "type": "boolean", - "default": true, - "description": "Show tournament seeds (1-16) next to team names" - }, - "show_round_logos": { - "type": "boolean", - "default": true, - "description": "Show round logo separators between game groups" - }, - "highlight_upsets": { - "type": "boolean", - "default": true, - "description": "Highlight upset winners (higher seed beating lower seed) in gold" - }, - "show_bracket_progress": { - "type": "boolean", - "default": true, - "description": "Show which teams are still alive in each region" - }, - "scroll_speed": { - "type": "number", - "default": 1.0, - "minimum": 0.5, - "maximum": 5.0, - "description": "Scroll speed (pixels per frame)" - }, - "scroll_delay": { - "type": "number", - "default": 0.02, - "minimum": 0.001, - "maximum": 0.1, - "description": "Delay between scroll frames (seconds)" - }, - "target_fps": { - "type": "integer", - "default": 120, - "minimum": 30, - "maximum": 200, - "description": "Target frames per second" - }, - "loop": { - "type": "boolean", - "default": true, - "description": "Loop the scroll continuously" - }, - "dynamic_duration": { - "type": "boolean", - "default": true, - "description": "Automatically adjust display duration based on content width" - }, - "min_duration": { - "type": "integer", - "default": 30, - "minimum": 10, - "maximum": 300, - "description": "Minimum display duration in seconds" - }, - "max_duration": { - "type": "integer", - "default": 300, - "minimum": 30, - "maximum": 600, - "description": "Maximum display duration in seconds" - } - }, - "additionalProperties": false - }, - "data_settings": { - "type": "object", - "title": "Data Settings", - "x-collapsed": true, - "properties": { - "update_interval": { - "type": "integer", - "default": 300, - "minimum": 60, - "maximum": 3600, - "description": "How often to refresh tournament data (seconds). Automatically shortens to 60s when live games are detected." - }, - "request_timeout": { - "type": "integer", - "default": 30, - "minimum": 5, - "maximum": 60, - "description": "API request timeout in seconds" - } - }, - "additionalProperties": false - } - }, - "required": ["enabled"], - "additionalProperties": false, - "x-propertyOrder": ["enabled", "leagues", "favorite_teams", "display_options", "data_settings"] -} diff --git a/plugin-repos/march-madness/manager.py b/plugin-repos/march-madness/manager.py deleted file mode 100644 index cd0d8c73..00000000 --- a/plugin-repos/march-madness/manager.py +++ /dev/null @@ -1,910 +0,0 @@ -"""March Madness Plugin — NCAA Tournament bracket tracker for LED Matrix. - -Displays a horizontally-scrolling ticker of NCAA Tournament games grouped by -round, with seeds, round logos, live scores, and upset highlighting. -""" - -import re -import threading -import time -from datetime import datetime, timedelta, timezone -from pathlib import Path -from typing import Any, Dict, List, Optional - -import numpy as np -import pytz -import requests -from PIL import Image, ImageDraw, ImageFont -from requests.adapters import HTTPAdapter -from urllib3.util.retry import Retry - -from src.plugin_system.base_plugin import BasePlugin - -try: - from src.common.scroll_helper import ScrollHelper -except ImportError: - ScrollHelper = None - - -# --------------------------------------------------------------------------- -# Constants -# --------------------------------------------------------------------------- - -SCOREBOARD_URLS = { - "ncaam": "https://site.api.espn.com/apis/site/v2/sports/basketball/mens-college-basketball/scoreboard", - "ncaaw": "https://site.api.espn.com/apis/site/v2/sports/basketball/womens-college-basketball/scoreboard", -} - -ROUND_ORDER = {"NCG": 0, "F4": 1, "E8": 2, "S16": 3, "R32": 4, "R64": 5, "": 6} - -ROUND_DISPLAY_NAMES = { - "NCG": "Championship", - "F4": "Final Four", - "E8": "Elite Eight", - "S16": "Sweet Sixteen", - "R32": "Round of 32", - "R64": "Round of 64", -} - -ROUND_LOGO_FILES = { - "NCG": "CHAMPIONSHIP.png", - "F4": "FINAL_4.png", - "E8": "ELITE_8.png", - "S16": "SWEET_16.png", - "R32": "ROUND_32.png", - "R64": "ROUND_64.png", -} - -REGION_ORDER = {"E": 0, "W": 1, "S": 2, "MW": 3, "": 4} - -# Colors -COLOR_WHITE = (255, 255, 255) -COLOR_GOLD = (255, 215, 0) -COLOR_GRAY = (160, 160, 160) -COLOR_DIM = (100, 100, 100) -COLOR_RED = (255, 60, 60) -COLOR_GREEN = (60, 200, 60) -COLOR_BLACK = (0, 0, 0) -COLOR_DARK_BG = (20, 20, 20) - - -# --------------------------------------------------------------------------- -# Plugin Class -# --------------------------------------------------------------------------- - -class MarchMadnessPlugin(BasePlugin): - """NCAA March Madness tournament bracket tracker.""" - - def __init__( - self, - plugin_id: str, - config: Dict[str, Any], - display_manager: Any, - cache_manager: Any, - plugin_manager: Any, - ): - super().__init__(plugin_id, config, display_manager, cache_manager, plugin_manager) - - # Config - leagues_config = config.get("leagues", {}) - self.show_ncaam: bool = leagues_config.get("ncaam", True) - self.show_ncaaw: bool = leagues_config.get("ncaaw", True) - self.favorite_teams: List[str] = [t.upper() for t in config.get("favorite_teams", [])] - - display_options = config.get("display_options", {}) - self.show_seeds: bool = display_options.get("show_seeds", True) - self.show_round_logos: bool = display_options.get("show_round_logos", True) - self.highlight_upsets: bool = display_options.get("highlight_upsets", True) - self.show_bracket_progress: bool = display_options.get("show_bracket_progress", True) - self.scroll_speed: float = display_options.get("scroll_speed", 1.0) - self.scroll_delay: float = display_options.get("scroll_delay", 0.02) - self.target_fps: int = display_options.get("target_fps", 120) - self.loop: bool = display_options.get("loop", True) - self.dynamic_duration_enabled: bool = display_options.get("dynamic_duration", True) - self.min_duration: int = display_options.get("min_duration", 30) - self.max_duration: int = display_options.get("max_duration", 300) - if self.min_duration > self.max_duration: - self.logger.warning( - f"min_duration ({self.min_duration}) > max_duration ({self.max_duration}); swapping values" - ) - self.min_duration, self.max_duration = self.max_duration, self.min_duration - - data_settings = config.get("data_settings", {}) - self.update_interval: int = data_settings.get("update_interval", 300) - self.request_timeout: int = data_settings.get("request_timeout", 30) - - # Scrolling flag for display controller - self.enable_scrolling = True - - # State - self.games_data: List[Dict] = [] - self.ticker_image: Optional[Image.Image] = None - self.last_update: float = 0 - self.dynamic_duration: float = 60 - self.total_scroll_width: int = 0 - self._display_start_time: Optional[float] = None - self._end_reached_logged: bool = False - self._update_lock = threading.Lock() - self._has_live_games: bool = False - self._cached_dynamic_duration: Optional[float] = None - self._duration_cache_time: float = 0 - - # Display dimensions - self.display_width: int = self.display_manager.matrix.width - self.display_height: int = self.display_manager.matrix.height - - # HTTP session with retry - self.session = requests.Session() - retry = Retry(total=3, backoff_factor=1, status_forcelist=[429, 500, 502, 503, 504]) - self.session.mount("https://", HTTPAdapter(max_retries=retry)) - self.headers = {"User-Agent": "LEDMatrix/2.0"} - - # ScrollHelper - if ScrollHelper: - self.scroll_helper = ScrollHelper(self.display_width, self.display_height, logger=self.logger) - if hasattr(self.scroll_helper, "set_frame_based_scrolling"): - self.scroll_helper.set_frame_based_scrolling(True) - self.scroll_helper.set_scroll_speed(self.scroll_speed) - self.scroll_helper.set_scroll_delay(self.scroll_delay) - if hasattr(self.scroll_helper, "set_target_fps"): - self.scroll_helper.set_target_fps(self.target_fps) - self.scroll_helper.set_dynamic_duration_settings( - enabled=self.dynamic_duration_enabled, - min_duration=self.min_duration, - max_duration=self.max_duration, - buffer=0.1, - ) - else: - self.scroll_helper = None - self.logger.warning("ScrollHelper not available") - - # Fonts - self.fonts = self._load_fonts() - - # Logos - self._round_logos: Dict[str, Image.Image] = {} - self._team_logo_cache: Dict[str, Optional[Image.Image]] = {} - self._march_madness_logo: Optional[Image.Image] = None - self._load_round_logos() - - self.logger.info( - f"MarchMadnessPlugin initialized — NCAAM: {self.show_ncaam}, " - f"NCAAW: {self.show_ncaaw}, favorites: {self.favorite_teams}" - ) - - # ------------------------------------------------------------------ - # Fonts - # ------------------------------------------------------------------ - - def _load_fonts(self) -> Dict[str, ImageFont.FreeTypeFont]: - fonts = {} - try: - fonts["score"] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 10) - except IOError: - fonts["score"] = ImageFont.load_default() - try: - fonts["time"] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8) - except IOError: - fonts["time"] = ImageFont.load_default() - try: - fonts["detail"] = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) - except IOError: - fonts["detail"] = ImageFont.load_default() - return fonts - - # ------------------------------------------------------------------ - # Logo loading - # ------------------------------------------------------------------ - - def _load_round_logos(self) -> None: - logo_dir = Path(__file__).parent / "assets" / "logos" - for round_key, filename in ROUND_LOGO_FILES.items(): - path = logo_dir / filename - try: - img = Image.open(path).convert("RGBA") - # Resize to fit display height - target_h = self.display_height - 4 - ratio = target_h / img.height - target_w = int(img.width * ratio) - self._round_logos[round_key] = img.resize((target_w, target_h), Image.Resampling.LANCZOS) - except (OSError, ValueError) as e: - self.logger.warning(f"Could not load round logo {filename}: {e}") - except Exception: - self.logger.exception(f"Unexpected error loading round logo {filename}") - - # March Madness banner logo (also in plugin assets) - mm_path = logo_dir / "MARCH_MADNESS.png" - try: - img = Image.open(mm_path).convert("RGBA") - target_h = self.display_height - 4 - ratio = target_h / img.height - target_w = int(img.width * ratio) - self._march_madness_logo = img.resize((target_w, target_h), Image.Resampling.LANCZOS) - except (OSError, ValueError) as e: - self.logger.warning(f"Could not load March Madness logo: {e}") - except Exception: - self.logger.exception("Unexpected error loading March Madness logo") - - def _get_team_logo(self, abbr: str) -> Optional[Image.Image]: - if abbr in self._team_logo_cache: - return self._team_logo_cache[abbr] - logo_dir = Path("assets/sports/ncaa_logos") - path = logo_dir / f"{abbr}.png" - try: - img = Image.open(path).convert("RGBA") - target_h = self.display_height - 6 - ratio = target_h / img.height - target_w = int(img.width * ratio) - img = img.resize((target_w, target_h), Image.Resampling.LANCZOS) - self._team_logo_cache[abbr] = img - return img - except (FileNotFoundError, OSError, ValueError): - self._team_logo_cache[abbr] = None - return None - except Exception: - self.logger.exception(f"Unexpected error loading team logo for {abbr}") - self._team_logo_cache[abbr] = None - return None - - # ------------------------------------------------------------------ - # Data fetching - # ------------------------------------------------------------------ - - def _is_tournament_window(self) -> bool: - today = datetime.now(pytz.utc) - return (3, 10) <= (today.month, today.day) <= (4, 10) - - def _fetch_tournament_data(self) -> List[Dict]: - """Fetch tournament games from ESPN scoreboard API.""" - all_games: List[Dict] = [] - - leagues = [] - if self.show_ncaam: - leagues.append("ncaam") - if self.show_ncaaw: - leagues.append("ncaaw") - - for league_key in leagues: - url = SCOREBOARD_URLS.get(league_key) - if not url: - continue - - cache_key = f"march_madness_{league_key}_scoreboard" - cache_max_age = 60 if self._has_live_games else self.update_interval - cached = self.cache_manager.get(cache_key, max_age=cache_max_age) - if cached: - all_games.extend(cached) - continue - - try: - # NCAA basketball scoreboard without dates param returns current games - params = {"limit": 1000, "groups": 100} - resp = self.session.get(url, params=params, headers=self.headers, timeout=self.request_timeout) - resp.raise_for_status() - data = resp.json() - events = data.get("events", []) - - league_games = [] - for event in events: - game = self._parse_event(event, league_key) - if game: - league_games.append(game) - - self.cache_manager.set(cache_key, league_games) - self.logger.info(f"Fetched {len(league_games)} {league_key} tournament games") - all_games.extend(league_games) - - except Exception: - self.logger.exception(f"Error fetching {league_key} tournament data") - - return all_games - - def _parse_event(self, event: Dict, league_key: str) -> Optional[Dict]: - """Parse an ESPN event into a game dict.""" - competitions = event.get("competitions", []) - if not competitions: - return None - comp = competitions[0] - - # Confirm tournament game - comp_type = comp.get("type", {}) - is_tournament = comp_type.get("abbreviation") == "TRNMNT" - notes = comp.get("notes", []) - headline = "" - if notes: - headline = notes[0].get("headline", "") - if not is_tournament and "Championship" in headline: - is_tournament = True - if not is_tournament: - return None - - # Status - status = comp.get("status", {}).get("type", {}) - state = status.get("state", "pre") - status_detail = status.get("shortDetail", "") - - # Teams - competitors = comp.get("competitors", []) - home_team = next((c for c in competitors if c.get("homeAway") == "home"), None) - away_team = next((c for c in competitors if c.get("homeAway") == "away"), None) - if not home_team or not away_team: - return None - - home_abbr = home_team.get("team", {}).get("abbreviation", "???") - away_abbr = away_team.get("team", {}).get("abbreviation", "???") - home_score = home_team.get("score", "0") - away_score = away_team.get("score", "0") - - # Seeds - home_seed = home_team.get("curatedRank", {}).get("current", 0) - away_seed = away_team.get("curatedRank", {}).get("current", 0) - if home_seed >= 99: - home_seed = 0 - if away_seed >= 99: - away_seed = 0 - - # Round and region - tournament_round = self._parse_round(headline) - tournament_region = self._parse_region(headline) - - # Date/time - date_str = event.get("date", "") - start_time_utc = None - game_date = "" - game_time = "" - try: - if date_str.endswith("Z"): - date_str = date_str.replace("Z", "+00:00") - dt = datetime.fromisoformat(date_str) - if dt.tzinfo is None: - start_time_utc = dt.replace(tzinfo=pytz.UTC) - else: - start_time_utc = dt.astimezone(pytz.UTC) - local = start_time_utc.astimezone(pytz.timezone("US/Eastern")) - game_date = local.strftime("%-m/%-d") - game_time = local.strftime("%-I:%M%p").replace("AM", "am").replace("PM", "pm") - except (ValueError, AttributeError): - pass - - # Period / clock for live games - period = 0 - clock = "" - period_text = "" - is_halftime = False - if state == "in": - status_obj = comp.get("status", {}) - period = status_obj.get("period", 0) - clock = status_obj.get("displayClock", "") - detail_lower = status_detail.lower() - uses_quarters = league_key == "ncaaw" or "quarter" in detail_lower or detail_lower.startswith("q") - if period <= (4 if uses_quarters else 2): - period_text = f"Q{period}" if uses_quarters else f"H{period}" - else: - ot_num = period - (4 if uses_quarters else 2) - period_text = f"OT{ot_num}" if ot_num > 1 else "OT" - if "halftime" in detail_lower: - is_halftime = True - elif state == "post": - period_text = status.get("shortDetail", "Final") - if "Final" not in period_text: - period_text = "Final" - - # Determine winner and upset - is_final = state == "post" - is_upset = False - winner_side = "" - if is_final: - try: - h = int(float(home_score)) - a = int(float(away_score)) - if h > a: - winner_side = "home" - if home_seed > away_seed > 0: - is_upset = True - elif a > h: - winner_side = "away" - if away_seed > home_seed > 0: - is_upset = True - except (ValueError, TypeError): - pass - - return { - "id": event.get("id", ""), - "league": league_key, - "home_abbr": home_abbr, - "away_abbr": away_abbr, - "home_score": str(home_score), - "away_score": str(away_score), - "home_seed": home_seed, - "away_seed": away_seed, - "tournament_round": tournament_round, - "tournament_region": tournament_region, - "state": state, - "is_final": is_final, - "is_live": state == "in", - "is_upcoming": state == "pre", - "is_halftime": is_halftime, - "period": period, - "period_text": period_text, - "clock": clock, - "status_detail": status_detail, - "game_date": game_date, - "game_time": game_time, - "start_time_utc": start_time_utc, - "is_upset": is_upset, - "winner_side": winner_side, - "headline": headline, - } - - @staticmethod - def _parse_round(headline: str) -> str: - hl = headline.lower() - if "national championship" in hl: - return "NCG" - if "final four" in hl: - return "F4" - if "elite 8" in hl or "elite eight" in hl: - return "E8" - if "sweet 16" in hl or "sweet sixteen" in hl: - return "S16" - if "2nd round" in hl or "second round" in hl: - return "R32" - if "1st round" in hl or "first round" in hl: - return "R64" - return "" - - @staticmethod - def _parse_region(headline: str) -> str: - if "East Region" in headline: - return "E" - if "West Region" in headline: - return "W" - if "South Region" in headline: - return "S" - if "Midwest Region" in headline: - return "MW" - m = re.search(r"Regional (\d+)", headline) - if m: - return f"R{m.group(1)}" - return "" - - # ------------------------------------------------------------------ - # Game processing - # ------------------------------------------------------------------ - - def _process_games(self, games: List[Dict]) -> Dict[str, List[Dict]]: - """Group games by round, sorted by round significance then region/seed.""" - grouped: Dict[str, List[Dict]] = {} - for game in games: - rnd = game.get("tournament_round", "") - grouped.setdefault(rnd, []).append(game) - - # Sort each round's games by region then seed matchup - for rnd, round_games in grouped.items(): - round_games.sort( - key=lambda g: ( - REGION_ORDER.get(g.get("tournament_region", ""), 4), - min(g.get("away_seed", 99), g.get("home_seed", 99)), - ) - ) - - return grouped - - # ------------------------------------------------------------------ - # Rendering - # ------------------------------------------------------------------ - - def _draw_text_with_outline( - self, - draw: ImageDraw.Draw, - text: str, - xy: tuple, - font: ImageFont.FreeTypeFont, - fill: tuple = COLOR_WHITE, - outline: tuple = COLOR_BLACK, - ) -> None: - x, y = xy - for dx in (-1, 0, 1): - for dy in (-1, 0, 1): - if dx or dy: - draw.text((x + dx, y + dy), text, font=font, fill=outline) - draw.text((x, y), text, font=font, fill=fill) - - def _create_round_separator(self, round_key: str) -> Image.Image: - """Create a separator tile for a tournament round.""" - height = self.display_height - name = ROUND_DISPLAY_NAMES.get(round_key, round_key) - font = self.fonts["time"] - - # Measure text - tmp = Image.new("RGB", (1, 1)) - tmp_draw = ImageDraw.Draw(tmp) - text_width = int(tmp_draw.textlength(name, font=font)) - - # Logo on each side - logo = self._round_logos.get(round_key, self._march_madness_logo) - logo_w = logo.width if logo else 0 - padding = 6 - - total_w = padding + logo_w + padding + text_width + padding + logo_w + padding - total_w = max(total_w, 80) - - img = Image.new("RGB", (total_w, height), COLOR_DARK_BG) - draw = ImageDraw.Draw(img) - - # Draw logos - x = padding - if logo: - logo_y = (height - logo.height) // 2 - img.paste(logo, (x, logo_y), logo) - x += logo_w + padding - - # Draw round name - text_y = (height - 8) // 2 # 8px font - self._draw_text_with_outline(draw, name, (x, text_y), font, fill=COLOR_GOLD) - x += text_width + padding - - if logo: - logo_y = (height - logo.height) // 2 - img.paste(logo, (x, logo_y), logo) - - return img - - def _create_game_tile(self, game: Dict) -> Image.Image: - """Create a single game tile for the scrolling ticker.""" - height = self.display_height - font_score = self.fonts["score"] - font_time = self.fonts["time"] - font_detail = self.fonts["detail"] - - # Load team logos - away_logo = self._get_team_logo(game["away_abbr"]) - home_logo = self._get_team_logo(game["home_abbr"]) - logo_w = 0 - if away_logo: - logo_w = max(logo_w, away_logo.width) - if home_logo: - logo_w = max(logo_w, home_logo.width) - if logo_w == 0: - logo_w = 24 - - # Build text elements - away_seed_str = f"({game['away_seed']})" if self.show_seeds and game.get("away_seed", 0) > 0 else "" - home_seed_str = f"({game['home_seed']})" if self.show_seeds and game.get("home_seed", 0) > 0 else "" - away_text = f"{away_seed_str}{game['away_abbr']}" - home_text = f"{game['home_abbr']}{home_seed_str}" - - # Measure text widths - tmp = Image.new("RGB", (1, 1)) - tmp_draw = ImageDraw.Draw(tmp) - away_text_w = int(tmp_draw.textlength(away_text, font=font_detail)) - home_text_w = int(tmp_draw.textlength(home_text, font=font_detail)) - - # Center content: status line - if game["is_live"]: - if game["is_halftime"]: - status_text = "Halftime" - else: - status_text = f"{game['period_text']} {game['clock']}".strip() - elif game["is_final"]: - status_text = game.get("period_text", "Final") - else: - status_text = f"{game['game_date']} {game['game_time']}".strip() - - status_w = int(tmp_draw.textlength(status_text, font=font_time)) - - # Score line (for live/final) - score_text = "" - if game["is_live"] or game["is_final"]: - score_text = f"{game['away_score']}-{game['home_score']}" - score_w = int(tmp_draw.textlength(score_text, font=font_score)) if score_text else 0 - - # Calculate tile width - h_pad = 4 - center_w = max(status_w, score_w, 40) - tile_w = h_pad + logo_w + h_pad + away_text_w + h_pad + center_w + h_pad + home_text_w + h_pad + logo_w + h_pad - - img = Image.new("RGB", (tile_w, height), COLOR_BLACK) - draw = ImageDraw.Draw(img) - - # Paste away logo - x = h_pad - if away_logo: - logo_y = (height - away_logo.height) // 2 - img.paste(away_logo, (x, logo_y), away_logo) - x += logo_w + h_pad - - # Away team text (seed + abbr) - is_fav_away = game["away_abbr"] in self.favorite_teams if self.favorite_teams else False - away_color = COLOR_GOLD if is_fav_away else COLOR_WHITE - if game["is_final"] and game["winner_side"] == "away" and self.highlight_upsets and game["is_upset"]: - away_color = COLOR_GOLD - team_text_y = (height - 6) // 2 - 5 # Upper half - self._draw_text_with_outline(draw, away_text, (x, team_text_y), font_detail, fill=away_color) - x += away_text_w + h_pad - - # Center block - center_x = x - center_mid = center_x + center_w // 2 - - # Status text (top center of center block) - status_x = center_mid - status_w // 2 - status_y = 2 - status_color = COLOR_GREEN if game["is_live"] else COLOR_GRAY - self._draw_text_with_outline(draw, status_text, (status_x, status_y), font_time, fill=status_color) - - # Score (bottom center of center block, for live/final) - if score_text: - score_x = center_mid - score_w // 2 - score_y = height - 13 - # Upset highlighting - if game["is_final"] and game["is_upset"] and self.highlight_upsets: - score_color = COLOR_GOLD - elif game["is_live"]: - score_color = COLOR_WHITE - else: - score_color = COLOR_WHITE - self._draw_text_with_outline(draw, score_text, (score_x, score_y), font_score, fill=score_color) - - # Date for final games (below score) - if game["is_final"] and game.get("game_date"): - date_w = int(draw.textlength(game["game_date"], font=font_detail)) - date_x = center_mid - date_w // 2 - date_y = height - 6 - self._draw_text_with_outline(draw, game["game_date"], (date_x, date_y), font_detail, fill=COLOR_DIM) - - x = center_x + center_w + h_pad - - # Home team text - is_fav_home = game["home_abbr"] in self.favorite_teams if self.favorite_teams else False - home_color = COLOR_GOLD if is_fav_home else COLOR_WHITE - if game["is_final"] and game["winner_side"] == "home" and self.highlight_upsets and game["is_upset"]: - home_color = COLOR_GOLD - self._draw_text_with_outline(draw, home_text, (x, team_text_y), font_detail, fill=home_color) - x += home_text_w + h_pad - - # Paste home logo - if home_logo: - logo_y = (height - home_logo.height) // 2 - img.paste(home_logo, (x, logo_y), home_logo) - - return img - - def _create_ticker_image(self) -> None: - """Build the full scrolling ticker image from game tiles.""" - if not self.games_data: - self.ticker_image = None - if self.scroll_helper: - self.scroll_helper.clear_cache() - return - - grouped = self._process_games(self.games_data) - content_items: List[Image.Image] = [] - - # Order rounds by significance (most important first) - sorted_rounds = sorted(grouped.keys(), key=lambda r: ROUND_ORDER.get(r, 6)) - - for rnd in sorted_rounds: - games = grouped[rnd] - if not games: - continue - - # Add round separator - if self.show_round_logos and rnd: - separator = self._create_round_separator(rnd) - content_items.append(separator) - - # Add game tiles - for game in games: - tile = self._create_game_tile(game) - content_items.append(tile) - - if not content_items: - self.ticker_image = None - if self.scroll_helper: - self.scroll_helper.clear_cache() - return - - if not self.scroll_helper: - self.ticker_image = None - return - - gap_width = 16 - - # Use ScrollHelper to create the scrolling image - self.ticker_image = self.scroll_helper.create_scrolling_image( - content_items=content_items, - item_gap=gap_width, - element_gap=0, - ) - - self.total_scroll_width = self.scroll_helper.total_scroll_width - self.dynamic_duration = self.scroll_helper.get_dynamic_duration() - - self.logger.info( - f"Ticker image created: {self.ticker_image.width}px wide, " - f"{len(self.games_data)} games, dynamic_duration={self.dynamic_duration:.0f}s" - ) - - # ------------------------------------------------------------------ - # Plugin lifecycle - # ------------------------------------------------------------------ - - def update(self) -> None: - """Fetch and process tournament data.""" - if not self.enabled: - return - - current_time = time.time() - # Use shorter interval if live games detected - interval = 60 if self._has_live_games else self.update_interval - if current_time - self.last_update < interval: - return - - with self._update_lock: - self.last_update = current_time - - if not self._is_tournament_window(): - self.logger.debug("Outside tournament window, skipping fetch") - self.games_data = [] - self.ticker_image = None - if self.scroll_helper: - self.scroll_helper.clear_cache() - return - - try: - games = self._fetch_tournament_data() - self._has_live_games = any(g["is_live"] for g in games) - self.games_data = games - self._create_ticker_image() - self.logger.info( - f"Updated: {len(games)} games, " - f"live={self._has_live_games}" - ) - except Exception as e: - self.logger.error(f"Update error: {e}", exc_info=True) - - def display(self, force_clear: bool = False) -> None: - """Render one scroll frame.""" - if not self.enabled: - return - - if force_clear or self._display_start_time is None: - self._display_start_time = time.time() - if self.scroll_helper: - self.scroll_helper.reset_scroll() - self._end_reached_logged = False - - if not self.games_data or self.ticker_image is None: - self._display_fallback() - return - - if not self.scroll_helper: - self._display_fallback() - return - - try: - if self.loop or not self.scroll_helper.is_scroll_complete(): - self.scroll_helper.update_scroll_position() - elif not self._end_reached_logged: - self.logger.info("Scroll complete") - self._end_reached_logged = True - - visible = self.scroll_helper.get_visible_portion() - if visible is None: - self._display_fallback() - return - - self.dynamic_duration = self.scroll_helper.get_dynamic_duration() - - matrix_w = self.display_manager.matrix.width - matrix_h = self.display_manager.matrix.height - if not hasattr(self.display_manager, "image") or self.display_manager.image is None: - self.display_manager.image = Image.new("RGB", (matrix_w, matrix_h), COLOR_BLACK) - self.display_manager.image.paste(visible, (0, 0)) - self.display_manager.update_display() - self.scroll_helper.log_frame_rate() - - except Exception as e: - self.logger.error(f"Display error: {e}", exc_info=True) - self._display_fallback() - - def _display_fallback(self) -> None: - w = self.display_manager.matrix.width - h = self.display_manager.matrix.height - img = Image.new("RGB", (w, h), COLOR_BLACK) - draw = ImageDraw.Draw(img) - - if self._is_tournament_window(): - text = "No games" - else: - text = "Off-season" - - text_w = int(draw.textlength(text, font=self.fonts["time"])) - text_x = (w - text_w) // 2 - text_y = (h - 8) // 2 - draw.text((text_x, text_y), text, font=self.fonts["time"], fill=COLOR_GRAY) - - # Show March Madness logo if available - if self._march_madness_logo: - logo_y = (h - self._march_madness_logo.height) // 2 - img.paste(self._march_madness_logo, (2, logo_y), self._march_madness_logo) - - self.display_manager.image = img - self.display_manager.update_display() - - # ------------------------------------------------------------------ - # Duration / cycle management - # ------------------------------------------------------------------ - - def get_display_duration(self) -> float: - current_time = time.time() - if self._cached_dynamic_duration is not None: - cache_age = current_time - self._duration_cache_time - if cache_age < 5.0: - return self._cached_dynamic_duration - - self._cached_dynamic_duration = self.dynamic_duration - self._duration_cache_time = current_time - return self.dynamic_duration - - def supports_dynamic_duration(self) -> bool: - if not self.enabled: - return False - return self.dynamic_duration_enabled - - def is_cycle_complete(self) -> bool: - if not self.supports_dynamic_duration(): - return True - if self._display_start_time is not None and self.dynamic_duration > 0: - elapsed = time.time() - self._display_start_time - if elapsed >= self.dynamic_duration: - return True - if not self.loop and self.scroll_helper and self.scroll_helper.is_scroll_complete(): - return True - return False - - def reset_cycle_state(self) -> None: - super().reset_cycle_state() - self._display_start_time = None - self._end_reached_logged = False - if self.scroll_helper: - self.scroll_helper.reset_scroll() - - # ------------------------------------------------------------------ - # Vegas mode - # ------------------------------------------------------------------ - - def get_vegas_content(self): - if not self.games_data: - return None - tiles = [] - for game in self.games_data: - tiles.append(self._create_game_tile(game)) - return tiles if tiles else None - - def get_vegas_content_type(self) -> str: - return "multi" - - # ------------------------------------------------------------------ - # Info / cleanup - # ------------------------------------------------------------------ - - def get_info(self) -> Dict: - info = super().get_info() - info["total_games"] = len(self.games_data) - info["has_live_games"] = self._has_live_games - info["dynamic_duration"] = self.dynamic_duration - info["tournament_window"] = self._is_tournament_window() - return info - - def cleanup(self) -> None: - self.games_data = [] - self.ticker_image = None - if self.scroll_helper: - self.scroll_helper.clear_cache() - self._team_logo_cache.clear() - if self.session: - self.session.close() - self.session = None - super().cleanup() diff --git a/plugin-repos/march-madness/manifest.json b/plugin-repos/march-madness/manifest.json deleted file mode 100644 index 3f0d16f6..00000000 --- a/plugin-repos/march-madness/manifest.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "id": "march-madness", - "name": "March Madness", - "version": "1.0.0", - "description": "NCAA March Madness tournament bracket tracker with round branding, seeded matchups, live scores, and upset highlighting", - "author": "ChuckBuilds", - "category": "sports", - "tags": [ - "ncaa", - "basketball", - "march-madness", - "tournament", - "bracket", - "scrolling" - ], - "repo": "https://github.com/ChuckBuilds/ledmatrix-plugins", - "branch": "main", - "plugin_path": "plugins/march-madness", - "versions": [ - { - "version": "1.0.0", - "ledmatrix_min": "2.0.0", - "released": "2026-02-16" - } - ], - "stars": 0, - "downloads": 0, - "last_updated": "2026-02-16", - "verified": true, - "screenshot": "", - "display_modes": [ - "march_madness" - ], - "dependencies": {}, - "entry_point": "manager.py", - "class_name": "MarchMadnessPlugin" -} diff --git a/plugin-repos/march-madness/requirements.txt b/plugin-repos/march-madness/requirements.txt deleted file mode 100644 index d1d90878..00000000 --- a/plugin-repos/march-madness/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -requests>=2.33.0 -urllib3>=2.6.3 -Pillow>=12.2.0 -pytz>=2022.1 -numpy>=1.24.0 diff --git a/plugin-repos/mqtt-notifications b/plugin-repos/mqtt-notifications deleted file mode 120000 index 48249504..00000000 --- a/plugin-repos/mqtt-notifications +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/mqtt-notifications \ No newline at end of file diff --git a/plugin-repos/news b/plugin-repos/news deleted file mode 120000 index acb96c95..00000000 --- a/plugin-repos/news +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/news \ No newline at end of file diff --git a/plugin-repos/odds-ticker b/plugin-repos/odds-ticker deleted file mode 120000 index e71955b1..00000000 --- a/plugin-repos/odds-ticker +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/odds-ticker \ No newline at end of file diff --git a/plugin-repos/of-the-day b/plugin-repos/of-the-day deleted file mode 120000 index 79cae43f..00000000 --- a/plugin-repos/of-the-day +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/of-the-day \ No newline at end of file diff --git a/plugin-repos/olympics b/plugin-repos/olympics deleted file mode 120000 index 36f5ebe0..00000000 --- a/plugin-repos/olympics +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/olympics \ No newline at end of file diff --git a/plugin-repos/soccer-scoreboard b/plugin-repos/soccer-scoreboard deleted file mode 120000 index 05d4f6df..00000000 --- a/plugin-repos/soccer-scoreboard +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/soccer-scoreboard \ No newline at end of file diff --git a/plugin-repos/static-image b/plugin-repos/static-image deleted file mode 120000 index 65b6e656..00000000 --- a/plugin-repos/static-image +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/static-image \ No newline at end of file diff --git a/plugin-repos/stock-news b/plugin-repos/stock-news deleted file mode 120000 index dde9397e..00000000 --- a/plugin-repos/stock-news +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/stock-news \ No newline at end of file diff --git a/plugin-repos/text-display b/plugin-repos/text-display deleted file mode 120000 index 612ed769..00000000 --- a/plugin-repos/text-display +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/text-display \ No newline at end of file diff --git a/plugin-repos/ufc-scoreboard b/plugin-repos/ufc-scoreboard deleted file mode 120000 index 747df74f..00000000 --- a/plugin-repos/ufc-scoreboard +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/ufc-scoreboard \ No newline at end of file diff --git a/plugin-repos/youtube-stats b/plugin-repos/youtube-stats deleted file mode 120000 index d98ca063..00000000 --- a/plugin-repos/youtube-stats +++ /dev/null @@ -1 +0,0 @@ -../../ledmatrix-plugins/plugins/youtube-stats \ No newline at end of file diff --git a/scripts/audit_plugins.py b/scripts/audit_plugins.py deleted file mode 100644 index b2a92c14..00000000 --- a/scripts/audit_plugins.py +++ /dev/null @@ -1,296 +0,0 @@ -#!/usr/bin/env python3 -""" -LEDMatrix Plugin Security Auditor - -Performs AST-based security analysis of all Python files in plugin directories. -Designed to run in CI — exits non-zero on CRITICAL findings only. - -Usage: - python scripts/audit_plugins.py - python scripts/audit_plugins.py --verbose - python scripts/audit_plugins.py --plugin hello-world - python scripts/audit_plugins.py --output results.json -""" - -import ast -import argparse -import json -import sys -from dataclasses import dataclass, asdict -from pathlib import Path -from datetime import datetime, timezone - -PROJECT_ROOT = Path(__file__).resolve().parent.parent - -PLUGIN_BASE_DIRS = [ - PROJECT_ROOT / "plugins", - PROJECT_ROOT / "plugin-repos", -] - - -# ───────────────────────────────────────────────────────────────────────────── -# Finding dataclass -# ───────────────────────────────────────────────────────────────────────────── - -@dataclass -class Finding: - plugin_id: str - file: str - line: int - severity: str # CRITICAL | WARNING | INFO - rule: str - message: str - - def to_dict(self) -> dict: - return asdict(self) - - -# ───────────────────────────────────────────────────────────────────────────── -# AST visitor -# ───────────────────────────────────────────────────────────────────────────── - -class _PluginVisitor(ast.NodeVisitor): - """Collect security findings from a single plugin Python file.""" - - def __init__(self, filepath: Path, plugin_id: str): - self.filepath = filepath - self.plugin_id = plugin_id - self.findings: list[Finding] = [] - - def _add(self, node: ast.AST, severity: str, rule: str, message: str) -> None: - self.findings.append(Finding( - plugin_id=self.plugin_id, - file=str(self.filepath.relative_to(PROJECT_ROOT)), - line=getattr(node, "lineno", 0), - severity=severity, - rule=rule, - message=message, - )) - - def visit_Call(self, node: ast.Call) -> None: - # eval() / exec() — arbitrary code execution - if isinstance(node.func, ast.Name): - if node.func.id == "eval": - self._add(node, "CRITICAL", "PLUGIN-001", - "eval() call — arbitrary code execution risk") - elif node.func.id == "exec": - self._add(node, "CRITICAL", "PLUGIN-002", - "exec() call — arbitrary code execution risk") - elif node.func.id == "compile": - self._add(node, "WARNING", "PLUGIN-003", - "compile() call — dynamic code compilation") - - # subprocess.*(shell=True) - if isinstance(node.func, ast.Attribute): - is_subprocess = ( - isinstance(node.func.value, ast.Name) and - node.func.value.id == "subprocess" and - node.func.attr in ("run", "call", "Popen", "check_call", "check_output") - ) - if is_subprocess: - for kw in node.keywords: - if (kw.arg == "shell" and - isinstance(kw.value, ast.Constant) and - kw.value.value is True): - self._add(node, "WARNING", "PLUGIN-004", - f"subprocess.{node.func.attr}(shell=True) — " - f"shell injection risk if args include user input") - - # os.system() — shell execution - is_os_system = ( - isinstance(node.func.value, ast.Name) and - node.func.value.id == "os" and - node.func.attr == "system" - ) - if is_os_system: - self._add(node, "WARNING", "PLUGIN-005", - "os.system() call — prefer subprocess with list args") - - self.generic_visit(node) - - def visit_Import(self, node: ast.Import) -> None: - for alias in node.names: - self._check_import(node, alias.name) - self.generic_visit(node) - - def visit_ImportFrom(self, node: ast.ImportFrom) -> None: - if node.module: - self._check_import(node, node.module) - self.generic_visit(node) - - def _check_import(self, node: ast.AST, module_name: str) -> None: - dangerous = { - "ctypes": ("WARNING", "PLUGIN-010", "ctypes import — native code execution"), - "cffi": ("WARNING", "PLUGIN-011", "cffi import — native code execution"), - "pickle": ("WARNING", "PLUGIN-012", - "pickle import — deserialization can execute arbitrary code"), - "marshal": ("WARNING", "PLUGIN-013", - "marshal import — deserialization risk"), - } - for mod, (severity, rule, msg) in dangerous.items(): - if module_name == mod or module_name.startswith(mod + "."): - self._add(node, severity, rule, msg) - - -# ───────────────────────────────────────────────────────────────────────────── -# Per-plugin audit -# ───────────────────────────────────────────────────────────────────────────── - -def audit_plugin(plugin_dir: Path) -> list[Finding]: - """Audit a single plugin directory. Returns all findings.""" - findings: list[Finding] = [] - plugin_id = plugin_dir.name - - # Check for required files - for required_file, rule, msg in [ - ("manifest.json", "PLUGIN-020", - "manifest.json missing — plugin may be incomplete"), - ("config_schema.json", "PLUGIN-021", - "config_schema.json missing — no input validation schema declared"), - ]: - if not (plugin_dir / required_file).exists(): - findings.append(Finding( - plugin_id=plugin_id, - file=str((plugin_dir / required_file).relative_to(PROJECT_ROOT)), - line=0, - severity="WARNING", - rule=rule, - message=msg, - )) - - # AST analysis of all Python files - for py_file in sorted(plugin_dir.rglob("*.py")): - try: - source = py_file.read_text(encoding="utf-8") - tree = ast.parse(source, filename=str(py_file)) - visitor = _PluginVisitor(py_file, plugin_id) - visitor.visit(tree) - findings.extend(visitor.findings) - except SyntaxError as exc: - findings.append(Finding( - plugin_id=plugin_id, - file=str(py_file.relative_to(PROJECT_ROOT)), - line=getattr(exc, "lineno", 0) or 0, - severity="WARNING", - rule="PLUGIN-030", - message=f"Python syntax error — cannot be parsed: {exc}", - )) - except OSError as exc: - findings.append(Finding( - plugin_id=plugin_id, - file=str(py_file.relative_to(PROJECT_ROOT)), - line=0, - severity="INFO", - rule="PLUGIN-031", - message=f"Could not read file: {exc}", - )) - - return findings - - -# ───────────────────────────────────────────────────────────────────────────── -# Main -# ───────────────────────────────────────────────────────────────────────────── - -def main() -> int: - parser = argparse.ArgumentParser( - description="LEDMatrix plugin security auditor", - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - parser.add_argument("--plugin", "-p", default=None, - help="Audit a specific plugin ID only") - parser.add_argument("--output", "-o", default=None, - help="Write JSON results to this file") - parser.add_argument("--verbose", "-v", action="store_true", - help="Show all findings, not just summary") - args = parser.parse_args() - - print("=" * 60) - print("LEDMatrix Plugin Security Audit") - print(f"Project root: {PROJECT_ROOT}") - print("=" * 60) - - all_findings: list[Finding] = [] - plugins_scanned = 0 - - for base_dir in PLUGIN_BASE_DIRS: - if not base_dir.exists(): - if args.verbose: - print(f" ⏭️ Skipping {base_dir.name}/ (directory not found)") - continue - - base_label = base_dir.relative_to(PROJECT_ROOT) - print(f"\n Scanning {base_label}/") - - for plugin_dir in sorted(base_dir.iterdir()): - if not plugin_dir.is_dir(): - continue - if plugin_dir.name.startswith((".", "_")): - continue - if args.plugin and plugin_dir.name != args.plugin: - continue - - findings = audit_plugin(plugin_dir) - all_findings.extend(findings) - plugins_scanned += 1 - - critical = [f for f in findings if f.severity == "CRITICAL"] - warnings = [f for f in findings if f.severity == "WARNING"] - - if critical: - icon, label = "🚨", "CRITICAL" - elif warnings: - icon, label = "⚠️ ", "WARN " - else: - icon, label = "✅", "PASS " - - print(f" {icon} [{label}] {plugin_dir.name}" - f" — {len(critical)} critical, {len(warnings)} warnings") - - if args.verbose: - for f in findings: - severity_icon = {"CRITICAL": "🚨", "WARNING": "⚠️ ", "INFO": "ℹ️ "}.get( - f.severity, " " - ) - print(f" {severity_icon} {f.rule} {f.file}:{f.line} — {f.message}") - - # Summary - critical_findings = [f for f in all_findings if f.severity == "CRITICAL"] - warning_findings = [f for f in all_findings if f.severity == "WARNING"] - - print(f"\n{'=' * 60}") - print(f" Plugins scanned : {plugins_scanned}") - print(f" CRITICAL : {len(critical_findings)}") - print(f" WARNING : {len(warning_findings)}") - - if critical_findings: - print("\n 🚨 CRITICAL findings:") - for f in critical_findings: - print(f" {f.plugin_id} | {Path(f.file).name}:{f.line} | {f.message}") - - # Write JSON output - if args.output: - output_data = { - "timestamp": datetime.now(timezone.utc).isoformat(), - "plugins_scanned": plugins_scanned, - "summary": { - "critical": len(critical_findings), - "warnings": len(warning_findings), - }, - "findings": [f.to_dict() for f in all_findings], - } - Path(args.output).write_text( - json.dumps(output_data, indent=2), encoding="utf-8" - ) - print(f"\n Results written to: {args.output}") - - if critical_findings: - print("\n 🚨 Blocking — CRITICAL issues must be resolved") - return 1 - - print("\n ✅ No critical issues found") - return 0 - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/scripts/generate_report.py b/scripts/generate_report.py deleted file mode 100644 index 0459c692..00000000 --- a/scripts/generate_report.py +++ /dev/null @@ -1,297 +0,0 @@ -#!/usr/bin/env python3 -""" -Security Report Generator - -Aggregates JSON output from all CI security audit jobs into a single -Markdown report suitable for PR comments and artifact storage. - -Expected artifact layout (from actions/download-artifact@v4): - / - sast-results/ - bandit-results.json - semgrep-results.json - dependency-audit-results/ - pip-audit-results.json - safety-results.json - secrets-scan-results/ - gitleaks-results.json - security-proofs-results/ - security-proofs-results.json - plugin-audit-results/ - plugin-audit-results.json - -Usage: - python scripts/generate_report.py --artifact-dir audit-artifacts/ --output report.md - python scripts/generate_report.py --artifact-dir audit-artifacts/ --output report.md --verbose -""" - -import argparse -import json -import sys -from pathlib import Path -from datetime import datetime, timezone - -PROJECT_ROOT = Path(__file__).resolve().parent.parent - -# Gitleaks matches containing these strings are template placeholders, not real secrets -_GITLEAKS_SUPPRESS = [ - "YOUR_", - "PLACEHOLDER", - "_HERE", - "example.com", - "config_secrets.template", -] - - -# ───────────────────────────────────────────────────────────────────────────── -# Helpers -# ───────────────────────────────────────────────────────────────────────────── - -def _load(path: Path) -> dict | list | None: - """Load JSON file, returning None on any error.""" - try: - return json.loads(path.read_text(encoding="utf-8")) - except (json.JSONDecodeError, FileNotFoundError, OSError): - return None - - -def _md_table_row(*cells: str) -> str: - return "| " + " | ".join(str(c) for c in cells) + " |" - - -# ───────────────────────────────────────────────────────────────────────────── -# Per-tool summarizers -# Returns: (markdown_lines: list[str], critical_count: int) -# ───────────────────────────────────────────────────────────────────────────── - -def _summarize_bandit(artifact_dir: Path) -> tuple[list[str], int]: - data = _load(artifact_dir / "sast-results" / "bandit-results.json") - if data is None: - return ["_bandit results not available_"], 0 - - results = data.get("results", []) - high = [r for r in results if r.get("issue_severity") == "HIGH"] - medium = [r for r in results if r.get("issue_severity") == "MEDIUM"] - low = [r for r in results if r.get("issue_severity") == "LOW"] - - lines = [ - f"**Bandit**: {len(high)} HIGH · {len(medium)} MEDIUM · {len(low)} LOW" - ] - - if high: - lines += [ - "", - "| Severity | File | Line | Issue |", - "| --- | --- | --- | --- |", - ] - for r in high[:10]: - fname = Path(r.get("filename", "")).name - lines.append(_md_table_row( - "HIGH", f"`{fname}`", - str(r.get("line_number", "?")), - r.get("issue_text", "") - )) - if len(high) > 10: - lines.append(f"_… and {len(high) - 10} more HIGH findings_") - - return lines, len(high) - - -def _summarize_pip_audit(artifact_dir: Path) -> tuple[list[str], int]: - data = _load(artifact_dir / "dependency-audit-results" / "pip-audit-results.json") - if data is None: - return ["_pip-audit results not available_"], 0 - - # pip-audit JSON format: {"dependencies": [{"name": ..., "vulns": [...]}]} - vulns: list[dict] = [] - for dep in data.get("dependencies", []): - for v in dep.get("vulns", []): - vulns.append({"package": dep.get("name", "?"), **v}) - - lines = [f"**pip-audit**: {len(vulns)} vulnerabilities found"] - - if vulns: - lines += ["", "| Package | ID | Fix |", "| --- | --- | --- |"] - for v in vulns[:10]: - fix = v.get("fix_versions", ["none"]) - fix_str = ", ".join(fix) if fix else "none" - lines.append(_md_table_row( - v.get("package", "?"), - v.get("id", "?"), - fix_str, - )) - - # Treat known vulnerabilities as warnings, not critical (they may be unavoidable) - return lines, 0 - - -def _summarize_gitleaks(artifact_dir: Path) -> tuple[list[str], int]: - data = _load(artifact_dir / "secrets-scan-results" / "gitleaks-results.json") - if data is None: - return ["_gitleaks results not available_"], 0 - - if not isinstance(data, list): - data = [] - - real_findings = [] - suppressed = 0 - for finding in data: - secret_val = str(finding.get("Secret", "") or finding.get("Match", "")) - if any(p in secret_val for p in _GITLEAKS_SUPPRESS): - suppressed += 1 - else: - real_findings.append(finding) - - lines = [ - f"**Gitleaks**: {len(real_findings)} finding(s) " - f"({suppressed} suppressed as template placeholders)" - ] - - if real_findings: - lines += ["", "| Rule | File | Line | Description |", "| --- | --- | --- | --- |"] - for f in real_findings[:10]: - fname = Path(f.get("File", "")).name - lines.append(_md_table_row( - f.get("RuleID", "?"), - f"`{fname}`", - str(f.get("StartLine", "?")), - f.get("Description", ""), - )) - - critical = len(real_findings) # any real secret is critical - return lines, critical - - -def _summarize_security_proofs(artifact_dir: Path) -> tuple[list[str], int]: - data = _load(artifact_dir / "security-proofs-results" / "security-proofs-results.json") - if data is None: - return ["_security proofs results not available_"], 0 - - if not isinstance(data, list): - data = [] - - critical = [r for r in data if r.get("severity") == "CRITICAL"] - warnings = [r for r in data if r.get("severity") == "WARNING"] - passed = [r for r in data if r.get("severity") == "PASS"] - skipped = [r for r in data if r.get("severity") == "SKIP"] - - lines = [ - f"**Security Proofs**: " - f"{len(passed)} PASS · {len(warnings)} WARN · " - f"{len(critical)} CRITICAL · {len(skipped)} SKIP", - "", - ] - - _icon = {"PASS": "✅", "INFO": "ℹ️", "WARNING": "⚠️", - "CRITICAL": "🚨", "SKIP": "⏭️"} - for r in data: - icon = _icon.get(r.get("severity", ""), "❓") - lines.append( - f"- {icon} **{r.get('test_id', '?')}**: {r.get('message', '')}" - ) - if r.get("details") and r.get("severity") in ("CRITICAL", "WARNING"): - lines.append(f" - _{r['details']}_") - - return lines, len(critical) - - -def _summarize_plugin_audit(artifact_dir: Path) -> tuple[list[str], int]: - data = _load(artifact_dir / "plugin-audit-results" / "plugin-audit-results.json") - if data is None: - return ["_plugin audit results not available_"], 0 - - summary = data.get("summary", {}) - findings = data.get("findings", []) - critical_findings = [f for f in findings if f.get("severity") == "CRITICAL"] - warning_findings = [f for f in findings if f.get("severity") == "WARNING"] - - lines = [ - f"**Plugin Audit**: {data.get('plugins_scanned', '?')} plugins scanned — " - f"{summary.get('critical', 0)} CRITICAL · {summary.get('warnings', 0)} WARNINGS" - ] - - if critical_findings: - lines += ["", "| Plugin | File | Line | Rule | Message |", - "| --- | --- | --- | --- | --- |"] - for f in critical_findings[:10]: - fname = Path(f.get("file", "")).name - lines.append(_md_table_row( - f.get("plugin_id", "?"), - f"`{fname}`", - str(f.get("line", "?")), - f.get("rule", "?"), - f.get("message", ""), - )) - - if warning_findings and not critical_findings: - lines.append(f"\n_{len(warning_findings)} warning(s) found — see artifact for details_") - - return lines, summary.get("critical", 0) - - -# ───────────────────────────────────────────────────────────────────────────── -# Main -# ───────────────────────────────────────────────────────────────────────────── - -def main() -> int: - parser = argparse.ArgumentParser( - description="Generate consolidated security audit report", - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - parser.add_argument("--artifact-dir", required=True, - help="Directory containing downloaded CI artifacts") - parser.add_argument("--output", "-o", required=True, - help="Output Markdown file path") - parser.add_argument("--verbose", "-v", action="store_true") - args = parser.parse_args() - - artifact_dir = Path(args.artifact_dir) - timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M UTC") - - bandit_lines, bandit_crit = _summarize_bandit(artifact_dir) - pip_audit_lines, pip_audit_crit = _summarize_pip_audit(artifact_dir) - gitleaks_lines, gitleaks_crit = _summarize_gitleaks(artifact_dir) - proofs_lines, proofs_crit = _summarize_security_proofs(artifact_dir) - plugins_lines, plugins_crit = _summarize_plugin_audit(artifact_dir) - - total_critical = bandit_crit + pip_audit_crit + gitleaks_crit + proofs_crit + plugins_crit - overall = "ACTION REQUIRED 🚨" if total_critical > 0 else "PASSED ✅" - - def section(title: str, lines: list[str]) -> str: - return f"### {title}\n\n" + "\n".join(lines) + "\n" - - report = f"""## 🔒 Security Audit — {overall} - -_Generated: {timestamp}_ - -| Critical | High/Warn | Overall | -| :---: | :---: | :---: | -| {'🚨 ' + str(total_critical) if total_critical else '✅ 0'} | ⚠️ see below | {overall} | - ---- - -{section('SAST — Bandit', bandit_lines)} -{section('Dependencies — pip-audit', pip_audit_lines)} -{section('Secrets — Gitleaks', gitleaks_lines)} -{section('LEDMatrix Security Proofs', proofs_lines)} -{section('Plugin Security Audit', plugins_lines)} ---- - -_Total critical findings: **{total_critical}**_ -""" - - output_path = Path(args.output) - output_path.write_text(report, encoding="utf-8") - - if args.verbose: - print(f" Report written to: {output_path}") - print(f" Status: {overall}") - print(f" Critical findings: {total_critical}") - print(f" bandit={bandit_crit} pip-audit={pip_audit_crit} " - f"gitleaks={gitleaks_crit} proofs={proofs_crit} plugins={plugins_crit}") - - return 0 - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/scripts/prove_security.py b/scripts/prove_security.py deleted file mode 100644 index 18ce61bc..00000000 --- a/scripts/prove_security.py +++ /dev/null @@ -1,504 +0,0 @@ -#!/usr/bin/env python3 -""" -LEDMatrix Security Proof Tests - -Automated proofs that run in CI to verify security properties hold on every -commit. Inspired by the Huntarr security review approach of using standard -tooling to confirm specific vulnerability classes are absent. - -Usage: - python scripts/prove_security.py - python scripts/prove_security.py --verbose - python scripts/prove_security.py --output results.json - -Exit code: 1 only if CRITICAL findings are detected. Warnings are reported -but do not block CI. -""" - -import ast -import argparse -import json -import re -import sys -from dataclasses import dataclass, asdict -from pathlib import Path - -PROJECT_ROOT = Path(__file__).resolve().parent.parent - - -# ───────────────────────────────────────────────────────────────────────────── -# Result dataclass -# ───────────────────────────────────────────────────────────────────────────── - -@dataclass -class TestResult: - test_id: str - severity: str # PASS | INFO | WARNING | CRITICAL | SKIP - message: str - details: str = "" - - def to_dict(self) -> dict: - return asdict(self) - - @property - def icon(self) -> str: - return { - "PASS": "✅", - "INFO": "ℹ️ ", - "WARNING": "⚠️ ", - "CRITICAL": "🚨", - "SKIP": "⏭️ ", - }.get(self.severity, "❓") - - -# ───────────────────────────────────────────────────────────────────────────── -# T1: Plugin Loading / Zip Slip -# ───────────────────────────────────────────────────────────────────────────── - -def test_t1a_zip_slip_protection() -> TestResult: - """ - Verify that zip-slip protection exists in store_manager.py. - - The protection lives at src/plugin_system/store_manager.py and uses - Path.is_relative_to() to validate each zip member before extraction. - This test confirms the guard is present — it should always pass green. - """ - store_manager = PROJECT_ROOT / "src" / "plugin_system" / "store_manager.py" - if not store_manager.exists(): - return TestResult("T1a", "CRITICAL", - "store_manager.py not found", - f"Expected at {store_manager}") - - content = store_manager.read_text(encoding="utf-8") - - has_relative_to = "is_relative_to" in content - has_log_message = "Zip-slip detected" in content - - if not has_relative_to: - return TestResult("T1a", "CRITICAL", - "Zip-slip protection (is_relative_to) NOT FOUND in store_manager.py", - "The is_relative_to() guard must be present before zipfile.extractall()") - - if not has_log_message: - return TestResult("T1a", "WARNING", - "is_relative_to() found but 'Zip-slip detected' log message missing", - "Verify the protection block is still active and the log was not removed") - - return TestResult("T1a", "PASS", - "Zip-slip protection verified", - "is_relative_to() guard + 'Zip-slip detected' log present in store_manager.py") - - -def test_t1b_dangerous_plugin_calls() -> list[TestResult]: - """ - Scan plugin directories for dangerous function calls (eval, exec). - These represent arbitrary code execution risks in plugin code. - """ - results = [] - plugin_dirs = [ - PROJECT_ROOT / "plugins", - PROJECT_ROOT / "plugin-repos", - ] - - violations: list[str] = [] - files_scanned = 0 - - for base in plugin_dirs: - if not base.exists(): - continue - for plugin_dir in sorted(base.iterdir()): - if not plugin_dir.is_dir() or plugin_dir.name.startswith(('.', '_')): - continue - for py_file in plugin_dir.rglob("*.py"): - files_scanned += 1 - try: - source = py_file.read_text(encoding="utf-8") - tree = ast.parse(source, filename=str(py_file)) - for node in ast.walk(tree): - if isinstance(node, ast.Call) and isinstance(node.func, ast.Name): - if node.func.id in ("eval", "exec"): - rel = py_file.relative_to(PROJECT_ROOT) - violations.append( - f"{rel}:{node.lineno} — {node.func.id}() call") - except (SyntaxError, OSError): - pass - - if violations: - results.append(TestResult( - "T1b", "CRITICAL", - f"Dangerous function calls found in plugins ({len(violations)} instance(s))", - "; ".join(violations[:10]) - )) - else: - results.append(TestResult( - "T1b", "PASS", - f"No eval()/exec() calls found in plugins", - f"{files_scanned} plugin Python files scanned" - )) - - return results - - -# ───────────────────────────────────────────────────────────────────────────── -# T2: API Surface Inventory -# ───────────────────────────────────────────────────────────────────────────── - -def test_t2a_api_surface_inventory() -> TestResult: - """ - Document the API surface area. - - This app intentionally has no authentication (local-only Raspberry Pi - design, documented in web_interface/app.py). This test produces an - inventory for audit purposes and warns only if the design-intent comment - is removed from app.py (which would indicate someone deleted the rationale - without adding auth, rather than a deliberate undocumented change). - """ - api_file = PROJECT_ROOT / "web_interface" / "blueprints" / "api_v3.py" - app_file = PROJECT_ROOT / "web_interface" / "app.py" - - if not api_file.exists(): - return TestResult("T2a", "WARNING", "api_v3.py not found", str(api_file)) - - api_content = api_file.read_text(encoding="utf-8") - routes = re.findall(r"@api_v3\.route\('([^']+)'", api_content) - - csrf_documented = False - if app_file.exists(): - app_content = app_file.read_text(encoding="utf-8") - csrf_documented = "CSRF protection disabled for local-only" in app_content - - summary = ( - f"{len(routes)} API routes in api_v3.py. " - f"No auth decorators (intentional local-only design). " - f"CSRF disabled: {'YES — design intent documented in app.py' if csrf_documented else 'YES — but design intent comment NOT found in app.py'}. " - f"Rate limiting: 1000/min." - ) - - if not csrf_documented: - return TestResult( - "T2a", "WARNING", - "CSRF is disabled but the design-intent comment is missing from app.py", - "Add the rationale comment back, or add proper CSRF protection if " - "the app is now internet-facing" - ) - - return TestResult("T2a", "INFO", "API surface documented", summary) - - -# ───────────────────────────────────────────────────────────────────────────── -# T3: Secrets & Credential Handling -# ───────────────────────────────────────────────────────────────────────────── - -# Patterns that suggest real credentials (must be >8 chars, not placeholders) -_SECRET_PATTERNS = [ - (r'(?i)password\s*=\s*["\'](?!none|empty|placeholder|example|test|default|""|'')[^"\']{8,}["\']', "WARNING"), - (r'(?i)api[_-]?key\s*=\s*["\'](?!none|empty|placeholder|YOUR_|example|test)[^"\']{16,}["\']', "WARNING"), - (r'(?i)secret\s*=\s*["\'](?!none|empty|placeholder|YOUR_|example|test)[^"\']{16,}["\']', "WARNING"), - # Real GitHub token pattern - (r'ghp_[a-zA-Z0-9]{36}', "CRITICAL"), - # Generic long bearer tokens - (r'Bearer\s+[a-zA-Z0-9\-_\.]{32,}', "WARNING"), -] - -_TEMPLATE_SKIP_STRINGS = [ - "YOUR_", "PLACEHOLDER", "_HERE", "example.com", "config_secrets.template", - "prove_security", # this file itself -] - -_SCAN_DIRS = ["src", "web_interface", "scripts"] - - -def test_t3a_hardcoded_secrets() -> TestResult: - """Scan source code for hardcoded credentials.""" - violations: list[str] = [] - - for dir_name in _SCAN_DIRS: - scan_dir = PROJECT_ROOT / dir_name - if not scan_dir.exists(): - continue - for py_file in scan_dir.rglob("*.py"): - # Skip test files and this script - if "test" in str(py_file).lower() or "prove_security" in str(py_file): - continue - try: - content = py_file.read_text(encoding="utf-8") - except OSError: - continue - - for pattern, severity in _SECRET_PATTERNS: - for match in re.finditer(pattern, content): - line_content = match.group(0) - # Skip lines containing template placeholder strings - if any(skip in line_content for skip in _TEMPLATE_SKIP_STRINGS): - continue - rel = py_file.relative_to(PROJECT_ROOT) - line_no = content[: match.start()].count("\n") + 1 - violations.append( - f"[{severity}] {rel}:{line_no} — {line_content[:60]}" - ) - - critical_violations = [v for v in violations if "[CRITICAL]" in v] - if critical_violations: - return TestResult( - "T3a", "CRITICAL", - f"Hardcoded secrets found ({len(critical_violations)} critical)", - "; ".join(critical_violations[:5]) - ) - if violations: - return TestResult( - "T3a", "WARNING", - f"Potential hardcoded secrets found ({len(violations)} instance(s))", - "; ".join(violations[:5]) - ) - - return TestResult("T3a", "PASS", "No hardcoded secrets detected", - f"Scanned {', '.join(_SCAN_DIRS)}") - - -def test_t3b_plaintext_password_storage() -> TestResult: - """ - Check for user account password storage without hashing. - - The LEDMatrix app has no user account system, so this should produce INFO. - It would only CRITICAL if someone added user auth and stored passwords without hashing. - - We require all three of: a password *variable assignment or DB operation*, - a clear storage call (INSERT / db commit / ORM save), and no hashing lib present - — to avoid false positives from files that contain 'password' for WiFi handling - and '.save()' for image/file saving in unrelated functions. - """ - hashing_libs = ["bcrypt", "argon2", "pbkdf2", "scrypt", - "generate_password_hash", "hashpw", "make_password"] - # Patterns that indicate password being stored in a database / ORM context. - # Must be specific enough to avoid matching set.add(), file.save(), etc. - db_storage_patterns = ["INSERT INTO", "db.session", "session.add(", "session.commit(", "orm.save"] - - password_storage_found = False - - for dir_name in _SCAN_DIRS: - scan_dir = PROJECT_ROOT / dir_name - if not scan_dir.exists(): - continue - for py_file in scan_dir.rglob("*.py"): - try: - content = py_file.read_text(encoding="utf-8") - except OSError: - continue - # Require DB/ORM context specifically — not just any .save() call - if ("password" in content.lower() and - any(store in content for store in db_storage_patterns) and - not any(h in content for h in hashing_libs)): - password_storage_found = True - - if password_storage_found: - return TestResult( - "T3b", "CRITICAL", - "Potential plaintext password storage in database/ORM detected", - "Found password + database storage operations without a recognized hashing library" - ) - - return TestResult("T3b", "INFO", - "No plaintext password storage detected", - "App has no user account system — expected result") - - -# ───────────────────────────────────────────────────────────────────────────── -# T4: Path Traversal -# ───────────────────────────────────────────────────────────────────────────── - -def test_t4a_path_traversal() -> TestResult: - """ - Verify static file serving uses send_from_directory (safe) rather than - open() with user-supplied paths. Also checks for extractall() calls that - lack the is_relative_to() guard. - """ - issues: list[str] = [] - - app_file = PROJECT_ROOT / "web_interface" / "app.py" - if app_file.exists(): - content = app_file.read_text(encoding="utf-8") - # The file-serve route should use send_from_directory or commonpath - if "send_from_directory" not in content and "commonpath" not in content: - issues.append("app.py: file-serve routes may not use send_from_directory/commonpath") - - # Check all extractall() calls have a preceding is_relative_to guard - for py_file in (PROJECT_ROOT / "src").rglob("*.py"): - try: - content = py_file.read_text(encoding="utf-8") - except OSError: - continue - if "extractall(" in content and "is_relative_to" not in content: - rel = py_file.relative_to(PROJECT_ROOT) - issues.append(f"{rel}: extractall() without is_relative_to() guard") - - if issues: - return TestResult( - "T4a", "WARNING", - f"Potential path traversal patterns found ({len(issues)})", - "; ".join(issues) - ) - - return TestResult("T4a", "PASS", - "Path traversal mitigations verified", - "send_from_directory/commonpath used for file serving; " - "extractall() calls have is_relative_to() guards") - - -# ───────────────────────────────────────────────────────────────────────────── -# T5: Auth Bypass Patterns -# ───────────────────────────────────────────────────────────────────────────── - -def test_t5a_auth_bypass_patterns() -> TestResult: - """ - Look for broken auth bypass patterns — not the intentional no-auth design - (T2a covers that), but patterns that suggest auth was INTENDED to exist - but has an exploitable bypass: broad substring matching, debug-mode skips, - or if-True conditions. - """ - bypass_signals = [ - (r'if\s+True\s*:', "if True: bypass"), - (r'if\s+debug\s*:', "debug-mode auth skip"), - (r'request\.path\s+in\s+', "substring path matching in auth (Huntarr pattern)"), - (r'EXEMPT_ROUTES\s*=', "exempt routes list"), - ] - - findings: list[str] = [] - - for dir_name in ["src", "web_interface"]: - scan_dir = PROJECT_ROOT / dir_name - if not scan_dir.exists(): - continue - for py_file in scan_dir.rglob("*.py"): - try: - content = py_file.read_text(encoding="utf-8") - except OSError: - continue - for pattern, label in bypass_signals: - if re.search(pattern, content): - # Only flag if the file also contains auth-related terms - if any(auth in content.lower() for auth in - ["auth", "login", "authenticate", "token", "permission"]): - rel = py_file.relative_to(PROJECT_ROOT) - findings.append(f"{rel}: {label}") - - if findings: - return TestResult( - "T5a", "WARNING", - f"Potential auth bypass patterns found ({len(findings)})", - "; ".join(findings[:5]) - ) - - return TestResult("T5a", "PASS", - "No auth bypass patterns detected", - "Checked src/ and web_interface/ for bypass signals") - - -# ───────────────────────────────────────────────────────────────────────────── -# T6: Docker / Container Hardening -# ───────────────────────────────────────────────────────────────────────────── - -def test_t6_docker_hardening() -> TestResult: - """Container security — skipped if no Dockerfile exists.""" - dockerfile = PROJECT_ROOT / "Dockerfile" - if not dockerfile.exists(): - return TestResult("T6", "SKIP", - "No Dockerfile found — container security scan not applicable", - "If Docker support is added in future, enable hadolint/trivy scanning " - "in .github/workflows/security-audit.yml") - - content = dockerfile.read_text(encoding="utf-8") - issues: list[str] = [] - - # Check for non-root USER directive - user_lines = [l for l in content.splitlines() if l.strip().startswith("USER")] - if not user_lines or user_lines[-1].strip() == "USER root": - issues.append("Container runs as root — use USER directive to drop privileges") - - # Check for pinned base image tags - from_lines = [l for l in content.splitlines() if l.strip().startswith("FROM")] - for from_line in from_lines: - parts = from_line.split() - if len(parts) >= 2: - image = parts[1] - if ":" not in image or image.endswith(":latest"): - issues.append(f"Unpinned base image: {image}") - - if issues: - return TestResult("T6", "WARNING", - f"Dockerfile hardening issues ({len(issues)})", - "; ".join(issues)) - - return TestResult("T6", "PASS", "Dockerfile hardening checks passed", "") - - -# ───────────────────────────────────────────────────────────────────────────── -# Runner -# ───────────────────────────────────────────────────────────────────────────── - -def main() -> int: - parser = argparse.ArgumentParser( - description="LEDMatrix security proof tests", - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - parser.add_argument("--output", "-o", default=None, - help="Write JSON results to this file") - parser.add_argument("--verbose", "-v", action="store_true", - help="Show details for each check") - args = parser.parse_args() - - print("=" * 60) - print("LEDMatrix Security Proof Tests") - print(f"Project root: {PROJECT_ROOT}") - print("=" * 60) - - all_results: list[TestResult] = [] - - # Run all test groups - all_results.append(test_t1a_zip_slip_protection()) - all_results.extend(test_t1b_dangerous_plugin_calls()) - all_results.append(test_t2a_api_surface_inventory()) - all_results.append(test_t3a_hardcoded_secrets()) - all_results.append(test_t3b_plaintext_password_storage()) - all_results.append(test_t4a_path_traversal()) - all_results.append(test_t5a_auth_bypass_patterns()) - all_results.append(test_t6_docker_hardening()) - - # Print results - print() - for r in all_results: - line = f" {r.icon} [{r.severity:<8}] {r.test_id}: {r.message}" - print(line) - if args.verbose and r.details: - print(f" {r.details}") - - # Tally - critical = [r for r in all_results if r.severity == "CRITICAL"] - warnings = [r for r in all_results if r.severity == "WARNING"] - passed = [r for r in all_results if r.severity == "PASS"] - skipped = [r for r in all_results if r.severity == "SKIP"] - - print() - print(f" Results: {len(passed)} PASS {len(warnings)} WARN " - f"{len(critical)} CRITICAL {len(skipped)} SKIP") - - # Write JSON output - if args.output: - output_data = [r.to_dict() for r in all_results] - Path(args.output).write_text( - json.dumps(output_data, indent=2), encoding="utf-8" - ) - print(f" Results written to: {args.output}") - - if critical: - print(f"\n 🚨 {len(critical)} CRITICAL issue(s) found — blocking") - return 1 - - if warnings: - print(f"\n ⚠️ {len(warnings)} warning(s) found — non-blocking") - - print("\n ✅ All checks passed (warnings are non-blocking)") - return 0 - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/web_interface/blueprints/composer.py b/web_interface/blueprints/composer.py deleted file mode 100644 index a6e19374..00000000 --- a/web_interface/blueprints/composer.py +++ /dev/null @@ -1,837 +0,0 @@ -""" -Plugin Composer blueprint — drag-and-drop plugin builder for LEDMatrix. - -Routes: - GET /composer/ — Composer page - POST /composer/api/generate — Generate and return plugin ZIP - POST /composer/api/install — Write plugin directly to plugins_dir - GET /composer/api/fonts/ — Serve TTF font files for canvas rendering - GET /composer/api/validate-id/ — Check if a plugin ID is already taken -""" -import ast -import io -import json -import logging -import re -import zipfile -from datetime import datetime -from pathlib import Path - -import jinja2 -import jsonschema -from flask import Blueprint, jsonify, render_template, request, send_file - -logger = logging.getLogger(__name__) - -composer_bp = Blueprint('composer', __name__) - -# Module-level attributes injected by app.py at registration time -composer_bp.config_manager = None -composer_bp.plugin_manager = None -composer_bp.plugins_dir = None -composer_bp.project_root = None - -# Fonts safe to serve to the browser for canvas rendering -_ALLOWED_FONTS = frozenset({'PressStart2P-Regular.ttf', '4x6-font.ttf', '5by7.regular.ttf'}) - -# Map composer font keys → DisplayManager attribute names -_FONT_ATTR_MAP = { - 'press_start': 'regular_font', - 'four_by_six': 'extra_small_font', - 'five_by_seven': 'bdf_5x7_font', -} - -# Font sizes in LED pixels (used to compute second-line Y offsets) -_FONT_SIZE_MAP = { - 'press_start': 8, - 'four_by_six': 6, - 'five_by_seven': 7, -} - -_PLUGIN_ID_RE = re.compile(r'^[a-z][a-z0-9-]{0,62}$') -_PYTHON_IDENT_RE = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_]*$') - -# ── Jinja2 environment (separate from Flask's; autoescape=False for code gen) ── - -_jinja_env: jinja2.Environment | None = None - - -def _get_jinja_env() -> jinja2.Environment: - global _jinja_env - if _jinja_env is None: - template_dir = Path(__file__).parent.parent / 'templates' / 'v3' / 'composer' - _jinja_env = jinja2.Environment( - loader=jinja2.FileSystemLoader(str(template_dir)), - autoescape=False, - trim_blocks=True, - lstrip_blocks=True, - ) - _jinja_env.filters['as_rgb'] = _as_rgb_filter - _jinja_env.filters['as_fill'] = _as_fill_filter - return _jinja_env - - -def _as_rgb_filter(val) -> str: - """[r, g, b] → '(r, g, b)'""" - if val is None: - return 'None' - return f'({int(val[0])}, {int(val[1])}, {int(val[2])})' - - -def _as_fill_filter(val) -> str: - """[r, g, b] or None → '(r, g, b)' or 'None'""" - if val is None: - return 'None' - return _as_rgb_filter(val) - - -# ── Helper functions ────────────────────────────────────────────────────────── - -def _to_class_name(name: str) -> str: - """'My Clock' → 'MyClockPlugin' (avoids double-suffix if name already ends with Plugin)""" - words = re.sub(r'[^a-zA-Z0-9]', ' ', name).split() - base = ''.join(w.capitalize() for w in words) - return base if base.endswith('Plugin') else base + 'Plugin' - - -def _compute_pos_expr(val: int, anchor: str | None, dim_var: str) -> str: - """Produce a Python expression string for an anchored or fixed position. - - anchor=None/'left'/'top' → fixed pixel value - anchor='center' → dim_var // 2 ± offset - anchor='right'/'bottom' → dim_var - offset - """ - if not anchor or anchor in ('left', 'top'): - return str(val) - if anchor in ('center', 'middle'): - if val == 0: - return f"{dim_var} // 2" - return f"{dim_var} // 2 + {val}" if val > 0 else f"{dim_var} // 2 - {abs(val)}" - if anchor in ('right', 'bottom'): - return dim_var if val == 0 else f"{dim_var} - {val}" - return str(val) - - -# Character widths in LED pixels per font (for text-alignment x offset math) -_FONT_CHAR_W = { - 'press_start': 8, - 'four_by_six': 4, - 'five_by_seven': 5, -} - - -def _aligned_x_expr(x_base_expr: str, text_align: str, char_count: int, char_w: int) -> str: - """Return Python x expression for text alignment. - - left → x_base_expr (no change) - center → x_base_expr - half_text_width - right → x_base_expr - text_width - """ - if text_align == 'left' or not text_align: - return x_base_expr - text_px = char_count * char_w - if text_align == 'center': - offset = text_px // 2 - return f"({x_base_expr}) - {offset}" if offset else x_base_expr - if text_align == 'right': - return f"({x_base_expr}) - {text_px}" if text_px else x_base_expr - return x_base_expr - - -def _preprocess_elements(elements: list) -> list: - """Expand raw element dicts into template-ready dicts with anchor expressions. - - Invisible elements (visible=False) are excluded from generated code entirely. - """ - result = [] - for el in elements: - # Skip hidden elements — they exist only in the preview - if el.get('visible') is False: - continue - - p = dict(el) - t = el.get('type', '') - - # Section elements are layer-list annotations only — no canvas output - if t == 'section': - continue - - x_anchor = el.get('xAnchor') or None - y_anchor = el.get('yAnchor') or None - p['min_width'] = int(el.get('minWidth', 0) or 0) - - if t in ('text', 'clock'): - font_key = el.get('font', 'press_start') - p['font_attr'] = _FONT_ATTR_MAP.get(font_key, 'regular_font') - p['rgb_tuple'] = f"({el.get('r', 255)}, {el.get('g', 255)}, {el.get('b', 255)})" - text_align = el.get('textAlign', 'left') - raw_x = el.get('x', 0) - x_base_expr = _compute_pos_expr(raw_x, x_anchor, 'width') - p['y_expr'] = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - font_size = _FONT_SIZE_MAP.get(font_key, 8) - char_w = _FONT_CHAR_W.get(font_key, 8) - line_spacing = int(el.get('lineSpacing', 2)) - y_expr = p['y_expr'] - p['y2_expr'] = f"({y_expr}) + {font_size + line_spacing}" - if t == 'text': - t1 = el.get('text', '') or '' - t2 = el.get('text2', '') or '' - p['text2'] = t2 - # Detect {variable} tokens — generate format_map() call instead of literal - _var_re = re.compile(r'\{([a-zA-Z_]\w*)\}') - p['text_is_template'] = bool(_var_re.search(t1) or _var_re.search(t2)) - ref_len = max(len(t1), len(t2)) if t2 else len(t1) - p['x_expr'] = _aligned_x_expr(x_base_expr, text_align, ref_len, char_w) - p['x2_expr'] = p['x_expr'] # second line uses same x - else: # clock - fmt1 = el.get('format', '%H:%M') or '%H:%M' - fmt2 = el.get('format2', '') or '' - p['format2'] = fmt2 - ref_len = max(len(fmt1), len(fmt2)) if fmt2 else len(fmt1) - p['x_expr'] = _aligned_x_expr(x_base_expr, text_align, ref_len, char_w) - p['x2_expr'] = p['x_expr'] - p['blink'] = bool(el.get('blink', False)) - - elif t == 'dynamic_text': - binding = el.get('binding', {}) - p['binding_source'] = binding.get('source', 'config') - p['binding_key'] = binding.get('key', '') - p['binding_format'] = binding.get('format') - font_key = el.get('font', 'press_start') - p['font_attr'] = _FONT_ATTR_MAP.get(font_key, 'regular_font') - p['rgb_tuple'] = f"({el.get('r', 255)}, {el.get('g', 200)}, {el.get('b', 100)})" - x_base_expr = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - p['x_expr'] = x_base_expr # dynamic text: runtime content determines width; use raw pos - p['y_expr'] = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - p['blink'] = bool(el.get('blink', False)) - - elif t == 'rectangle': - x_expr = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - y_expr = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - w = el.get('width', 10) - h = el.get('height', 8) - p['x_expr'] = x_expr - p['y_expr'] = y_expr - # x2/y2 as runtime expressions to support anchored positions - p['x2_expr'] = f"({x_expr}) + {w}" - p['y2_expr'] = f"({y_expr}) + {h}" - fill = ( - [el.get('fillR', 0), el.get('fillG', 0), el.get('fillB', 128)] - if el.get('hasFill', True) else None - ) - outline = ( - [el.get('outR', 255), el.get('outG', 255), el.get('outB', 255)] - if el.get('hasOutline', True) else None - ) - p['fill_tuple'] = _as_fill_filter(fill) - p['outline_tuple'] = _as_fill_filter(outline) - p['blink'] = bool(el.get('blink', False)) - - elif t in ('line', 'divider'): - if t == 'divider': - orient = el.get('orientation', 'horizontal') - if orient == 'horizontal': - y_val = el.get('y', 16) - y_expr = _compute_pos_expr(y_val, y_anchor, 'height') - p.update(x0_expr='0', y0_expr=y_expr, x1_expr='width - 1', y1_expr=y_expr) - else: - x_val = el.get('x', 64) - x_expr = _compute_pos_expr(x_val, x_anchor, 'width') - p.update(x0_expr=x_expr, y0_expr='0', x1_expr=x_expr, y1_expr='height - 1') - else: - p['x0_expr'] = _compute_pos_expr(el.get('x0', 0), x_anchor, 'width') - p['y0_expr'] = _compute_pos_expr(el.get('y0', 0), y_anchor, 'height') - p['x1_expr'] = str(el.get('x1', 127)) - p['y1_expr'] = str(el.get('y1', 0)) - p['rgb_tuple'] = f"({el.get('r', 180)}, {el.get('g', 180)}, {el.get('b', 180)})" - p['line_width'] = el.get('lineWidth', 1) - p['blink'] = bool(el.get('blink', False)) - - elif t == 'progress_bar': - p['x_expr'] = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - p['y_expr'] = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - p['bar_width'] = int(el.get('barWidth', 40)) - p['bar_height'] = int(el.get('barHeight', 6)) - binding = el.get('binding', {}) - p['binding_key'] = binding.get('key', '') - p['fill_tuple'] = f"({el.get('r', 100)}, {el.get('g', 200)}, {el.get('b', 100)})" - bg = ( - [el.get('bgR', 30), el.get('bgG', 30), el.get('bgB', 30)] - if el.get('hasBg', True) else None - ) - outline = ( - [el.get('outR', 100), el.get('outG', 100), el.get('outB', 100)] - if el.get('hasOutline', True) else None - ) - p['bg_tuple'] = _as_fill_filter(bg) - p['outline_tuple'] = _as_fill_filter(outline) - p['blink'] = bool(el.get('blink', False)) - - elif t == 'arc': - x_expr = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - y_expr = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - w = el.get('width', 24) - h = el.get('height', 24) - p['x_expr'] = x_expr - p['y_expr'] = y_expr - p['x2_expr'] = f"({x_expr}) + {w}" - p['y2_expr'] = f"({y_expr}) + {h}" - p['start_angle'] = int(el.get('startAngle', 0)) - p['end_angle'] = int(el.get('endAngle', 270)) - p['line_width'] = max(1, int(el.get('lineWidth', 2))) - p['rgb_tuple'] = f"({el.get('r', 255)}, {el.get('g', 200)}, {el.get('b', 0)})" - p['blink'] = bool(el.get('blink', False)) - - elif t == 'ellipse': - x_expr = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - y_expr = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - w = el.get('width', 24) - h = el.get('height', 12) - p['x_expr'] = x_expr - p['y_expr'] = y_expr - p['x2_expr'] = f"({x_expr}) + {w}" - p['y2_expr'] = f"({y_expr}) + {h}" - fill = ( - [el.get('fillR', 0), el.get('fillG', 100), el.get('fillB', 200)] - if el.get('hasFill', True) else None - ) - outline = ( - [el.get('outR', 100), el.get('outG', 180), el.get('outB', 255)] - if el.get('hasOutline', True) else None - ) - p['fill_tuple'] = _as_fill_filter(fill) - p['outline_tuple'] = _as_fill_filter(outline) - p['blink'] = bool(el.get('blink', False)) - - elif t == 'pixel': - p['x_expr'] = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - p['y_expr'] = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - p['rgb_tuple'] = f"({el.get('r', 255)}, {el.get('g', 255)}, {el.get('b', 255)})" - p['blink'] = bool(el.get('blink', False)) - - elif t == 'rounded_rectangle': - x_expr = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - y_expr = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - w = el.get('width', 24) - h = el.get('height', 10) - p['x_expr'] = x_expr - p['y_expr'] = y_expr - p['x2_expr'] = f"({x_expr}) + {w}" - p['y2_expr'] = f"({y_expr}) + {h}" - p['border_radius'] = int(el.get('borderRadius', 3)) - fill = ( - [el.get('fillR', 0), el.get('fillG', 80), el.get('fillB', 180)] - if el.get('hasFill', True) else None - ) - outline = ( - [el.get('outR', 120), el.get('outG', 180), el.get('outB', 255)] - if el.get('hasOutline', True) else None - ) - p['fill_tuple'] = _as_fill_filter(fill) - p['outline_tuple'] = _as_fill_filter(outline) - p['blink'] = bool(el.get('blink', False)) - - elif t == 'countdown': - font_key = el.get('font', 'four_by_six') - p['font_attr'] = _FONT_ATTR_MAP.get(font_key, 'extra_small_font') - p['rgb_tuple'] = f"({el.get('r', 255)}, {el.get('g', 180)}, {el.get('b', 0)})" - binding = el.get('binding', {}) - p['binding_key'] = binding.get('key', '') - p['countdown_format'] = el.get('countdownFormat', 'dh') - x_base_expr = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - p['x_expr'] = x_base_expr - p['y_expr'] = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - p['blink'] = bool(el.get('blink', False)) - - elif t == 'pips': - p['x_expr'] = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - p['y_expr'] = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - p['pip_count'] = max(1, int(el.get('count', 5))) - p['pip_size'] = max(1, int(el.get('pipSize', 4))) - p['pip_spacing'] = max(0, int(el.get('pipSpacing', 2))) - p['show_empty'] = bool(el.get('showEmpty', True)) - binding = el.get('binding', {}) - p['binding_key'] = binding.get('key', '') - p['fill_tuple'] = f"({el.get('r', 255)}, {el.get('g', 200)}, {el.get('b', 0)})" - p['empty_tuple'] = f"({el.get('emptyR', 50)}, {el.get('emptyG', 50)}, {el.get('emptyB', 50)})" - p['blink'] = bool(el.get('blink', False)) - - elif t == 'sparkline': - x_expr = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - y_expr = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - p['x_expr'] = x_expr - p['y_expr'] = y_expr - p['bar_width_px'] = int(el.get('width', 40)) - p['bar_height_px'] = int(el.get('height', 12)) - p['bar_count'] = max(1, int(el.get('barCount', 8))) - p['bar_spacing'] = max(0, int(el.get('barSpacing', 1))) - binding = el.get('binding', {}) - p['binding_key'] = binding.get('key', '') - p['fill_tuple'] = f"({el.get('r', 80)}, {el.get('g', 200)}, {el.get('b', 120)})" - bg = [el.get('bgR', 30), el.get('bgG', 30), el.get('bgB', 30)] if el.get('hasBg', False) else None - p['bg_tuple'] = _as_fill_filter(bg) - p['blink'] = bool(el.get('blink', False)) - - elif t == 'gauge': - x_expr = _compute_pos_expr(el.get('x', 0), x_anchor, 'width') - y_expr = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - w = el.get('width', 32) - h = el.get('height', 32) - p['x_expr'] = x_expr - p['y_expr'] = y_expr - p['x2_expr'] = f"({x_expr}) + {w}" - p['y2_expr'] = f"({y_expr}) + {h}" - p['start_angle'] = int(el.get('startAngle', 135)) - p['end_angle'] = int(el.get('endAngle', 45)) - p['line_width'] = max(1, int(el.get('lineWidth', 3))) - p['rgb_tuple'] = f"({el.get('r', 80)}, {el.get('g', 220)}, {el.get('b', 80)})" - track = ( - [el.get('trackR', 40), el.get('trackG', 40), el.get('trackB', 40)] - if el.get('hasTrack', True) else None - ) - p['track_tuple'] = _as_fill_filter(track) - binding = el.get('binding', {}) - p['binding_key'] = binding.get('key', '') - font_key = el.get('font', 'four_by_six') - p['font_attr'] = _FONT_ATTR_MAP.get(font_key, 'extra_small_font') - p['show_label'] = bool(el.get('showLabel', True)) - p['label_tuple'] = f"({el.get('labelR', 200)}, {el.get('labelG', 200)}, {el.get('labelB', 200)})" - p['blink'] = bool(el.get('blink', False)) - - elif t == 'marquee': - font_key = el.get('font', 'press_start') - p['font_attr'] = _FONT_ATTR_MAP.get(font_key, 'regular_font') - p['rgb_tuple'] = f"({el.get('r', 255)}, {el.get('g', 255)}, {el.get('b', 255)})" - p['y_expr'] = _compute_pos_expr(el.get('y', 0), y_anchor, 'height') - p['text'] = el.get('text', 'Scrolling text') - p['char_w'] = _FONT_CHAR_W.get(font_key, 8) - p['gap'] = int(el.get('gap', 16)) - p['scroll_speed'] = max(1, int(el.get('scrollSpeed', 1))) - p['direction'] = el.get('direction', 'left') - # Data key stored in self._data for stateful scrolling across display() calls - raw_id = str(el.get('id', 0)).replace('-', '_') - p['data_key'] = f"mq_{raw_id}" - p['blink'] = bool(el.get('blink', False)) - - result.append(p) - return result - - -def _generate_plugin_files(data: dict) -> dict: - """ - Generate all plugin file contents as strings. - - Returns dict: {'manager.py', 'manifest.json', 'config_schema.json', 'requirements.txt'} - Raises ValueError with a human-readable message on any validation failure. - """ - metadata = data.get('metadata', {}) - elements = data.get('elements', []) - data_model = data.get('dataModel', {}) - config_vars = data_model.get('configVars', []) - - plugin_id = metadata.get('id', '').strip() - if not _PLUGIN_ID_RE.match(plugin_id): - raise ValueError( - 'Plugin ID must start with a lowercase letter and contain only ' - 'lowercase letters, numbers, and hyphens (max 63 chars).' - ) - - plugin_name = metadata.get('name', '').strip() - if not plugin_name: - raise ValueError('Plugin name is required.') - - author = metadata.get('author', '').strip() - if not author: - raise ValueError('Author is required.') - - version = metadata.get('version', '1.0.0').strip() - - # Validate config var keys are valid Python identifiers - for cv in config_vars: - key = cv.get('key', '') - if not _PYTHON_IDENT_RE.match(key): - raise ValueError(f'Config variable key "{key}" is not a valid Python identifier.') - - class_name = _to_class_name(plugin_name) - # Only consider visible elements for code generation flags - visible_elements = [e for e in elements if e.get('visible') is not False] - processed = _preprocess_elements(elements) - has_clock = any(e.get('type') == 'clock' for e in visible_elements) - has_blink = any(e.get('blink') for e in visible_elements) - has_countdown = any(e.get('type') == 'countdown' for e in visible_elements) - _var_re = re.compile(r'\{[a-zA-Z_]\w*\}') - has_text_template = any( - e.get('type') == 'text' and ( - _var_re.search(e.get('text', '') or '') or - _var_re.search(e.get('text2', '') or '') - ) - for e in visible_elements - ) - - # Background fill color (None → don't render, use LED panel's native black) - bg_color: str | None = None - bg_raw = metadata.get('bgColor') - if isinstance(bg_raw, dict): - r, g, b = int(bg_raw.get('r', 0)), int(bg_raw.get('g', 0)), int(bg_raw.get('b', 0)) - if r or g or b: - bg_color = f'({r}, {g}, {b})' - - # Render manager.py - env = _get_jinja_env() - try: - tmpl = env.get_template('manager.py.j2') - except jinja2.TemplateNotFound: - raise ValueError('Code generation template not found. This is a server configuration issue.') - - manager_py = tmpl.render( - plugin_name=plugin_name, - class_name=class_name, - plugin_id=plugin_id, - generated_date=datetime.now().strftime('%Y-%m-%d'), - config_vars=config_vars, - elements=processed, - has_clock=has_clock, - has_blink=has_blink, - has_countdown=has_countdown, - has_text_template=has_text_template, - bg_color=bg_color, - ) - - # Syntax-check the generated Python - try: - ast.parse(manager_py) - except SyntaxError as exc: - raise ValueError(f'Generated code has a syntax error: {exc}') from exc - - # Build manifest - manifest = { - 'id': plugin_id, - 'name': plugin_name, - 'version': version, - 'author': author, - 'description': metadata.get('description', f'Custom plugin created with LEDMatrix Plugin Composer'), - 'category': metadata.get('category', 'custom'), - 'tags': ['composer', 'custom'], - 'entry_point': 'manager.py', - 'class_name': class_name, - 'display_modes': [plugin_id], - 'compatible_versions': ['>=2.0.0'], - 'last_updated': datetime.now().strftime('%Y-%m-%d'), - 'update_interval': int(metadata.get('update_interval', 60)), - 'default_duration': float(metadata.get('display_duration', 15)), - 'versions': [ - {'released': datetime.now().strftime('%Y-%m-%d'), 'version': version} - ], - } - - # Validate manifest against the project's schema - if composer_bp.project_root: - schema_path = Path(composer_bp.project_root) / 'schema' / 'manifest_schema.json' - if schema_path.exists(): - schema = json.loads(schema_path.read_text()) - validator = jsonschema.Draft7Validator(schema) - errors = list(validator.iter_errors(manifest)) - if errors: - msgs = '; '.join(e.message for e in errors[:3]) - raise ValueError(f'Manifest validation failed: {msgs}') - - # Build config_schema - type_map = { - 'string': {'type': 'string'}, - 'number': {'type': 'number', 'minimum': 0}, - 'boolean': {'type': 'boolean'}, - 'color': { - 'type': 'array', - 'items': {'type': 'integer', 'minimum': 0, 'maximum': 255}, - 'minItems': 3, - 'maxItems': 3, - }, - } - - config_properties = { - 'enabled': {'type': 'boolean', 'default': True}, - 'display_duration': {'type': 'number', 'minimum': 1, 'default': float(metadata.get('display_duration', 15))}, - } - for cv in config_vars: - cv_type = cv.get('type', 'string') - prop = dict(type_map.get(cv_type, {'type': 'string'})) - if cv.get('description'): - prop['description'] = cv['description'] - if cv.get('label'): - prop['title'] = cv['label'] - default = cv.get('default', '') - if cv_type == 'number': - try: - prop['default'] = float(default) if default != '' else 0 - except (TypeError, ValueError): - prop['default'] = 0 - elif cv_type == 'boolean': - prop['default'] = bool(default) - else: - prop['default'] = default - config_properties[cv['key']] = prop - - config_schema = { - '$schema': 'http://json-schema.org/draft-07/schema#', - 'type': 'object', - 'properties': config_properties, - } - - return { - 'manager.py': manager_py, - 'manifest.json': json.dumps(manifest, indent=2), - 'config_schema.json': json.dumps(config_schema, indent=2), - 'requirements.txt': '', - } - - -def _save_composer_state(target_dir: Path, payload: dict) -> None: - """Persist the raw composer payload alongside the generated plugin files.""" - (target_dir / '_composer_state.json').write_text( - json.dumps(payload, indent=2, ensure_ascii=False), encoding='utf-8' - ) - - -def _pack_zip(files: dict, plugin_id: str) -> io.BytesIO: - """Pack generated plugin files into an in-memory ZIP.""" - buf = io.BytesIO() - with zipfile.ZipFile(buf, 'w', compression=zipfile.ZIP_DEFLATED) as zf: - for filename, content in files.items(): - info = zipfile.ZipInfo(f'{plugin_id}/{filename}') - info.compress_type = zipfile.ZIP_DEFLATED - zf.writestr(info, content.encode('utf-8') if isinstance(content, str) else content) - buf.seek(0) - return buf - - -# ── Routes ──────────────────────────────────────────────────────────────────── - -@composer_bp.route('/') -def index(): - return render_template('v3/composer.html') - - -@composer_bp.route('/api/generate', methods=['POST']) -def generate_zip(): - data = request.get_json(force=True, silent=True) - if not data: - return jsonify({'status': 'error', 'message': 'No JSON body'}), 400 - try: - files = _generate_plugin_files(data) - except ValueError as exc: - return jsonify({'status': 'error', 'message': str(exc)}), 422 - - plugin_id = data.get('metadata', {}).get('id', 'plugin') - files['_composer_state.json'] = json.dumps(data, indent=2, ensure_ascii=False) - zip_buf = _pack_zip(files, plugin_id) - return send_file( - zip_buf, - mimetype='application/zip', - as_attachment=True, - download_name=f'{plugin_id}.zip', - ) - - -@composer_bp.route('/api/install', methods=['POST']) -def install_locally(): - if not composer_bp.plugins_dir: - return jsonify({'status': 'error', 'message': 'Plugin directory not configured'}), 503 - - data = request.get_json(force=True, silent=True) - if not data: - return jsonify({'status': 'error', 'message': 'No JSON body'}), 400 - - try: - files = _generate_plugin_files(data) - except ValueError as exc: - return jsonify({'status': 'error', 'message': str(exc)}), 422 - - plugin_id = data.get('metadata', {}).get('id', '') - target = Path(composer_bp.plugins_dir) / plugin_id - force = bool(data.get('_force', False)) - - if target.exists() and not force: - return jsonify({ - 'status': 'conflict', - 'message': f'Plugin "{plugin_id}" is already installed.', - }), 409 - - try: - if target.exists() and force: - import shutil as _shutil - _shutil.rmtree(target) - target.mkdir(parents=True, exist_ok=False) - for filename, content in files.items(): - (target / filename).write_text(content, encoding='utf-8') - _save_composer_state(target, data) - except OSError as exc: - return jsonify({'status': 'error', 'message': f'Failed to write plugin files: {exc}'}), 500 - - # Trigger plugin discovery so it shows up in the Plugin Manager immediately - if composer_bp.plugin_manager: - try: - composer_bp.plugin_manager.discover_plugins() - except Exception as exc: - logger.warning('discover_plugins() failed after composer install: %s', exc) - - return jsonify({ - 'status': 'success', - 'message': f'Plugin "{plugin_id}" installed successfully.', - 'plugin_id': plugin_id, - }) - - -@composer_bp.route('/api/fonts/') -def serve_font(font_name): - """Serve an allowlisted font file for canvas FontFace loading.""" - if font_name not in _ALLOWED_FONTS: - return '', 404 - if not composer_bp.project_root: - return '', 503 - font_path = Path(composer_bp.project_root) / 'assets' / 'fonts' / font_name - if not font_path.exists(): - return '', 404 - return send_file(str(font_path), mimetype='font/ttf') - - -@composer_bp.route('/api/validate-id/') -def validate_id(plugin_id): - """Check whether a plugin ID is valid and available.""" - if not _PLUGIN_ID_RE.match(plugin_id): - return jsonify({'valid': False, 'available': False, 'reason': 'Invalid format'}) - if composer_bp.plugins_dir: - taken = (Path(composer_bp.plugins_dir) / plugin_id).exists() - if taken: - return jsonify({'valid': True, 'available': False, 'reason': 'Already installed'}) - return jsonify({'valid': True, 'available': True}) - - -@composer_bp.route('/api/plugins') -def list_plugins(): - """List installed plugins, flagging which ones have a saved composer state.""" - if not composer_bp.plugins_dir: - return jsonify([]) - plugins_dir = Path(composer_bp.plugins_dir) - results = [] - for entry in sorted(plugins_dir.iterdir()): - if not entry.is_dir(): - continue - manifest_path = entry / 'manifest.json' - if not manifest_path.exists(): - continue - try: - manifest = json.loads(manifest_path.read_text()) - except Exception: - continue - has_state = (entry / '_composer_state.json').exists() - results.append({ - 'id': manifest.get('id', entry.name), - 'name': manifest.get('name', entry.name), - 'version': manifest.get('version', ''), - 'author': manifest.get('author', ''), - 'has_composer_state': has_state, - }) - return jsonify(results) - - -@composer_bp.route('/api/preview', methods=['POST']) -def preview_code(): - """Generate plugin files and return them as JSON for the code preview modal.""" - data = request.get_json(force=True, silent=True) - if not data: - return jsonify({'status': 'error', 'message': 'No JSON body'}), 400 - try: - files = _generate_plugin_files(data) - except ValueError as exc: - return jsonify({'status': 'error', 'message': str(exc)}), 422 - return jsonify({ - 'status': 'ok', - 'files': { - 'manager.py': files['manager.py'], - 'manifest.json': files['manifest.json'], - 'config_schema.json': files['config_schema.json'], - }, - }) - - -@composer_bp.route('/api/load/') -def load_plugin(plugin_id): - """Load a plugin's composer state for editing. - - If a _composer_state.json exists, return it verbatim. - Otherwise, extract config vars from config_schema.json for a partial import. - """ - if not composer_bp.plugins_dir: - return jsonify({'status': 'error', 'message': 'Plugin directory not configured'}), 503 - if not _PLUGIN_ID_RE.match(plugin_id): - return jsonify({'status': 'error', 'message': 'Invalid plugin ID'}), 400 - - plugin_dir = Path(composer_bp.plugins_dir) / plugin_id - if not plugin_dir.exists(): - return jsonify({'status': 'error', 'message': 'Plugin not found'}), 404 - - # Full composer state - state_path = plugin_dir / '_composer_state.json' - if state_path.exists(): - try: - state = json.loads(state_path.read_text()) - return jsonify({'status': 'ok', 'source': 'composer', 'state': state}) - except Exception as exc: - return jsonify({'status': 'error', 'message': f'Failed to read state: {exc}'}), 500 - - # Partial import from config_schema.json - schema_path = plugin_dir / 'config_schema.json' - manifest_path = plugin_dir / 'manifest.json' - config_vars = [] - - if schema_path.exists(): - try: - schema = json.loads(schema_path.read_text()) - props = schema.get('properties', {}) - skip = {'enabled', 'display_duration', 'update_interval'} - type_map = {'boolean': 'boolean', 'number': 'number', 'integer': 'number', 'string': 'string'} - for key, prop in props.items(): - if key in skip: - continue - prop_type = prop.get('type', 'string') - if isinstance(prop_type, list): - prop_type = next((t for t in prop_type if t != 'null'), 'string') - # Detect color arrays - if prop_type == 'array' and prop.get('maxItems') == 3: - cv_type = 'color' - else: - cv_type = type_map.get(prop_type, 'string') - config_vars.append({ - 'key': key, - 'label': prop.get('title', key.replace('_', ' ').title()), - 'type': cv_type, - 'default': prop.get('default', ''), - 'description': prop.get('description', ''), - }) - except Exception: - pass - - manifest = {} - if manifest_path.exists(): - try: - manifest = json.loads(manifest_path.read_text()) - except Exception: - pass - - partial_state = { - 'composer_version': '1.0', - 'metadata': { - 'id': manifest.get('id', plugin_id), - 'name': manifest.get('name', plugin_id), - 'author': manifest.get('author', ''), - 'version': manifest.get('version', '1.0.0'), - 'description': manifest.get('description', ''), - 'category': manifest.get('category', 'custom'), - 'display_duration': manifest.get('default_duration', 15), - 'update_interval': manifest.get('update_interval', 60), - 'api_requirements': manifest.get('api_requirements', []), - }, - 'elements': [], - 'dataModel': {'configVars': config_vars, 'dataSources': [], 'computedVars': []}, - } - return jsonify({'status': 'ok', 'source': 'schema_import', 'state': partial_state}) diff --git a/web_interface/static/v3/js/composer/composer-app.js b/web_interface/static/v3/js/composer/composer-app.js deleted file mode 100644 index f0124371..00000000 --- a/web_interface/static/v3/js/composer/composer-app.js +++ /dev/null @@ -1,1337 +0,0 @@ -/** - * composerApp() — AlpineJS component for the Plugin Composer. - * - * Key architecture notes: - * - All mutations call _snapshot() for undo/redo support - * - Elements with anchors: drag stores offset from anchor, not raw px - * - localStorage autosaves on every mutation (debounced 1.5s) - * - composer_version in payload allows future server-side migration - */ - -// ── Template library ───────────────────────────────────────────────────────── -const COMPOSER_TEMPLATES = [ - { - id: 'blank', - label: 'Blank Canvas', - description: 'Start from scratch', - icon: 'fas fa-plus-square', - preset: '128×32', - elements: [], - dataModel: { configVars: [], dataSources: [], computedVars: [] }, - }, - { - id: 'clock', - label: 'Digital Clock', - description: 'Large clock with date below a divider', - icon: 'fas fa-clock', - preset: '128×32', - elements: [ - { id:1, type:'clock', x:44, y:4, format:'%H:%M', font:'press_start', r:100, g:255, b:100, xAnchor:null, yAnchor:null, minWidth:0, label:'time', conditions:[] }, - { id:2, type:'divider', x:0, y:18, orientation:'horizontal', r:50, g:50, b:50, xAnchor:null, yAnchor:null, minWidth:0, label:'', conditions:[] }, - { id:3, type:'clock', x:32, y:22, format:'%A %b %d', font:'four_by_six', r:150, g:150, b:150, xAnchor:null, yAnchor:null, minWidth:0, label:'date', conditions:[] }, - ], - dataModel: { configVars:[], dataSources:[], computedVars:[] }, - }, - { - id: 'announcement', - label: 'Announcement', - description: 'Static title + configurable message text', - icon: 'fas fa-bullhorn', - preset: '128×32', - elements: [ - { id:1, type:'text', x:4, y:2, text:'ANNOUNCEMENT', font:'four_by_six', r:255, g:200, b:0, xAnchor:null, yAnchor:null, minWidth:0, label:'title', conditions:[] }, - { id:2, type:'divider', x:0, y:11, orientation:'horizontal', r:80, g:80, b:0, xAnchor:null, yAnchor:null, minWidth:0, label:'', conditions:[] }, - { id:3, type:'dynamic_text', x:4, y:15, binding:{source:'config',key:'message',format:null}, font:'four_by_six', r:255, g:255, b:255, xAnchor:null, yAnchor:null, minWidth:0, label:'message', conditions:[] }, - ], - dataModel: { - configVars:[{ key:'message', label:'Message', type:'string', default:'Hello World!', description:'Message to display' }], - dataSources:[], computedVars:[], - }, - }, - { - id: 'scoreboard', - label: 'Scoreboard', - description: 'Two-team scores with status line', - icon: 'fas fa-trophy', - preset: '128×32', - elements: [ - { id:1, type:'dynamic_text', x:2, y:2, binding:{source:'config',key:'home_team',format:null}, font:'four_by_six', r:255,g:255,b:255, xAnchor:null,yAnchor:null,minWidth:0, label:'home team', conditions:[] }, - { id:2, type:'dynamic_text', x:2, y:12, binding:{source:'config',key:'home_score',format:null}, font:'press_start', r:255,g:220,b:50, xAnchor:null,yAnchor:null,minWidth:0, label:'home score', conditions:[] }, - { id:3, type:'divider', x:64, y:0, orientation:'vertical', r:60,g:60,b:60, xAnchor:null,yAnchor:null,minWidth:0, label:'', conditions:[] }, - { id:4, type:'dynamic_text', x:68, y:2, binding:{source:'config',key:'away_team',format:null}, font:'four_by_six', r:200,g:200,b:255, xAnchor:null,yAnchor:null,minWidth:0, label:'away team', conditions:[] }, - { id:5, type:'dynamic_text', x:68, y:12, binding:{source:'config',key:'away_score',format:null}, font:'press_start', r:100,g:180,b:255, xAnchor:null,yAnchor:null,minWidth:0, label:'away score', conditions:[] }, - { id:6, type:'dynamic_text', x:44, y:25, binding:{source:'config',key:'game_status',format:null}, font:'four_by_six', r:150,g:150,b:150, xAnchor:null,yAnchor:null,minWidth:0, label:'status', conditions:[] }, - ], - dataModel: { - configVars:[ - {key:'home_team', label:'Home Team', type:'string', default:'HOME', description:'Home team abbreviation'}, - {key:'home_score', label:'Home Score', type:'string', default:'0', description:'Home team score'}, - {key:'away_team', label:'Away Team', type:'string', default:'AWAY', description:'Away team abbreviation'}, - {key:'away_score', label:'Away Score', type:'string', default:'0', description:'Away team score'}, - {key:'game_status',label:'Game Status', type:'string', default:'LIVE', description:'Status label'}, - ], - dataSources:[], computedVars:[], - }, - }, - { - id: 'weather', - label: 'Weather Card', - description: 'Temperature + condition + location', - icon: 'fas fa-cloud-sun', - preset: '128×32', - elements: [ - { id:1, type:'dynamic_text', x:2, y:4, binding:{source:'config',key:'temperature',format:null}, font:'press_start', r:255,g:140,b:40, xAnchor:null,yAnchor:null,minWidth:0, label:'temp', conditions:[] }, - { id:2, type:'divider', x:0, y:16, orientation:'horizontal', r:50,g:50,b:80, xAnchor:null,yAnchor:null,minWidth:0, label:'', conditions:[] }, - { id:3, type:'dynamic_text', x:2, y:20, binding:{source:'config',key:'condition',format:null}, font:'four_by_six', r:180,g:200,b:255, xAnchor:null,yAnchor:null,minWidth:0, label:'condition', conditions:[] }, - { id:4, type:'dynamic_text', x:80, y:20, binding:{source:'config',key:'location',format:null}, font:'four_by_six', r:120,g:120,b:120, xAnchor:null,yAnchor:null,minWidth:0, label:'location', conditions:[] }, - ], - dataModel: { - configVars:[ - {key:'temperature', label:'Temperature', type:'string', default:'72°F', description:'Current temperature'}, - {key:'condition', label:'Condition', type:'string', default:'Sunny', description:'Weather condition'}, - {key:'location', label:'Location', type:'string', default:'My City', description:'City name'}, - ], - dataSources:[], computedVars:[], - }, - }, - { - id: 'crypto', - label: 'Crypto Ticker', - description: 'Asset price + 24h change percentage', - icon: 'fas fa-chart-line', - preset: '128×32', - elements: [ - { id:1, type:'dynamic_text', x:2, y:2, binding:{source:'config',key:'ticker',format:null}, font:'press_start', r:255,g:165,b:0, xAnchor:null,yAnchor:null,minWidth:0, label:'ticker', conditions:[] }, - { id:2, type:'dynamic_text', x:2, y:16, binding:{source:'config',key:'price',format:null}, font:'press_start', r:255,g:255,b:255, xAnchor:null,yAnchor:null,minWidth:0, label:'price', conditions:[] }, - { id:3, type:'dynamic_text', x:88, y:16, binding:{source:'config',key:'change_pct',format:null}, font:'four_by_six', r:100,g:255,b:100, xAnchor:null,yAnchor:null,minWidth:0, label:'change', conditions:[] }, - ], - dataModel: { - configVars:[ - {key:'ticker', label:'Ticker', type:'string', default:'BTC', description:'Asset symbol'}, - {key:'price', label:'Price', type:'string', default:'$0.00', description:'Asset price'}, - {key:'change_pct', label:'Change %', type:'string', default:'+0.00%', description:'24h change'}, - ], - dataSources:[], computedVars:[], - }, - }, - { - id: 'system', - label: 'System Monitor', - description: 'CPU, memory, and IP address', - icon: 'fas fa-server', - preset: '128×32', - elements: [ - { id:1, type:'text', x:2, y:2, text:'CPU', font:'four_by_six', r:120,g:120,b:120, xAnchor:null,yAnchor:null,minWidth:0, label:'', conditions:[] }, - { id:2, type:'dynamic_text', x:22, y:2, binding:{source:'config',key:'cpu_usage',format:null}, font:'four_by_six', r:100,g:255,b:100, xAnchor:null,yAnchor:null,minWidth:0, label:'cpu', conditions:[] }, - { id:3, type:'text', x:2, y:12, text:'MEM', font:'four_by_six', r:120,g:120,b:120, xAnchor:null,yAnchor:null,minWidth:0, label:'', conditions:[] }, - { id:4, type:'dynamic_text', x:22, y:12, binding:{source:'config',key:'mem_usage',format:null}, font:'four_by_six', r:100,g:180,b:255, xAnchor:null,yAnchor:null,minWidth:0, label:'mem', conditions:[] }, - { id:5, type:'text', x:2, y:22, text:'IP', font:'four_by_six', r:120,g:120,b:120, xAnchor:null,yAnchor:null,minWidth:0, label:'', conditions:[] }, - { id:6, type:'dynamic_text', x:14, y:22, binding:{source:'config',key:'ip_address',format:null}, font:'four_by_six', r:255,g:255,b:150, xAnchor:null,yAnchor:null,minWidth:0, label:'ip', conditions:[] }, - ], - dataModel: { - configVars:[ - {key:'cpu_usage', label:'CPU %', type:'string', default:'0%', description:'CPU usage'}, - {key:'mem_usage', label:'Memory %', type:'string', default:'0%', description:'Memory usage'}, - {key:'ip_address', label:'IP Address',type:'string', default:'0.0.0.0', description:'Network IP'}, - ], - dataSources:[], computedVars:[], - }, - }, - { - id: 'split_panel', - label: 'Split Panel', - description: 'Left label + right value, divided', - icon: 'fas fa-columns', - preset: '128×32', - elements: [ - { id:1, type:'dynamic_text', x:2, y:4, binding:{source:'config',key:'left_label',format:null}, font:'four_by_six', r:180,g:180,b:180, xAnchor:null,yAnchor:null,minWidth:0, label:'label', conditions:[] }, - { id:2, type:'divider', x:64, y:0, orientation:'vertical', r:60,g:60,b:60, xAnchor:null,yAnchor:null,minWidth:0, label:'', conditions:[] }, - { id:3, type:'dynamic_text', x:68, y:4, binding:{source:'config',key:'right_value',format:null}, font:'press_start', r:255,g:255,b:255, xAnchor:null,yAnchor:null,minWidth:0, label:'value', conditions:[] }, - ], - dataModel: { - configVars:[ - {key:'left_label', label:'Label', type:'string', default:'LABEL', description:'Left panel label'}, - {key:'right_value', label:'Value', type:'string', default:'--', description:'Right panel value'}, - ], - dataSources:[], computedVars:[], - }, - }, -]; - -// ── LED display color palette ──────────────────────────────────────────────── -const LED_PALETTE = [ - { label: 'White', hex: '#ffffff', r: 255, g: 255, b: 255 }, - { label: 'Red', hex: '#ff2020', r: 255, g: 32, b: 32 }, - { label: 'Green', hex: '#20ff40', r: 32, g: 255, b: 64 }, - { label: 'Blue', hex: '#4060ff', r: 64, g: 96, b: 255 }, - { label: 'Yellow', hex: '#ffee00', r: 255, g: 238, b: 0 }, - { label: 'Orange', hex: '#ff8000', r: 255, g: 128, b: 0 }, - { label: 'Cyan', hex: '#00eeff', r: 0, g: 238, b: 255 }, - { label: 'Magenta', hex: '#ff00cc', r: 255, g: 0, b: 204 }, - { label: 'Amber', hex: '#ffb400', r: 255, g: 180, b: 0 }, - { label: 'Dim white', hex: '#888888', r: 136, g: 136, b: 136 }, - { label: 'Dark gray', hex: '#444444', r: 68, g: 68, b: 68 }, - { label: 'Off/Black', hex: '#000000', r: 0, g: 0, b: 0 }, -]; - -// ── Autosave helpers ───────────────────────────────────────────────────────── -const LS_KEY = 'ledmatrix_composer_draft'; -let _autosaveTimer = null; - -function _debouncedAutosave(payload) { - clearTimeout(_autosaveTimer); - _autosaveTimer = setTimeout(() => { - try { localStorage.setItem(LS_KEY, JSON.stringify(payload)); } catch (_) {} - }, 1500); -} - -// ── Main component ─────────────────────────────────────────────────────────── -function composerApp() { - return { - // ── Plugin metadata ─────────────────────────────────────────────── - metadata: { - id: '', - name: '', - author: '', - version: '1.0.0', - description: '', - category: 'custom', - display_duration: 15, - update_interval: 60, - api_requirements: [], - bgColor: { r: 0, g: 0, b: 0 }, - }, - - // ── Canvas / display preset ─────────────────────────────────────── - SCALE: 4, - MATRIX_W: 128, - MATRIX_H: 32, - currentPreset: '128×32', - - // ── Elements ────────────────────────────────────────────────────── - elements: [], - _nextId: 1, - - // ── Data model ─────────────────────────────────────────────────── - dataModel: { - configVars: [], - dataSources: [], - computedVars: [], - }, - - // ── Undo/redo ───────────────────────────────────────────────────── - _history: [], - _historyIndex: -1, - - // ── Selection & interaction ─────────────────────────────────────── - selectedId: null, - _drag: { active: false }, - _resize: { active: false }, - - // ── Canvas options ──────────────────────────────────────────────── - snapToGrid: false, - snapSize: 4, - - // ── Clipboard ───────────────────────────────────────────────────── - _clipboard: null, - _styleClipboard: null, - - // ── UI state ────────────────────────────────────────────────────── - isDirty: false, - statusMsg: '', - statusType: 'info', - generateStatus: 'idle', - installStatus: 'idle', - showGridOverlay: true, - showGuides: false, - blinkAnimating: false, - _blinkPhase: false, - _blinkTimer: null, - _animTick: 0, - _previewValues: {}, - showHelpModal: false, - _recentColors: [], - showRuler: false, - showConfigVarModal: false, - showOpenModal: false, - showTemplateModal: false, - showCodeModal: false, - _idAutoGenerated: true, - hoverInfo: '', - installedPlugins: [], - loadPluginsStatus: 'idle', - codeFiles: {}, - codeTab: 'manager.py', - loadingCode: false, - newConfigVar: { key: '', label: '', type: 'string', default: '', description: '' }, - - // ── Computed ────────────────────────────────────────────────────── - get selectedElement() { - return this.elements.find(e => e.id === this.selectedId) ?? null; - }, - get canExport() { - return this.metadata.name.trim() && this.metadata.id.trim() && this.elements.length > 0; - }, - get canUndo() { return this._historyIndex > 0; }, - get canRedo() { return this._historyIndex < this._history.length - 1; }, - get templates() { return COMPOSER_TEMPLATES; }, - get displayPresets() { return window.ComposerCanvas.DISPLAY_PRESETS; }, - get palette() { return LED_PALETTE; }, - - // ── Pre-made variable library ───────────────────────────────────── - preMadeVarCategories: [ - { label: 'Display', vars: [ - {key:'title_text', label:'Title', type:'string', default:'My Plugin', description:'Main title'}, - {key:'subtitle', label:'Subtitle', type:'string', default:'', description:'Secondary line'}, - {key:'message', label:'Message', type:'string', default:'Hello!', description:'Dynamic message'}, - ]}, - { label: 'Sports / Score', vars: [ - {key:'home_score', label:'Home Score', type:'string', default:'0', description:'Home team score'}, - {key:'away_score', label:'Away Score', type:'string', default:'0', description:'Away team score'}, - {key:'home_team', label:'Home Team', type:'string', default:'HOME', description:'Home team abbr'}, - {key:'away_team', label:'Away Team', type:'string', default:'AWAY', description:'Away team abbr'}, - {key:'game_status', label:'Game Status', type:'string', default:'LIVE', description:'Status label'}, - {key:'period', label:'Period', type:'string', default:'1st', description:'Period/quarter'}, - {key:'time_left', label:'Time Left', type:'string', default:'15:00',description:'Game clock'}, - ]}, - { label: 'Weather', vars: [ - {key:'temperature', label:'Temperature', type:'string', default:'72°F', description:'Current temperature'}, - {key:'condition', label:'Condition', type:'string', default:'Sunny', description:'Weather condition'}, - {key:'humidity', label:'Humidity', type:'string', default:'50%', description:'Humidity'}, - {key:'location', label:'Location', type:'string', default:'My City',description:'Location name'}, - ]}, - { label: 'System / Stats', vars: [ - {key:'cpu_usage', label:'CPU %', type:'string', default:'0%', description:'CPU usage'}, - {key:'mem_usage', label:'Memory %', type:'string', default:'0%', description:'Memory usage'}, - {key:'ip_address', label:'IP Address',type:'string', default:'0.0.0.0', description:'Network IP'}, - {key:'uptime', label:'Uptime', type:'string', default:'0d 0h', description:'System uptime'}, - ]}, - { label: 'Crypto / Finance', vars: [ - {key:'ticker', label:'Ticker', type:'string', default:'BTC', description:'Asset symbol'}, - {key:'price', label:'Price', type:'string', default:'$0.00', description:'Asset price'}, - {key:'change_pct', label:'Change %', type:'string', default:'+0.00%', description:'24h change'}, - {key:'volume', label:'Volume', type:'string', default:'0', description:'Trading volume'}, - ]}, - ], - - elementTypes: [ - { id: 'text', label: 'Text', icon: 'fas fa-font' }, - { id: 'dynamic_text', label: 'Dynamic Text', icon: 'fas fa-code' }, - { id: 'clock', label: 'Clock', icon: 'fas fa-clock' }, - { id: 'rectangle', label: 'Rectangle', icon: 'fas fa-square' }, - { id: 'rounded_rectangle', label: 'Rounded Rect', icon: 'fas fa-stop' }, - { id: 'ellipse', label: 'Ellipse', icon: 'fas fa-circle' }, - { id: 'arc', label: 'Arc', icon: 'fas fa-circle-notch' }, - { id: 'pixel', label: 'Pixel', icon: 'fas fa-dot-circle' }, - { id: 'line', label: 'Line', icon: 'fas fa-minus' }, - { id: 'divider', label: 'Divider', icon: 'fas fa-grip-lines' }, - { id: 'progress_bar', label: 'Progress Bar', icon: 'fas fa-tasks' }, - { id: 'countdown', label: 'Countdown', icon: 'fas fa-hourglass-half' }, - { id: 'marquee', label: 'Marquee', icon: 'fas fa-arrows-alt-h' }, - { id: 'gauge', label: 'Gauge', icon: 'fas fa-tachometer-alt' }, - { id: 'sparkline', label: 'Sparkline', icon: 'fas fa-chart-bar' }, - { id: 'pips', label: 'Pips / Rating', icon: 'fas fa-star-half-alt' }, - { id: 'section', label: 'Section Label', icon: 'fas fa-tag' }, - ], - - COLOR_THEMES: [ - { label: 'Matrix', colors: [{ r:0,g:255,b:70 }, { r:0,g:180,b:50 }, { r:0,g:100,b:30 }] }, - { label: 'Neon', colors: [{ r:255,g:0,b:200 }, { r:0,g:240,b:255 }, { r:255,g:230,b:0 }] }, - { label: 'Warm', colors: [{ r:255,g:160,b:0 }, { r:255,g:80,b:0 }, { r:255,g:220,b:80 }] }, - { label: 'Arctic', colors: [{ r:100,g:200,b:255},{ r:150,g:230,b:255},{ r:200,g:240,b:255}] }, - { label: 'Retro', colors: [{ r:255,g:140,b:0 }, { r:255,g:60,b:60 }, { r:80,g:200,b:120 }] }, - { label: 'Mono', colors: [{ r:255,g:255,b:255},{ r:170,g:170,b:170},{ r:90,g:90,b:90 }] }, - ], - - // ── Lifecycle ───────────────────────────────────────────────────── - init() { - this.$nextTick(() => { - const canvas = document.getElementById('led-canvas'); - if (canvas) { - window.ComposerCanvas.init(canvas); - window.ComposerCanvas.updateCanvasSize(this.MATRIX_W, this.MATRIX_H, this.SCALE); - this._loadFonts().then(() => { - this._tryRestoreDraft(); - this._loadRecentColors(); - this._snapshot(); - this.render(); - }); - } - document.addEventListener('keydown', (e) => this._onKeyDown(e)); - }); - }, - - async _loadFonts() { - try { - const ff = new FontFace('PressStart2P', 'url(/composer/api/fonts/PressStart2P-Regular.ttf)'); - document.fonts.add(await ff.load()); - } catch (e) { - console.warn('PressStart2P load failed:', e); - } - }, - - _loadRecentColors() { - try { - const raw = localStorage.getItem('ledmatrix_composer_recent_colors'); - if (raw) this._recentColors = JSON.parse(raw).slice(0, 8); - } catch (_) {} - }, - - _trackColor(r, g, b) { - this._recentColors = [ - { r, g, b }, - ...this._recentColors.filter(c => !(c.r === r && c.g === g && c.b === b)), - ].slice(0, 8); - try { localStorage.setItem('ledmatrix_composer_recent_colors', JSON.stringify(this._recentColors)); } catch (_) {} - }, - - toggleRuler() { - this.showRuler = !this.showRuler; - this.render(); - }, - - _tryRestoreDraft() { - try { - const raw = localStorage.getItem(LS_KEY); - if (!raw) return; - const draft = JSON.parse(raw); - if (!draft?.composer_version) return; - if (!confirm('Resume your last unsaved session?')) { - localStorage.removeItem(LS_KEY); - return; - } - this._applyState(draft); - this._setStatus('Draft restored from last session', 'info'); - } catch (_) {} - }, - - // ── Undo / Redo ─────────────────────────────────────────────────── - _snapshot() { - const state = JSON.stringify({ - metadata: this.metadata, - elements: this.elements, - dataModel: this.dataModel, - currentPreset: this.currentPreset, - }); - this._history.splice(this._historyIndex + 1); - this._history.push(state); - if (this._history.length > 50) this._history.shift(); - else this._historyIndex++; - _debouncedAutosave(this._buildPayload()); - }, - - undo() { - if (!this.canUndo) return; - this._historyIndex--; - const state = JSON.parse(this._history[this._historyIndex]); - this._applyState(state); - this._setStatus('Undo', 'info'); - this.render(); - }, - - redo() { - if (!this.canRedo) return; - this._historyIndex++; - const state = JSON.parse(this._history[this._historyIndex]); - this._applyState(state); - this._setStatus('Redo', 'info'); - this.render(); - }, - - _applyState(state) { - if (state.metadata) this.metadata = state.metadata; - if (state.elements) this.elements = state.elements.map(el => ({ - xAnchor: null, yAnchor: null, minWidth: 0, conditions: [], - ...el, - id: el.id ?? (this._nextId++), - })); - if (state.dataModel) this.dataModel = state.dataModel; - if (state.currentPreset && state.currentPreset !== this.currentPreset) { - this.changePreset(state.currentPreset, { silent: true }); - } - this._nextId = Math.max(...this.elements.map(e => e.id + 1), 1); - this.selectedId = null; - this.isDirty = true; - }, - - // ── Display preset ──────────────────────────────────────────────── - changePreset(presetLabel, opts = {}) { - const preset = window.ComposerCanvas.DISPLAY_PRESETS.find(p => p.label === presetLabel); - if (!preset) return; - this.currentPreset = presetLabel; - this.MATRIX_W = preset.w; - this.MATRIX_H = preset.h; - this.SCALE = preset.w <= 64 ? 6 : preset.w <= 128 ? 4 : 2; - const canvas = document.getElementById('led-canvas'); - if (canvas) { - window.ComposerCanvas.updateCanvasSize(this.MATRIX_W, this.MATRIX_H, this.SCALE); - canvas.style.width = (this.MATRIX_W * this.SCALE) + 'px'; - canvas.style.height = (this.MATRIX_H * this.SCALE) + 'px'; - } - if (!opts.silent) this.render(); - }, - - // ── Rendering ───────────────────────────────────────────────────── - render(opts = {}) { - window.ComposerCanvas.render( - this.elements, this.selectedId, this.MATRIX_W, this.MATRIX_H, this.SCALE, - { bgColor: this.metadata.bgColor, showGuides: this.showGuides, showRuler: this.showRuler, blinkOff: this.blinkAnimating && this._blinkPhase, animTick: this.blinkAnimating ? this._animTick : null, previewValues: this._previewValues, ...opts }, - ); - }, - - toggleGrid() { - this.showGridOverlay = !this.showGridOverlay; - window.ComposerCanvas.setGrid(this.showGridOverlay); - this.render(); - }, - - toggleGuides() { - this.showGuides = !this.showGuides; - this.render(); - }, - - toggleBlinkPreview() { - this.blinkAnimating = !this.blinkAnimating; - if (this.blinkAnimating) { - this._blinkPhase = false; - this._animTick = 0; - let blinkTick = 0; - this._blinkTimer = setInterval(() => { - this._animTick++; - blinkTick++; - if (blinkTick >= 3) { this._blinkPhase = !this._blinkPhase; blinkTick = 0; } - this.render(); - }, 200); - } else { - clearInterval(this._blinkTimer); - this._blinkTimer = null; - this._blinkPhase = false; - this._animTick = 0; - this.render(); - } - }, - - downloadPng() { - const canvas = document.getElementById('led-canvas'); - if (!canvas) return; - const link = document.createElement('a'); - link.download = (this.metadata.id || 'composer-preview') + '.png'; - link.href = canvas.toDataURL('image/png'); - link.click(); - }, - - exportDesign() { - const payload = this._buildPayload(); - const json = JSON.stringify(payload, null, 2); - const blob = new Blob([json], { type: 'application/json' }); - const url = URL.createObjectURL(blob); - const link = document.createElement('a'); - link.download = (this.metadata.id || 'composer-design') + '.composer.json'; - link.href = url; - link.click(); - URL.revokeObjectURL(url); - }, - - importDesign() { - const input = document.createElement('input'); - input.type = 'file'; - input.accept = '.json,.composer.json'; - input.onchange = (e) => { - const file = e.target.files[0]; - if (!file) return; - const reader = new FileReader(); - reader.onload = (ev) => { - try { - const data = JSON.parse(ev.target.result); - if (!data.composer_version) throw new Error('Not a composer file'); - if (this.isDirty && !confirm('Replace current design?')) return; - this._applyState({ metadata: data.metadata, elements: data.elements, dataModel: data.dataModel }); - this.isDirty = false; - this._setStatus('Design loaded', 'success'); - this.render(); - } catch (err) { - this._setStatus('Failed to load: ' + err.message, 'error'); - } - }; - reader.readAsText(file); - }; - input.click(); - }, - - // ── Zoom controls ───────────────────────────────────────────────── - zoomIn() { - if (this.SCALE >= 8) return; - this.SCALE++; - this._applyScale(); - }, - zoomOut() { - if (this.SCALE <= 1) return; - this.SCALE--; - this._applyScale(); - }, - _applyScale() { - const canvas = document.getElementById('led-canvas'); - if (!canvas) return; - window.ComposerCanvas.updateCanvasSize(this.MATRIX_W, this.MATRIX_H, this.SCALE); - canvas.style.width = (this.MATRIX_W * this.SCALE) + 'px'; - canvas.style.height = (this.MATRIX_H * this.SCALE) + 'px'; - this.render(); - }, - setCustomSize() { - const input = prompt( - 'Enter canvas size as WxH (e.g. 96×48, 192×64):', - `${this.MATRIX_W}×${this.MATRIX_H}` - ); - if (!input) return; - const m = input.match(/(\d+)[×xX*,\s]+(\d+)/); - if (!m) { this._setStatus('Invalid size — use WxH format', 'error'); return; } - const w = Math.max(8, Math.min(512, parseInt(m[1]))); - const h = Math.max(8, Math.min(256, parseInt(m[2]))); - this.MATRIX_W = w; - this.MATRIX_H = h; - this.currentPreset = `${w}×${h}`; - this.SCALE = w <= 64 ? 6 : w <= 128 ? 4 : 2; - this._applyScale(); - this._setStatus(`Canvas set to ${w}×${h}`, 'info'); - }, - zoomFit() { - // Fit canvas to center column: subtract left (~224px) + right (~288px) panels + margins - const avW = Math.max(80, window.innerWidth - 560); - // Subtract header (44) + toolbar (~40) + layers (~180) + status (28) + padding - const avH = Math.max(40, window.innerHeight - 340); - const fitW = Math.floor(avW / this.MATRIX_W); - const fitH = Math.floor(avH / this.MATRIX_H); - this.SCALE = Math.max(1, Math.min(8, Math.min(fitW, fitH))); - this._applyScale(); - }, - - onBgColorChange(hex) { - this.metadata.bgColor = { - r: parseInt(hex.slice(1, 3), 16), - g: parseInt(hex.slice(3, 5), 16), - b: parseInt(hex.slice(5, 7), 16), - }; - this.render(); - }, - - // ── Canvas events ───────────────────────────────────────────────── - onCanvasMouseDown(event) { - const { lx, ly } = this._canvasToLed(event); - - // Priority 1: resize handle on selected rectangle (skip if locked) - if (this.selectedElement?.type === 'rectangle' && !this.selectedElement.locked) { - const handle = window.ComposerCanvas.getResizeHandle( - this.selectedElement, lx, ly, this.MATRIX_W, this.MATRIX_H - ); - if (handle) { - const el = this.selectedElement; - this._resize = { - active: true, elemId: el.id, handle, - startMX: event.clientX, startMY: event.clientY, - startW: el.width, startH: el.height, - startX: el.x, startY: el.y, - }; - return; - } - } - - // Priority 2: element hit test (reverse = top layer first) - const hit = [...this.elements].reverse().find( - el => window.ComposerCanvas.hitTest(el, lx, ly, this.MATRIX_W, this.MATRIX_H) - ); - - if (hit) { - this.selectedId = hit.id; - if (!hit.locked) { - const stored = this._getStoredPos(hit); - this._drag = { - active: true, elemId: hit.id, - startMX: event.clientX, startMY: event.clientY, - startEX: stored.x, startEY: stored.y, - }; - } - } else { - this.selectedId = null; - } - this.render(); - }, - - onCanvasMouseMove(event) { - const { lx, ly } = this._canvasToLed(event); - this.hoverInfo = `${lx}, ${ly}`; - - // Resize - if (this._resize.active) { - const dx = Math.round((event.clientX - this._resize.startMX) / this.SCALE); - const dy = Math.round((event.clientY - this._resize.startMY) / this.SCALE); - const el = this.elements.find(e => e.id === this._resize.elemId); - if (!el) return; - const h = this._resize.handle; - if (h.includes('e')) el.width = Math.max(1, this._resize.startW + dx); - if (h.includes('s')) el.height = Math.max(1, this._resize.startH + dy); - if (h.includes('w')) { - const nw = Math.max(1, this._resize.startW - dx); - el.x = this._resize.startX + (this._resize.startW - nw); - el.width = nw; - } - if (h.includes('n')) { - const nh = Math.max(1, this._resize.startH - dy); - el.y = this._resize.startY + (this._resize.startH - nh); - el.height = nh; - } - this.isDirty = true; - this.render({ showTooltip: true }); - - // Cursor - const canvas = document.getElementById('led-canvas'); - if (canvas) canvas.style.cursor = window.ComposerCanvas.getCursorForHandle(h); - return; - } - - // Move drag - if (this._drag.active) { - const dx = Math.round((event.clientX - this._drag.startMX) / this.SCALE); - const dy = Math.round((event.clientY - this._drag.startMY) / this.SCALE); - const el = this.elements.find(e => e.id === this._drag.elemId); - if (!el) return; - - if (el.type === 'line') { - const newX = Math.max(0, Math.min(this.MATRIX_W - 1, this._drag.startEX + dx)); - const newY = Math.max(0, Math.min(this.MATRIX_H - 1, this._drag.startEY + dy)); - const offX = newX - el.x0, offY = newY - el.y0; - el.x0 = newX; el.y0 = newY; - el.x1 = Math.max(0, Math.min(this.MATRIX_W - 1, el.x1 + offX)); - el.y1 = Math.max(0, Math.min(this.MATRIX_H - 1, el.y1 + offY)); - this._drag.startEX = el.x0; this._drag.startEY = el.y0; - this._drag.startMX = event.clientX; this._drag.startMY = event.clientY; - } else { - // Store anchor-relative offset - const newStored = { - x: this._drag.startEX + dx, - y: this._drag.startEY + dy, - }; - this._setStoredPos(el, newStored); - } - this.isDirty = true; - this.render({ showTooltip: true }); - return; - } - - // Cursor hints when hovering - const canvas = document.getElementById('led-canvas'); - if (canvas) { - let cursor = 'crosshair'; - if (this.selectedElement?.type === 'rectangle') { - const handle = window.ComposerCanvas.getResizeHandle( - this.selectedElement, lx, ly, this.MATRIX_W, this.MATRIX_H - ); - if (handle) cursor = window.ComposerCanvas.getCursorForHandle(handle); - } - if (cursor === 'crosshair') { - const hit = [...this.elements].reverse().find( - el => window.ComposerCanvas.hitTest(el, lx, ly, this.MATRIX_W, this.MATRIX_H) - ); - if (hit) cursor = 'move'; - } - canvas.style.cursor = cursor; - } - }, - - onCanvasMouseUp() { - if (this._resize.active || this._drag.active) { - this._resize = { active: false }; - this._drag = { active: false }; - this._snapshot(); - } - const canvas = document.getElementById('led-canvas'); - if (canvas) canvas.style.cursor = 'crosshair'; - }, - - onCanvasMouseLeave() { - this.hoverInfo = ''; - this.onCanvasMouseUp(); - }, - - _canvasToLed(event) { - const rect = event.target.getBoundingClientRect(); - const lx = Math.max(0, Math.min(this.MATRIX_W - 1, Math.floor((event.clientX - rect.left) / this.SCALE))); - const ly = Math.max(0, Math.min(this.MATRIX_H - 1, Math.floor((event.clientY - rect.top) / this.SCALE))); - return { lx: this._snap(lx), ly: this._snap(ly) }; - }, - - _snap(v) { - if (!this.snapToGrid || this.snapSize < 2) return v; - return Math.round(v / this.snapSize) * this.snapSize; - }, - - // Anchor-aware position storage: x/y stored as offset from anchor - _getStoredPos(el) { - return { x: el.x ?? el.x0 ?? 0, y: el.y ?? el.y0 ?? 0 }; - }, - - _setStoredPos(el, { x, y }) { - if (this.snapToGrid && this.snapSize > 0) { - x = Math.round(x / this.snapSize) * this.snapSize; - y = Math.round(y / this.snapSize) * this.snapSize; - } - const clampX = v => Math.max(-this.MATRIX_W, Math.min(this.MATRIX_W * 2, v)); - const clampY = v => Math.max(-this.MATRIX_H, Math.min(this.MATRIX_H * 2, v)); - if (el.type === 'line') { - el.x0 = clampX(x); el.y0 = clampY(y); - } else { - el.x = clampX(x); el.y = clampY(y); - } - }, - - // ── Alignment ───────────────────────────────────────────────────── - _alignElement(el, axis, mode) { - const bb = window.ComposerCanvas.getBoundingBox(el, this.MATRIX_W, this.MATRIX_H); - if (!bb) return; - if (axis === 'x') { - const newX = mode === 'start' ? 0 - : mode === 'center' ? Math.round((this.MATRIX_W - bb.w) / 2) - : this.MATRIX_W - bb.w; - // Clear x-anchor so stored x IS the absolute position - if ('xAnchor' in el) el.xAnchor = null; - el.x = Math.round(newX); - if (el.type === 'line') el.x0 = Math.round(newX); - } else { - const newY = mode === 'start' ? 0 - : mode === 'center' ? Math.round((this.MATRIX_H - bb.h) / 2) - : this.MATRIX_H - bb.h; - if ('yAnchor' in el) el.yAnchor = null; - el.y = Math.round(newY); - if (el.type === 'line') el.y0 = Math.round(newY); - } - this._snapshot(); - this.isDirty = true; - this.render(); - }, - alignLeft() { if (this.selectedElement) this._alignElement(this.selectedElement, 'x', 'start'); }, - alignHCenter() { if (this.selectedElement) this._alignElement(this.selectedElement, 'x', 'center'); }, - alignRight() { if (this.selectedElement) this._alignElement(this.selectedElement, 'x', 'end'); }, - alignTop() { if (this.selectedElement) this._alignElement(this.selectedElement, 'y', 'start'); }, - alignVCenter() { if (this.selectedElement) this._alignElement(this.selectedElement, 'y', 'center'); }, - alignBottom() { if (this.selectedElement) this._alignElement(this.selectedElement, 'y', 'end'); }, - - // ── Keyboard shortcuts ──────────────────────────────────────────── - _onKeyDown(e) { - const tag = document.activeElement?.tagName; - const inInput = tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT'; - - // Ctrl/Cmd combos work everywhere - if (e.ctrlKey || e.metaKey) { - if (e.key === 'z' && !e.shiftKey) { e.preventDefault(); this.undo(); return; } - if ((e.key === 'y') || (e.key === 'z' && e.shiftKey)) { e.preventDefault(); this.redo(); return; } - if (e.key === 'd' && this.selectedId) { e.preventDefault(); this.duplicateElement(this.selectedId); return; } - if (e.key === 'c' && this.selectedId && !e.shiftKey) { e.preventDefault(); this.copyElement(); return; } - if (e.key === 'c' && this.selectedId && e.shiftKey) { e.preventDefault(); this.copyStyle(); return; } - if (e.key === 'v' && this._clipboard && !e.shiftKey) { e.preventDefault(); this.pasteElement(); return; } - if (e.key === 'v' && this._styleClipboard && e.shiftKey) { e.preventDefault(); this.pasteStyle(); return; } - if (e.key === 'a') { e.preventDefault(); if (this.elements.length) { this.selectedId = this.elements[0].id; this.render(); } return; } - } - - // Tab cycles through elements regardless of input focus - if (e.key === 'Tab' && this.elements.length) { - e.preventDefault(); - const idx = this.elements.findIndex(el => el.id === this.selectedId); - const next = e.shiftKey - ? (idx <= 0 ? this.elements.length - 1 : idx - 1) - : (idx >= this.elements.length - 1 ? 0 : idx + 1); - this.selectedId = this.elements[next].id; - this.render(); - return; - } - - if (inInput) return; - - const dist = e.shiftKey ? 5 : (this.snapToGrid && this.snapSize >= 2 ? this.snapSize : 1); - if (e.key === 'ArrowLeft') { e.preventDefault(); this.nudge(-dist, 0); } - if (e.key === 'ArrowRight') { e.preventDefault(); this.nudge(dist, 0); } - if (e.key === 'ArrowUp') { e.preventDefault(); this.nudge(0, -dist); } - if (e.key === 'ArrowDown') { e.preventDefault(); this.nudge(0, dist); } - if ((e.key === 'Delete' || e.key === 'Backspace') && this.selectedId) { - e.preventDefault(); - this.removeElement(this.selectedId); - } - if (e.key === 'Escape') { - if (this.showHelpModal) { this.showHelpModal = false; return; } - this.selectedId = null; this.render(); - } - if (e.key === '?') { this.showHelpModal = !this.showHelpModal; } - if (e.key === 'g' || e.key === 'G') { this.snapToGrid = !this.snapToGrid; } - if (e.key === ']' && this.selectedId) { this.bringToFront(this.selectedId); } - if (e.key === '[' && this.selectedId) { this.sendToBack(this.selectedId); } - }, - - nudge(dx, dy) { - const el = this.selectedElement; - if (!el) return; - if (el.locked) { this._setStatus('Unlock element to move it', 'info'); return; } - if (el.type === 'line') { - el.x0 = Math.max(0, Math.min(this.MATRIX_W - 1, el.x0 + dx)); - el.y0 = Math.max(0, Math.min(this.MATRIX_H - 1, el.y0 + dy)); - el.x1 = Math.max(0, Math.min(this.MATRIX_W - 1, el.x1 + dx)); - el.y1 = Math.max(0, Math.min(this.MATRIX_H - 1, el.y1 + dy)); - } else if (el.type === 'divider') { - if (el.orientation === 'horizontal') el.y = Math.max(0, Math.min(this.MATRIX_H - 1, (el.y ?? 0) + dy)); - else el.x = Math.max(0, Math.min(this.MATRIX_W - 1, (el.x ?? 0) + dx)); - } else { - el.x = (el.x ?? 0) + dx; - el.y = (el.y ?? 0) + dy; - } - this.isDirty = true; - this._snapshot(); - this.render(); - }, - - // ── Element management ──────────────────────────────────────────── - addElement(type) { - const defaults = window.ComposerCanvas.ELEMENT_DEFAULTS[type]; - if (!defaults) return; - const el = { - id: this._nextId++, - type, - label: '', - conditions: [], - xAnchor: null, yAnchor: null, minWidth: 0, - x: Math.floor(this.MATRIX_W / 4), - y: Math.floor(this.MATRIX_H / 2) - 4, - ...structuredClone(defaults), - }; - if (type === 'line') { - const cx = Math.floor(this.MATRIX_W / 4), cy = Math.floor(this.MATRIX_H / 2); - el.x0 = cx; el.y0 = cy; - el.x1 = Math.min(this.MATRIX_W - 1, cx + 30); el.y1 = cy; - el.x = cx; el.y = cy; - } - this.elements.push(el); - this.selectedId = el.id; - this.isDirty = true; - this._snapshot(); - this.render(); - }, - - duplicateElement(id) { - const el = this.elements.find(e => e.id === id); - if (!el) return; - const copy = { - ...structuredClone(el), - id: this._nextId++, - label: el.label ? el.label + ' copy' : '', - }; - // Offset slightly so it's visually distinct - if (copy.type === 'line') { copy.x0 += 4; copy.y0 += 4; copy.x1 += 4; copy.y1 += 4; } - else { copy.x = (copy.x ?? 0) + 4; copy.y = (copy.y ?? 0) + 4; } - - const idx = this.elements.findIndex(e => e.id === id); - this.elements.splice(idx + 1, 0, copy); - this.selectedId = copy.id; - this.isDirty = true; - this._snapshot(); - this.render(); - }, - - copyElement() { - if (!this.selectedElement) return; - this._clipboard = structuredClone(this.selectedElement); - this._setStatus(`Copied: ${this.selectedElement.label || this.selectedElement.type}`, 'info'); - }, - - copyStyle() { - const el = this.selectedElement; - if (!el) return; - this._styleClipboard = { r: el.r, g: el.g, b: el.b, font: el.font }; - this._setStatus('Style copied — select another element and paste style', 'info'); - }, - - pasteStyle() { - const el = this.selectedElement; - if (!el || !this._styleClipboard) return; - const { r, g, b, font } = this._styleClipboard; - if (r !== undefined) { el.r = r; el.g = g; el.b = b; } - if (font !== undefined && el.font !== undefined) el.font = font; - this.isDirty = true; - this._snapshot(); - this.render(); - this._setStatus('Style pasted', 'success'); - }, - - pasteElement() { - if (!this._clipboard) return; - const copy = structuredClone(this._clipboard); - copy.id = this._nextId++; - if (copy.type === 'line') { copy.x0 += 6; copy.y0 += 6; copy.x1 += 6; copy.y1 += 6; } - else { copy.x = (copy.x ?? 0) + 6; copy.y = (copy.y ?? 0) + 6; } - this.elements.push(copy); - this.selectedId = copy.id; - this.isDirty = true; - this._snapshot(); - this.render(); - this._setStatus('Pasted element', 'success'); - }, - - removeElement(id) { - this.elements = this.elements.filter(e => e.id !== id); - if (this.selectedId === id) this.selectedId = null; - this.isDirty = true; - this._snapshot(); - this.render(); - }, - - moveElementUp(id) { - const idx = this.elements.findIndex(e => e.id === id); - if (idx < this.elements.length - 1) { - [this.elements[idx], this.elements[idx + 1]] = [this.elements[idx + 1], this.elements[idx]]; - this.isDirty = true; - this._snapshot(); - this.render(); - } - }, - - moveElementDown(id) { - const idx = this.elements.findIndex(e => e.id === id); - if (idx > 0) { - [this.elements[idx], this.elements[idx - 1]] = [this.elements[idx - 1], this.elements[idx]]; - this.isDirty = true; - this._snapshot(); - this.render(); - } - }, - - bringToFront(id) { - const idx = this.elements.findIndex(e => e.id === id); - if (idx < this.elements.length - 1) { - this.elements.push(this.elements.splice(idx, 1)[0]); - this.isDirty = true; - this._snapshot(); - this.render(); - } - }, - - sendToBack(id) { - const idx = this.elements.findIndex(e => e.id === id); - if (idx > 0) { - this.elements.unshift(this.elements.splice(idx, 1)[0]); - this.isDirty = true; - this._snapshot(); - this.render(); - } - }, - - clearAll() { - if (this.elements.length === 0) return; - if (!confirm('Remove all elements from the canvas?')) return; - this.elements = []; - this.selectedId = null; - this.isDirty = true; - this._snapshot(); - this.render(); - }, - - // ── Alignment ───────────────────────────────────────────────────── - alignElement(dir) { - const el = this.selectedElement; - if (!el) return; - const bb = window.ComposerCanvas.getBoundingBox(el, this.MATRIX_W, this.MATRIX_H); - switch (dir) { - case 'left': el.x = 0; break; - case 'center': el.x = Math.round((this.MATRIX_W - bb.w) / 2); break; - case 'right': el.x = this.MATRIX_W - bb.w; break; - case 'top': el.y = 0; break; - case 'middle': el.y = Math.round((this.MATRIX_H - bb.h) / 2); break; - case 'bottom': el.y = this.MATRIX_H - bb.h; break; - } - this.isDirty = true; - this._snapshot(); - this.render(); - }, - - // ── Templates ───────────────────────────────────────────────────── - loadTemplate(tmpl) { - if (this.isDirty && this.elements.length > 0) { - if (!confirm('Load template? Your current canvas will be replaced.')) return; - } - this.elements = tmpl.elements.map((el, i) => ({ - xAnchor: null, yAnchor: null, minWidth: 0, conditions: [], - ...structuredClone(el), - id: i + 1, - })); - this._nextId = this.elements.length + 1; - this.dataModel = structuredClone(tmpl.dataModel); - if (tmpl.preset) this.changePreset(tmpl.preset, { silent: true }); - this.selectedId = null; - this.showTemplateModal = false; - this.isDirty = true; - this._snapshot(); - this.render(); - this._setStatus(`Loaded template: ${tmpl.label}`, 'success'); - }, - - // ── Metadata helpers ────────────────────────────────────────────── - onNameInput() { - if (this._idAutoGenerated) { - this.metadata.id = this.metadata.name - .toLowerCase() - .replace(/[^a-z0-9]+/g, '-') - .replace(/^-+|-+$/g, ''); - } - }, - onIdInput() { this._idAutoGenerated = false; }, - isIdValid() { return /^[a-z][a-z0-9-]{0,62}$/.test(this.metadata.id); }, - - // ── Config variables ────────────────────────────────────────────── - addConfigVar() { - const key = this.newConfigVar.key.trim(); - if (!key) { this._setStatus('Key is required', 'error'); return; } - if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) { - this._setStatus('Key must be a valid Python identifier', 'error'); return; - } - if (this.dataModel.configVars.find(v => v.key === key)) { - this._setStatus(`"${key}" already exists`, 'error'); return; - } - this.dataModel.configVars.push({ ...this.newConfigVar, key }); - this.newConfigVar = { key:'', label:'', type:'string', default:'', description:'' }; - this.showConfigVarModal = false; - this.isDirty = true; - this._snapshot(); - }, - - removeConfigVar(key) { - const bound = this.elements.filter( - e => e.type === 'dynamic_text' && e.binding?.source === 'config' && e.binding?.key === key - ); - if (bound.length && !confirm(`"${key}" is used by ${bound.length} element(s). Remove anyway?`)) return; - this.dataModel.configVars = this.dataModel.configVars.filter(v => v.key !== key); - this.isDirty = true; - this._snapshot(); - }, - - _isBound(key) { - return this.elements.some( - e => e.type === 'dynamic_text' && e.binding?.source === 'config' && e.binding?.key === key - ); - }, - - addPreMadeVar(varDef) { - if (this.dataModel.configVars.find(v => v.key === varDef.key)) { - this._setStatus(`"${varDef.key}" already added`, 'warning'); return; - } - this.dataModel.configVars.push({ ...varDef }); - this.isDirty = true; - this._snapshot(); - this._setStatus(`Added: ${varDef.key}`, 'success'); - }, - - // ── Open existing plugin ────────────────────────────────────────── - async openPluginModal() { - this.showOpenModal = true; - this.installedPlugins = []; - this.loadPluginsStatus = 'loading'; - try { - const resp = await fetch('/composer/api/plugins'); - if (!resp.ok) throw new Error(`HTTP ${resp.status}`); - this.installedPlugins = await resp.json(); - this.loadPluginsStatus = 'done'; - } catch (e) { - this.loadPluginsStatus = 'error'; - this._setStatus('Could not load plugin list: ' + e.message, 'error'); - } - }, - - async loadPlugin(pluginId) { - this.showOpenModal = false; - try { - const resp = await fetch(`/composer/api/load/${pluginId}`); - if (!resp.ok) { - const err = await resp.json().catch(() => ({})); - throw new Error(err.message || `HTTP ${resp.status}`); - } - const data = await resp.json(); - const state = data.state ?? data; - this._applyState(state); - this._idAutoGenerated = false; - this.isDirty = false; - this._snapshot(); - this._setStatus(`Loaded: ${pluginId}` + (data.source === 'schema_import' ? ' (config vars only)' : ''), 'success'); - this.render(); - } catch (e) { - this._setStatus('Failed to load plugin: ' + e.message, 'error'); - } - }, - - // ── Code preview ────────────────────────────────────────────────── - async showPreview() { - if (!this._validateBeforeExport()) return; - this.showCodeModal = true; - this.loadingCode = true; - this.codeFiles = {}; - try { - const resp = await fetch('/composer/api/preview', { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(this._buildPayload()), - }); - const data = await resp.json(); - if (!resp.ok) throw new Error(data.message || `HTTP ${resp.status}`); - this.codeFiles = data.files; - this.codeTab = 'manager.py'; - } catch (e) { - this._setStatus('Preview failed: ' + e.message, 'error'); - this.showCodeModal = false; - } finally { - this.loadingCode = false; - } - }, - - // ── Color helpers ───────────────────────────────────────────────── - rgbToHex(r, g, b) { - return '#' + [r, g, b].map(v => Math.max(0, Math.min(255, v)).toString(16).padStart(2, '0')).join(''); - }, - - onColorChange(el, hexField, hex) { - const r = parseInt(hex.slice(1, 3), 16); - const g = parseInt(hex.slice(3, 5), 16); - const b = parseInt(hex.slice(5, 7), 16); - if (hexField === 'fill') { el.fillR = r; el.fillG = g; el.fillB = b; } - else if (hexField === 'out') { el.outR = r; el.outG = g; el.outB = b; } - else if (hexField === 'bg') { el.bgR = r; el.bgG = g; el.bgB = b; } - else if (hexField === 'track') { el.trackR = r; el.trackG = g; el.trackB = b; } - else if (hexField === 'empty') { el.emptyR = r; el.emptyG = g; el.emptyB = b; } - else { el.r = r; el.g = g; el.b = b; } - this._trackColor(r, g, b); - this.render(); - }, - - applyPaletteColor(el, hexField, swatch) { - const { r, g, b } = swatch; - if (hexField === 'fill') { el.fillR = r; el.fillG = g; el.fillB = b; } - else if (hexField === 'out') { el.outR = r; el.outG = g; el.outB = b; } - else if (hexField === 'bg') { el.bgR = r; el.bgG = g; el.bgB = b; } - else if (hexField === 'track') { el.trackR = r; el.trackG = g; el.trackB = b; } - else if (hexField === 'empty') { el.emptyR = r; el.emptyG = g; el.emptyB = b; } - else { el.r = r; el.g = g; el.b = b; } - this._trackColor(r, g, b); - this.isDirty = true; - this._snapshot(); - this.render(); - }, - - // ── Export & Install ────────────────────────────────────────────── - _buildPayload() { - return { - composer_version: '1.0', - metadata: this.metadata, - elements: this.elements, - dataModel: this.dataModel, - preset: this.currentPreset, - }; - }, - - _validateBeforeExport() { - if (!this.metadata.name.trim()) { this._setStatus('Plugin name is required', 'error'); return false; } - if (!this.isIdValid()) { this._setStatus('Plugin ID is invalid', 'error'); return false; } - if (!this.metadata.author.trim()) { this._setStatus('Author is required', 'error'); return false; } - if (this.elements.length === 0) { this._setStatus('Add at least one element', 'error'); return false; } - const unbound = this.elements.filter( - e => (e.type === 'dynamic_text' || e.type === 'progress_bar') && !e.binding?.key - ); - if (unbound.length) { this._setStatus(`${unbound.length} element(s) have no variable bound`, 'error'); return false; } - return true; - }, - - async generateZip() { - if (!this._validateBeforeExport()) return; - this.generateStatus = 'working'; - try { - const resp = await fetch('/composer/api/generate', { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(this._buildPayload()), - }); - if (!resp.ok) { - const err = await resp.json().catch(() => ({ message: 'Server error' })); - throw new Error(err.message || `HTTP ${resp.status}`); - } - const blob = await resp.blob(); - const url = URL.createObjectURL(blob); - const a = document.createElement('a'); - a.href = url; a.download = `${this.metadata.id}.zip`; a.click(); - URL.revokeObjectURL(url); - this.generateStatus = 'done'; - this._setStatus('Plugin ZIP downloaded', 'success'); - setTimeout(() => { if (this.generateStatus === 'done') this.generateStatus = 'idle'; }, 4000); - } catch (err) { - this.generateStatus = 'error'; - this._setStatus(err.message, 'error'); - setTimeout(() => { if (this.generateStatus === 'error') this.generateStatus = 'idle'; }, 6000); - } - }, - - async installLocally(force = false) { - if (!this._validateBeforeExport()) return; - this.installStatus = 'working'; - try { - const resp = await fetch('/composer/api/install', { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ ...this._buildPayload(), _force: force }), - }); - const data = await resp.json().catch(() => ({ message: 'Server error' })); - - if (resp.status === 409 && !force) { - this.installStatus = 'idle'; - if (confirm(`Plugin "${this.metadata.id}" is already installed.\n\nOverwrite it with the current design?`)) { - return this.installLocally(true); - } - return; - } - - if (!resp.ok) throw new Error(data.message || `HTTP ${resp.status}`); - - this.installStatus = 'done'; - this.isDirty = false; - localStorage.removeItem(LS_KEY); - this._setStatus(`"${this.metadata.id}" installed — enable it in the Plugin Manager`, 'success'); - setTimeout(() => { if (this.installStatus === 'done') this.installStatus = 'idle'; }, 6000); - } catch (err) { - this.installStatus = 'error'; - this._setStatus(err.message, 'error'); - setTimeout(() => { if (this.installStatus === 'error') this.installStatus = 'idle'; }, 6000); - } - }, - - // ── Color themes ────────────────────────────────────────────────── - applyColorTheme(theme) { - // Distribute theme colors round-robin across text-type elements - const textTypes = ['text', 'dynamic_text', 'clock', 'countdown', 'marquee', 'gauge']; - let idx = 0; - for (const el of this.elements) { - if (textTypes.includes(el.type)) { - const c = theme.colors[idx % theme.colors.length]; - el.r = c.r; el.g = c.g; el.b = c.b; - idx++; - } - } - this.isDirty = true; - this._snapshot(); - this.render(); - this._setStatus(`Applied theme: ${theme.label}`, 'success'); - }, - - // ── Status ──────────────────────────────────────────────────────── - _setStatus(msg, type = 'info') { - this.statusMsg = msg; - this.statusType = type; - }, - - statusClass() { - return { - info: 'text-gray-500', - success: 'text-green-600', - error: 'text-red-600', - warning: 'text-yellow-600', - }[this.statusType] || 'text-gray-500'; - }, - }; -} diff --git a/web_interface/static/v3/js/composer/composer-canvas.js b/web_interface/static/v3/js/composer/composer-canvas.js deleted file mode 100644 index adc3791d..00000000 --- a/web_interface/static/v3/js/composer/composer-canvas.js +++ /dev/null @@ -1,757 +0,0 @@ -/** - * ComposerCanvas — stateless LED matrix canvas renderer. - * - * Coordinate system: LED pixels (integers). All drawing multiplies by SCALE. - * PIL draw.text(x,y) is top-left; canvas fillText(x,y) is baseline. - * → Canvas text cy = (actualY + fontSizePx) * SCALE - * - * Anchors: element x/y are offsets from their anchor point: - * xAnchor=null/'left' → x is fixed offset from left - * xAnchor='center' → x is offset from width/2 - * xAnchor='right' → x is offset inward from right edge - * yAnchor follows the same pattern with 'top'/'middle'/'bottom' - * - * Breakpoints: elements with minWidth > currentMatrixW are rendered at 25% opacity. - * - * Resize handles: drawn on selected rectangles; 8 handles (corners + edge mids). - */ -window.ComposerCanvas = (() => { - 'use strict'; - - let _canvas = null; - let _ctx = null; - let _showGrid = true; - - const DISPLAY_PRESETS = [ - { label: '64×32', w: 64, h: 32 }, - { label: '128×32', w: 128, h: 32 }, - { label: '128×64', w: 128, h: 64 }, - { label: '256×32', w: 256, h: 32 }, - { label: '256×64', w: 256, h: 64 }, - ]; - - const FONT_MAP = { - press_start: { family: "'PressStart2P', monospace", sizePx: 8, charW: 8 }, - four_by_six: { family: 'monospace', sizePx: 6, charW: 4 }, - five_by_seven: { family: 'monospace', sizePx: 7, charW: 5 }, - }; - - const ELEMENT_DEFAULTS = { - text: { - text: 'Hello', font: 'press_start', - r: 255, g: 255, b: 255, - text2: '', lineSpacing: 2, textAlign: 'left', - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - dynamic_text: { - binding: { source: 'config', key: '', format: null }, - font: 'press_start', textAlign: 'left', - r: 255, g: 200, b: 100, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - clock: { - format: '%H:%M', font: 'press_start', - r: 100, g: 255, b: 100, - format2: '', lineSpacing: 2, textAlign: 'left', - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - rectangle: { - width: 20, height: 8, - fillR: 0, fillG: 0, fillB: 128, hasFill: true, - outR: 255, outG: 255, outB: 255, hasOutline: true, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - ellipse: { - width: 24, height: 12, - fillR: 0, fillG: 100, fillB: 200, hasFill: true, - outR: 100, outG: 180, outB: 255, hasOutline: true, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - arc: { - width: 24, height: 24, - startAngle: 0, endAngle: 270, lineWidth: 2, - r: 255, g: 200, b: 0, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - pixel: { - r: 255, g: 255, b: 255, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - rounded_rectangle: { - width: 24, height: 10, borderRadius: 3, - fillR: 0, fillG: 80, fillB: 180, hasFill: true, - outR: 120, outG: 180, outB: 255, hasOutline: true, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - line: { - x0: 0, y0: 16, x1: 63, y1: 16, - r: 180, g: 180, b: 180, lineWidth: 1, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - divider: { - orientation: 'horizontal', y: 16, x: 64, - r: 100, g: 100, b: 100, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - progress_bar: { - barWidth: 60, barHeight: 6, - binding: { source: 'config', key: '', format: null }, - r: 80, g: 200, b: 80, - bgR: 30, bgG: 30, bgB: 30, hasBg: true, - outR: 100, outG: 100, outB: 100, hasOutline: true, - previewPct: 65, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - countdown: { - binding: { source: 'config', key: '', format: null }, - countdownFormat: 'dh', - font: 'four_by_six', textAlign: 'left', - r: 255, g: 180, b: 0, - previewText: '42d 3h', - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - marquee: { - text: 'Scrolling text', font: 'press_start', - r: 255, g: 255, b: 255, - scrollSpeed: 1, gap: 16, direction: 'left', - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - section: { - label: 'Section', - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - pips: { - count: 5, filled: 3, pipSize: 4, pipSpacing: 2, - r: 255, g: 200, b: 0, - emptyR: 50, emptyG: 50, emptyB: 50, showEmpty: true, - binding: { source: 'config', key: '', format: null }, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - sparkline: { - width: 40, height: 12, - barCount: 8, barSpacing: 1, - r: 80, g: 200, b: 120, - bgR: 30, bgG: 30, bgB: 30, hasBg: false, - binding: { source: 'config', key: '', format: null }, - previewData: '0.3,0.6,0.4,0.8,0.5,0.9,0.7,0.85', - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - gauge: { - width: 32, height: 32, - startAngle: 135, endAngle: 45, lineWidth: 3, - binding: { source: 'config', key: '', format: null }, - r: 80, g: 220, b: 80, - trackR: 40, trackG: 40, trackB: 40, hasTrack: true, - showLabel: true, font: 'four_by_six', labelR: 200, labelG: 200, labelB: 200, - previewPct: 65, - xAnchor: null, yAnchor: null, minWidth: 0, locked: false, blink: false, visible: true, - }, - }; - - // ── Anchor resolution ──────────────────────────────────────────────── - function resolveAnchor(val, anchor, dim) { - if (!anchor || anchor === 'left' || anchor === 'top') return val; - if (anchor === 'center' || anchor === 'middle') return Math.floor(dim / 2) + val; - if (anchor === 'right' || anchor === 'bottom') return dim - val; - return val; - } - - function computeActualPos(el, matrixW, matrixH) { - const ax = resolveAnchor(el.x ?? el.x0 ?? 0, el.xAnchor, matrixW); - const ay = resolveAnchor(el.y ?? el.y0 ?? 0, el.yAnchor, matrixH); - return { x: ax, y: ay }; - } - - // ── Bounding box (LED pixel space) ────────────────────────────────── - function getBoundingBox(el, matrixW, matrixH) { - const { x: ax, y: ay } = computeActualPos(el, matrixW, matrixH); - const finfo = FONT_MAP[el.font] || FONT_MAP.press_start; - - switch (el.type) { - case 'text': { - const t1 = el.text || '', t2 = el.text2 || ''; - const w = Math.max(t1.length, t2.length) * finfo.charW; - const h = t2 ? finfo.sizePx * 2 + (el.lineSpacing ?? 2) : finfo.sizePx; - const bx = el.textAlign === 'center' ? ax - w / 2 : el.textAlign === 'right' ? ax - w : ax; - return { x: bx, y: ay, w, h }; - } - case 'dynamic_text': { - const key = el.binding?.key || '?'; - const w = (`{${key}}`).length * finfo.charW; - const bx = el.textAlign === 'center' ? ax - w / 2 : el.textAlign === 'right' ? ax - w : ax; - return { x: bx, y: ay, w, h: finfo.sizePx }; - } - case 'clock': { - const t1 = el.format || '%H:%M', t2 = el.format2 || ''; - const w = Math.max(t1.length, t2.length) * finfo.charW; - const h = t2 ? finfo.sizePx * 2 + (el.lineSpacing ?? 2) : finfo.sizePx; - const bx = el.textAlign === 'center' ? ax - w / 2 : el.textAlign === 'right' ? ax - w : ax; - return { x: bx, y: ay, w, h }; - } - case 'countdown': { - const pt = el.previewText || '--d --h'; - const w = pt.length * finfo.charW; - const bx = el.textAlign === 'center' ? ax - w / 2 : el.textAlign === 'right' ? ax - w : ax; - return { x: bx, y: ay, w, h: finfo.sizePx }; - } - case 'rectangle': - case 'rounded_rectangle': - case 'ellipse': - case 'arc': - return { x: ax, y: ay, w: el.width, h: el.height }; - case 'pixel': - return { x: ax, y: ay, w: 1, h: 1 }; - case 'line': - return { - x: Math.min(el.x0, el.x1), y: Math.min(el.y0, el.y1), - w: Math.max(1, Math.abs(el.x1 - el.x0)), - h: Math.max(1, Math.abs(el.y1 - el.y0)), - }; - case 'divider': - return el.orientation === 'horizontal' - ? { x: 0, y: ay, w: matrixW, h: 1 } - : { x: ax, y: 0, w: 1, h: matrixH }; - case 'progress_bar': - return { x: ax, y: ay, w: el.barWidth ?? 60, h: el.barHeight ?? 6 }; - case 'marquee': { - const mfinfo = FONT_MAP[el.font] || FONT_MAP.press_start; - return { x: 0, y: ay, w: matrixW, h: mfinfo.sizePx }; - } - case 'gauge': - return { x: ax, y: ay, w: el.width ?? 32, h: el.height ?? 32 }; - case 'sparkline': - return { x: ax, y: ay, w: el.width ?? 40, h: el.height ?? 12 }; - case 'pips': { - const pc = el.count ?? 5, ps = el.pipSize ?? 4, pg = el.pipSpacing ?? 2; - return { x: ax, y: ay, w: pc * ps + (pc - 1) * pg, h: ps }; - } - case 'section': - return { x: ax, y: ay, w: 0, h: 0 }; - default: - return { x: ax, y: ay, w: 4, h: 4 }; - } - } - - // ── Resize handle support ───────────────────────────────────────────── - // Returns 8 handle points for a rectangle in LED pixel space - function _getRectHandles(el, matrixW, matrixH) { - const { x: ax, y: ay } = computeActualPos(el, matrixW, matrixH); - const w = el.width, h = el.height; - const cx = ax + w / 2, cy = ay + h / 2; - return { - nw: { x: ax, y: ay }, - n: { x: cx, y: ay }, - ne: { x: ax + w, y: ay }, - w: { x: ax, y: cy }, - e: { x: ax + w, y: cy }, - sw: { x: ax, y: ay + h }, - s: { x: cx, y: ay + h }, - se: { x: ax + w, y: ay + h }, - }; - } - - // Returns the handle direction under LED-space point (lx, ly), or null - function getResizeHandle(el, lx, ly, matrixW, matrixH) { - if (!['rectangle', 'rounded_rectangle', 'ellipse', 'arc', 'gauge', 'sparkline'].includes(el.type)) return null; - const handles = _getRectHandles(el, matrixW, matrixH); - const PAD = 4; - for (const [dir, pt] of Object.entries(handles)) { - if (Math.abs(lx - pt.x) <= PAD && Math.abs(ly - pt.y) <= PAD) return dir; - } - return null; - } - - const _HANDLE_CURSORS = { - nw: 'nw-resize', n: 'n-resize', ne: 'ne-resize', - w: 'w-resize', e: 'e-resize', - sw: 'sw-resize', s: 's-resize', se: 'se-resize', - }; - function getCursorForHandle(handle) { - return _HANDLE_CURSORS[handle] || 'crosshair'; - } - - // ── Hit test ───────────────────────────────────────────────────────── - function hitTest(el, lx, ly, matrixW, matrixH) { - const PAD = 3; - const bb = getBoundingBox(el, matrixW, matrixH); - return ( - lx >= bb.x - PAD && lx <= bb.x + bb.w + PAD && - ly >= bb.y - PAD && ly <= bb.y + bb.h + PAD - ); - } - - // ── Draw a single element ───────────────────────────────────────────── - function _drawElement(ctx, el, SCALE, matrixW, matrixH, opts = {}) { - const s = SCALE; - const { x: ax, y: ay } = computeActualPos(el, matrixW, matrixH); - const belowBreakpoint = el.minWidth > 0 && matrixW < el.minWidth; - const hidden = el.visible === false; - - ctx.save(); - if (hidden) ctx.globalAlpha = 0.12; - else if (belowBreakpoint) ctx.globalAlpha = 0.25; - - // Blink animation: when blinkOff, fully hide blinking elements - if (el.blink) { - if (opts.blinkOff) { ctx.restore(); return; } - ctx.globalAlpha *= 0.55; - } - - // Helper: compute draw X for text alignment - const _textX = (text, finfo) => { - const tw = text.length * finfo.charW * s; - if (el.textAlign === 'center') return ax * s - tw / 2; - if (el.textAlign === 'right') return ax * s - tw; - return ax * s; - }; - - try { - switch (el.type) { - case 'text': - case 'dynamic_text': - case 'clock': { - const finfo = FONT_MAP[el.font] || FONT_MAP.press_start; - const key = el.binding?.key || '?'; - const pv = opts.previewValues?.[key]; - // Substitute {variable} tokens in text using previewValues - const _subVars = str => (str || '').replace(/\{(\w+)\}/g, (_, k) => { - const v = opts.previewValues?.[k]; - return v !== undefined && v !== '' ? String(v) : `{${k}}`; - }); - const displayText = - el.type === 'text' ? _subVars(el.text || '') - : el.type === 'clock' ? (el.format || '%H:%M') - : (pv !== undefined && pv !== '' ? String(pv) : `{${key}}`); - ctx.font = `${finfo.sizePx * s}px ${finfo.family}`; - ctx.fillStyle = `rgb(${el.r},${el.g},${el.b})`; - ctx.fillText(displayText, _textX(displayText, finfo), (ay + finfo.sizePx) * s); - // Second line (text and clock) - if (el.type === 'text' && el.text2) { - const t2 = _subVars(el.text2); - const y2 = ay + finfo.sizePx + (el.lineSpacing ?? 2); - ctx.fillText(t2, _textX(t2, finfo), (y2 + finfo.sizePx) * s); - } - if (el.type === 'clock' && el.format2) { - const y2 = ay + finfo.sizePx + (el.lineSpacing ?? 2); - ctx.fillText(el.format2, _textX(el.format2, finfo), (y2 + finfo.sizePx) * s); - } - break; - } - - case 'countdown': { - const finfo = FONT_MAP[el.font] || FONT_MAP.press_start; - const t = el.previewText || '--d --h'; - ctx.font = `${finfo.sizePx * s}px ${finfo.family}`; - ctx.fillStyle = `rgb(${el.r},${el.g},${el.b})`; - ctx.fillText(t, _textX(t, finfo), (ay + finfo.sizePx) * s); - break; - } - - case 'rectangle': { - const rx = ax * s, ry = ay * s; - const rw = el.width * s, rh = el.height * s; - if (el.hasFill) { - ctx.fillStyle = `rgb(${el.fillR},${el.fillG},${el.fillB})`; - ctx.fillRect(rx, ry, rw, rh); - } - if (el.hasOutline) { - ctx.strokeStyle = `rgb(${el.outR},${el.outG},${el.outB})`; - ctx.lineWidth = 1; - ctx.strokeRect(rx, ry, rw, rh); - } - break; - } - - case 'ellipse': { - const cx = (ax + el.width / 2) * s; - const cy = (ay + el.height / 2) * s; - const rx = (el.width / 2) * s; - const ry = (el.height / 2) * s; - ctx.beginPath(); - ctx.ellipse(cx, cy, rx, ry, 0, 0, Math.PI * 2); - if (el.hasFill) { - ctx.fillStyle = `rgb(${el.fillR},${el.fillG},${el.fillB})`; - ctx.fill(); - } - if (el.hasOutline) { - ctx.strokeStyle = `rgb(${el.outR},${el.outG},${el.outB})`; - ctx.lineWidth = 1; - ctx.stroke(); - } - break; - } - - case 'arc': { - const cx = (ax + el.width / 2) * s; - const cy = (ay + el.height / 2) * s; - const rx = (el.width / 2) * s; - const ry = (el.height / 2) * s; - // PIL: 0°=right, clockwise. Canvas: same with anticlockwise=false - const startRad = (el.startAngle ?? 0) * Math.PI / 180; - const endRad = (el.endAngle ?? 270) * Math.PI / 180; - ctx.beginPath(); - ctx.ellipse(cx, cy, rx, ry, 0, startRad, endRad, false); - ctx.strokeStyle = `rgb(${el.r},${el.g},${el.b})`; - ctx.lineWidth = Math.max(1, el.lineWidth || 2); - ctx.stroke(); - break; - } - - case 'pixel': { - ctx.fillStyle = `rgb(${el.r},${el.g},${el.b})`; - ctx.fillRect(ax * s, ay * s, s, s); - break; - } - - case 'rounded_rectangle': { - const rx = ax * s, ry = ay * s; - const rw = el.width * s, rh = el.height * s; - const rad = Math.min((el.borderRadius ?? 3) * s, rw / 2, rh / 2); - ctx.beginPath(); - ctx.roundRect(rx, ry, rw, rh, rad); - if (el.hasFill) { - ctx.fillStyle = `rgb(${el.fillR},${el.fillG},${el.fillB})`; - ctx.fill(); - } - if (el.hasOutline) { - ctx.strokeStyle = `rgb(${el.outR},${el.outG},${el.outB})`; - ctx.lineWidth = 1; - ctx.stroke(); - } - break; - } - - case 'line': { - ctx.strokeStyle = `rgb(${el.r},${el.g},${el.b})`; - ctx.lineWidth = Math.max(1, el.lineWidth || 1); - ctx.beginPath(); - ctx.moveTo(el.x0 * s, el.y0 * s); - ctx.lineTo(el.x1 * s, el.y1 * s); - ctx.stroke(); - break; - } - - case 'divider': { - const isH = (el.orientation || 'horizontal') === 'horizontal'; - ctx.strokeStyle = `rgb(${el.r},${el.g},${el.b})`; - ctx.lineWidth = 1; - ctx.beginPath(); - if (isH) { - ctx.moveTo(0, ay * s + 0.5); - ctx.lineTo(_canvas.width, ay * s + 0.5); - } else { - ctx.moveTo(ax * s + 0.5, 0); - ctx.lineTo(ax * s + 0.5, _canvas.height); - } - ctx.stroke(); - break; - } - - case 'pips': { - const pipCount = Math.max(1, el.count ?? 5); - const pvPips = opts.previewValues?.[el.binding?.key]; - const filledN = pvPips !== undefined - ? Math.max(0, Math.min(pipCount, Math.round(parseFloat(pvPips) || 0))) - : Math.max(0, Math.min(pipCount, el.filled ?? 3)); - const ps = Math.max(1, el.pipSize ?? 4); - const pg = Math.max(0, el.pipSpacing ?? 2); - for (let i = 0; i < pipCount; i++) { - const isFilled = i < filledN; - if (!isFilled && !el.showEmpty) continue; - ctx.fillStyle = isFilled - ? `rgb(${el.r},${el.g},${el.b})` - : `rgb(${el.emptyR ?? 50},${el.emptyG ?? 50},${el.emptyB ?? 50})`; - ctx.fillRect((ax + i * (ps + pg)) * s, ay * s, ps * s, ps * s); - } - break; - } - - case 'sparkline': { - const slW = el.width ?? 40, slH = el.height ?? 12; - const count = Math.max(1, el.barCount ?? 8); - const spacing = el.barSpacing ?? 1; - const barW = Math.max(1, Math.floor((slW - spacing * (count - 1)) / count)); - const rawVals = (el.previewData || '').split(',') - .map(v => parseFloat(v.trim())).filter(n => !isNaN(n)); - while (rawVals.length < count) rawVals.push(0); - const maxV = Math.max(...rawVals.slice(0, count), 0.001); - const rx = ax * s, ry = ay * s; - if (el.hasBg) { - ctx.fillStyle = `rgb(${el.bgR ?? 30},${el.bgG ?? 30},${el.bgB ?? 30})`; - ctx.fillRect(rx, ry, slW * s, slH * s); - } - ctx.fillStyle = `rgb(${el.r},${el.g},${el.b})`; - for (let i = 0; i < count; i++) { - const norm = Math.max(0, Math.min(1, rawVals[i] / maxV)); - const barH = Math.max(1, Math.round(slH * norm)); - const bx = rx + (barW + spacing) * i * s; - const by = ry + (slH - barH) * s; - ctx.fillRect(bx, by, barW * s, barH * s); - } - break; - } - - case 'gauge': { - const gw = (el.width ?? 32), gh = (el.height ?? 32); - const cx = (ax + gw / 2) * s, cy = (ay + gh / 2) * s; - const rx = (gw / 2) * s, ry = (gh / 2) * s; - const lw = Math.max(1, (el.lineWidth ?? 3)); - const startDeg = el.startAngle ?? 135; - const endDeg = el.endAngle ?? 45; - // Arc sweep: from startDeg clockwise to endDeg (PIL convention) - const totalSweep = ((endDeg - startDeg) + 360) % 360 || 360; - const pvGauge = opts.previewValues?.[el.binding?.key]; - const pct = pvGauge !== undefined - ? Math.max(0, Math.min(100, parseFloat(pvGauge) || 0)) / 100 - : Math.max(0, Math.min(100, el.previewPct ?? 65)) / 100; - const fillSweep = totalSweep * pct; - const toRad = deg => (deg - 90) * Math.PI / 180; // canvas 0=top, PIL 0=right → offset -90 - - // Track arc - if (el.hasTrack !== false) { - ctx.beginPath(); - ctx.ellipse(cx, cy, rx - lw / 2, ry - lw / 2, 0, toRad(startDeg), toRad(startDeg + totalSweep), false); - ctx.strokeStyle = `rgb(${el.trackR ?? 40},${el.trackG ?? 40},${el.trackB ?? 40})`; - ctx.lineWidth = lw * s; - ctx.stroke(); - } - // Fill arc - if (pct > 0) { - ctx.beginPath(); - ctx.ellipse(cx, cy, rx - lw / 2, ry - lw / 2, 0, toRad(startDeg), toRad(startDeg + fillSweep), false); - ctx.strokeStyle = `rgb(${el.r},${el.g},${el.b})`; - ctx.lineWidth = lw * s; - ctx.stroke(); - } - // Centre label - if (el.showLabel) { - const gfinfo = FONT_MAP[el.font || 'four_by_six'] || FONT_MAP.four_by_six; - const labelText = Math.round(pct * 100) + '%'; - ctx.font = `${gfinfo.sizePx * s}px ${gfinfo.family}`; - ctx.fillStyle = `rgb(${el.labelR ?? 200},${el.labelG ?? 200},${el.labelB ?? 200})`; - const ltw = ctx.measureText(labelText).width; - ctx.fillText(labelText, cx - ltw / 2, cy + (gfinfo.sizePx * s) / 2); - } - break; - } - - case 'marquee': { - const finfo = FONT_MAP[el.font] || FONT_MAP.press_start; - const text = el.text || 'Scrolling text'; - const tw = text.length * finfo.charW * s; - const gap = (el.gap ?? 16) * s; - const totalW = tw + gap; - const tick = opts.animTick ?? 0; - const speed = (el.scrollSpeed ?? 1) * 2; - const scrolled = (tick * speed) % totalW; - // left: text enters from right; right: text enters from left - const startX = el.direction === 'right' - ? scrolled - tw - : matrixW * s - scrolled; - ctx.font = `${finfo.sizePx * s}px ${finfo.family}`; - ctx.fillStyle = `rgb(${el.r},${el.g},${el.b})`; - // Clip to canvas width so text doesn't bleed outside - ctx.save(); - ctx.beginPath(); - ctx.rect(0, ay * s - 1, matrixW * s, (finfo.sizePx + 2) * s); - ctx.clip(); - for (let i = -1; i <= 2; i++) { - ctx.fillText(text, startX + i * totalW, (ay + finfo.sizePx) * s); - } - ctx.restore(); - break; - } - - case 'progress_bar': { - const bw = el.barWidth ?? 60, bh = el.barHeight ?? 6; - const pvPb = opts.previewValues?.[el.binding?.key]; - const pct = pvPb !== undefined - ? Math.max(0, Math.min(100, parseFloat(pvPb) || 0)) / 100 - : Math.max(0, Math.min(100, el.previewPct ?? 65)) / 100; - const rx = ax * s, ry = ay * s; - if (el.hasBg) { - ctx.fillStyle = `rgb(${el.bgR ?? 30},${el.bgG ?? 30},${el.bgB ?? 30})`; - ctx.fillRect(rx, ry, bw * s, bh * s); - } - const fillW = Math.max(0, Math.round(bw * pct)); - if (fillW > 0) { - ctx.fillStyle = `rgb(${el.r},${el.g},${el.b})`; - ctx.fillRect(rx, ry, fillW * s, bh * s); - } - if (el.hasOutline) { - ctx.strokeStyle = `rgb(${el.outR ?? 100},${el.outG ?? 100},${el.outB ?? 100})`; - ctx.lineWidth = 1; - ctx.strokeRect(rx, ry, bw * s, bh * s); - } - break; - } - } - - if (belowBreakpoint) { - ctx.globalAlpha = 0.6; - const bb = getBoundingBox(el, matrixW, matrixH); - ctx.font = `${Math.max(8, s * 2)}px monospace`; - ctx.fillStyle = '#facc15'; - ctx.fillText(`≥${el.minWidth}px`, bb.x * s, (bb.y + 4) * s); - } - } finally { - ctx.restore(); - } - } - - // ── Selection indicator ────────────────────────────────────────────── - function _drawSelection(ctx, el, SCALE, matrixW, matrixH) { - const bb = getBoundingBox(el, matrixW, matrixH); - const PAD = 2, s = SCALE; - const rx = bb.x * s - PAD, ry = bb.y * s - PAD; - const rw = bb.w * s + PAD * 2, rh = bb.h * s + PAD * 2; - - ctx.save(); - ctx.strokeStyle = '#3b82f6'; - ctx.lineWidth = 1; - ctx.setLineDash([3, 2]); - ctx.strokeRect(rx, ry, rw, rh); - ctx.setLineDash([]); - - if (el.xAnchor || el.yAnchor) { - ctx.font = `${Math.max(7, s)}px sans-serif`; - ctx.fillStyle = '#a78bfa'; - const anchorText = [ - el.xAnchor ? `x:${el.xAnchor[0]}` : '', - el.yAnchor ? `y:${el.yAnchor[0]}` : '', - ].filter(Boolean).join(' '); - if (anchorText) ctx.fillText(anchorText, rx + 1, ry - 2); - } - - // Resize handles: on rect, rounded rect, ellipse - if (['rectangle', 'rounded_rectangle', 'ellipse', 'arc', 'gauge', 'sparkline'].includes(el.type)) { - const handles = _getRectHandles(el, matrixW, matrixH); - const HS = 5; - ctx.fillStyle = 'white'; - ctx.strokeStyle = '#2563eb'; - ctx.lineWidth = 1; - for (const pt of Object.values(handles)) { - const hx = pt.x * s - HS / 2; - const hy = pt.y * s - HS / 2; - ctx.fillRect(hx, hy, HS, HS); - ctx.strokeRect(hx, hy, HS, HS); - } - } else { - // Corner dots for non-rectangle elements - ctx.fillStyle = '#3b82f6'; - const HS = 4; - for (const [hx, hy] of [ - [rx - HS / 2, ry - HS / 2], [rx + rw - HS / 2, ry - HS / 2], - [rx - HS / 2, ry + rh - HS / 2], [rx + rw - HS / 2, ry + rh - HS / 2], - ]) ctx.fillRect(hx, hy, HS, HS); - } - - ctx.restore(); - } - - // ── Dimension tooltip while dragging ───────────────────────────────── - function drawDragTooltip(ctx, el, SCALE, matrixW, matrixH) { - const bb = getBoundingBox(el, matrixW, matrixH); - const label = el.type === 'rectangle' - ? `${el.width}×${el.height}` - : `${bb.x},${bb.y}`; - const s = SCALE; - ctx.save(); - ctx.font = `${Math.max(9, s * 1.5)}px monospace`; - const tw = ctx.measureText(label).width; - const tx = bb.x * s, ty = (bb.y - 2) * s; - ctx.fillStyle = 'rgba(0,0,0,0.7)'; - ctx.fillRect(tx - 2, ty - 10, tw + 4, 12); - ctx.fillStyle = 'white'; - ctx.fillText(label, tx, ty); - ctx.restore(); - } - - // ── Public API ─────────────────────────────────────────────────────── - - function init(canvasEl) { - _canvas = canvasEl; - _ctx = canvasEl.getContext('2d'); - } - - function setGrid(show) { _showGrid = show; } - - function updateCanvasSize(matrixW, matrixH, SCALE) { - if (!_canvas) return; - _canvas.width = matrixW * SCALE; - _canvas.height = matrixH * SCALE; - } - - function render(elements, selectedId, matrixW, matrixH, SCALE, opts = {}) { - if (!_ctx) return; - const cW = matrixW * SCALE, cH = matrixH * SCALE; - - const bg = opts.bgColor; - _ctx.fillStyle = bg ? `rgb(${bg.r},${bg.g},${bg.b})` : '#000'; - _ctx.fillRect(0, 0, cW, cH); - - if (_showGrid) { - _ctx.strokeStyle = 'rgba(255,255,255,0.07)'; - _ctx.lineWidth = 0.5; - for (let x = SCALE; x < cW; x += SCALE) { - _ctx.beginPath(); _ctx.moveTo(x, 0); _ctx.lineTo(x, cH); _ctx.stroke(); - } - for (let y = SCALE; y < cH; y += SCALE) { - _ctx.beginPath(); _ctx.moveTo(0, y); _ctx.lineTo(cW, y); _ctx.stroke(); - } - } - - for (const el of elements) _drawElement(_ctx, el, SCALE, matrixW, matrixH, opts); - - if (opts.showRuler) { - _ctx.save(); - _ctx.fillStyle = 'rgba(255,255,255,0.08)'; - _ctx.fillRect(0, 0, cW, SCALE); // top strip - _ctx.fillRect(0, 0, SCALE, cH); // left strip - _ctx.strokeStyle = 'rgba(255,255,255,0.5)'; - _ctx.fillStyle = 'rgba(255,255,255,0.6)'; - _ctx.font = `${Math.max(5, SCALE - 1)}px monospace`; - const step = SCALE >= 4 ? 8 : 16; - for (let px = 0; px <= matrixW; px += step) { - const cx = px * SCALE; - const major = px % 32 === 0; - _ctx.lineWidth = 0.5; - _ctx.beginPath(); _ctx.moveTo(cx, 0); _ctx.lineTo(cx, major ? SCALE : SCALE * 0.5); _ctx.stroke(); - if (major && px > 0 && px < matrixW - 4) _ctx.fillText(String(px), cx + 1, SCALE - 1); - } - for (let py = 0; py <= matrixH; py += step) { - const cy = py * SCALE; - const major = py % 32 === 0; - _ctx.beginPath(); _ctx.moveTo(0, cy); _ctx.lineTo(major ? SCALE : SCALE * 0.5, cy); _ctx.stroke(); - if (major && py > 0 && py < matrixH - 4) _ctx.fillText(String(py), 1, cy + SCALE - 1); - } - _ctx.restore(); - } - - if (opts.showGuides) { - _ctx.save(); - _ctx.strokeStyle = 'rgba(255,60,60,0.45)'; - _ctx.lineWidth = 1; - _ctx.setLineDash([4, 3]); - const mx = Math.floor(cW / 2) + 0.5; - const my = Math.floor(cH / 2) + 0.5; - _ctx.beginPath(); _ctx.moveTo(mx, 0); _ctx.lineTo(mx, cH); _ctx.stroke(); - _ctx.beginPath(); _ctx.moveTo(0, my); _ctx.lineTo(cW, my); _ctx.stroke(); - _ctx.setLineDash([]); - _ctx.restore(); - } - - const sel = selectedId != null ? elements.find(e => e.id === selectedId) : null; - if (sel) { - _drawSelection(_ctx, sel, SCALE, matrixW, matrixH); - if (opts.showTooltip) drawDragTooltip(_ctx, sel, SCALE, matrixW, matrixH); - } - } - - return { - init, render, setGrid, updateCanvasSize, - hitTest, getBoundingBox, computeActualPos, resolveAnchor, - getResizeHandle, getCursorForHandle, - ELEMENT_DEFAULTS, FONT_MAP, DISPLAY_PRESETS, - }; -})(); diff --git a/web_interface/templates/v3/composer.html b/web_interface/templates/v3/composer.html deleted file mode 100644 index b6b062a8..00000000 --- a/web_interface/templates/v3/composer.html +++ /dev/null @@ -1,1852 +0,0 @@ - - - - - - Plugin Composer — LEDMatrix - - - - - - -

- - -
- - - -
-

- - Plugin Composer - Beta -

- - -
- - -
- -
- - - - - - - - - - -
- - - - - - - - - - -
- - -
- - -
-
- - -
- Plugin Info -
-
- Name * - -
-
- - ID * - - - - -
-
- Author * - -
-
-
- Duration s - -
-
- Version - -
-
-
- Background -
- - - -
-
-
- Category - -
-
- Description - -
-
-
- - -
- Add Elements -
- -
-
- - -
- Color Themes -
- -
-
- - -
-
- Config Variables - -
-
- -

No variables

-
-
- - -
- Quick-Add Vars - -
- -
- -
- -
-
- - -
- - -
-
- Display - - -
- - × - · × - - - - - - -
- - -
- -
- - - - -
- -
- -
- - -
- - -
- - -
-
- Layers - top ↑ -
-
- - -
-
- -
- - -
-
- - - - - -
-
- -
- - -
- - - unsaved - - -
- - - SNAP - - - el · - - -
- - - - -
-
-

Add Config Variable

-
-
Python key * -
-
Display label -
-
Type -
-
Default value -
-
Description -
-
-
- - -
-
-
- - -
-
-
-

Start from a Template

- -
-
-
- -
-
-
-
- - -
-
-
-

Open Installed Plugin

- -
-
-
- Loading… -
-
- Failed to load plugin list -
-
- No installed plugins found -
-
-

Click a plugin to load it:

- -
-
-
-
- - -
-
-
-

Generated Code Preview

-
-
- -
- -
-
-
-
- Generating… -
- -
-
- - - This is the exact code that will be exported. Edit your layout, then re-open to refresh. - -
- - -
-
-
-
- - -
-
-
-

- Keyboard Shortcuts -

- -
-
- Select elementClick canvas - DeselectEsc - Cycle elementsTab / Shift+Tab - Nudge (snap-aware)↑ ↓ ← → - Nudge 5px (override)Shift + arrow - Delete selectedDel / Backspace - Undo / RedoCtrl+Z / Ctrl+Y - Copy / Paste elementCtrl+C / Ctrl+V - Copy / Paste styleCtrl+Shift+C / V - DuplicateCtrl+D - Select first elementCtrl+A - Toggle snap-to-gridG - Bring to front / back] / [ - This dialog? -
-
-
- -
- - - - - - - diff --git a/web_interface/templates/v3/composer/manager.py.j2 b/web_interface/templates/v3/composer/manager.py.j2 deleted file mode 100644 index 5d90e06d..00000000 --- a/web_interface/templates/v3/composer/manager.py.j2 +++ /dev/null @@ -1,298 +0,0 @@ -""" -{{ plugin_name }} — LEDMatrix Plugin -Generated by LEDMatrix Plugin Composer on {{ generated_date }} - -Extension points: - update() → add HTTP/MQTT data-fetching logic here - _get_display_values() → map fetched data to display strings - display() → add new elements or adapt layout per display size -""" -from src.plugin_system.base_plugin import BasePlugin -{% if has_clock or has_countdown %} -from datetime import datetime -{% endif %} -{% if has_blink %} -import time -{% endif %} -{% if has_text_template %} -from collections import defaultdict -{% endif %} - - -class {{ class_name }}(BasePlugin): - - def __init__(self, plugin_id, config, display_manager, cache_manager, plugin_manager): - super().__init__(plugin_id, config, display_manager, cache_manager, plugin_manager) -{% for var in config_vars %} - self.{{ var.key }} = config.get({{ var.key | tojson }}, {{ var.default | tojson }}) -{% endfor %} - # Live data cache — populated by update(); always {} in static layouts - self._data = {} - - def update(self): - """Fetch and refresh display data. - - For dynamic plugins: fetch from APIs/MQTT here and store in self._data. - _get_display_values() will read self._data to produce display strings. - """ - # --- Data sources (add fetch logic here for dynamic plugins) --- - pass - - def _get_display_values(self): - """Map config variables and live data to display-ready strings. - - This is the single extension point for v2 data sources: - add self._data lookups here once update() populates them. - """ - return { -{% for var in config_vars %} - {{ var.key | tojson }}: str(self.{{ var.key }}), -{% endfor %} - } - - def display(self, force_clear=False): - try: -{% if has_text_template %} - values = defaultdict(str, self._get_display_values()) -{% else %} - values = self._get_display_values() -{% endif %} - - if force_clear: - self.display_manager.clear() - - width = self.display_manager.width - height = self.display_manager.height -{% if bg_color %} - - self.display_manager.draw.rectangle([0, 0, width, height], fill={{ bg_color }}) -{% endif %} - - # ── Elements (rendered bottom to top) ────────────────────────── -{% for el in elements %} -{% set p = " " if el.min_width > 0 else " " %} -{% set pi = (p + " ") if el.blink else p %} -{% if el.min_width > 0 %} - if width >= {{ el.min_width }}: # breakpoint: {{ el.min_width }}px+ displays only -{% endif %} -{% if el.blink %} -{{ p }}if int(time.time() * 2) % 2: -{% endif %} - -{% if el.type == 'text' %} -{{ pi }}self.display_manager.draw_text( -{% if el.text_is_template %} -{{ pi }} {{ el.text | tojson }}.format_map(values), -{% else %} -{{ pi }} {{ el.text | tojson }}, -{% endif %} -{{ pi }} x={{ el.x_expr }}, y={{ el.y_expr }}, -{{ pi }} color={{ el.rgb_tuple }}, -{{ pi }} font=self.display_manager.{{ el.font_attr }}, -{{ pi }}) -{% if el.text2 %} -{{ pi }}self.display_manager.draw_text( -{% if el.text_is_template %} -{{ pi }} {{ el.text2 | tojson }}.format_map(values), -{% else %} -{{ pi }} {{ el.text2 | tojson }}, -{% endif %} -{{ pi }} x={{ el.x2_expr }}, y={{ el.y2_expr }}, -{{ pi }} color={{ el.rgb_tuple }}, -{{ pi }} font=self.display_manager.{{ el.font_attr }}, -{{ pi }}) -{% endif %} -{% elif el.type == 'dynamic_text' %} -{% if el.binding_source == 'config' %} -{{ pi }}self.display_manager.draw_text( -{{ pi }} values.get({{ el.binding_key | tojson }}, ''), -{{ pi }} x={{ el.x_expr }}, y={{ el.y_expr }}, -{{ pi }} color={{ el.rgb_tuple }}, -{{ pi }} font=self.display_manager.{{ el.font_attr }}, -{{ pi }}) -{% endif %} -{% elif el.type == 'clock' %} -{{ pi }}self.display_manager.draw_text( -{{ pi }} datetime.now().strftime({{ el.format | tojson }}), -{{ pi }} x={{ el.x_expr }}, y={{ el.y_expr }}, -{{ pi }} color={{ el.rgb_tuple }}, -{{ pi }} font=self.display_manager.{{ el.font_attr }}, -{{ pi }}) -{% if el.format2 %} -{{ pi }}self.display_manager.draw_text( -{{ pi }} datetime.now().strftime({{ el.format2 | tojson }}), -{{ pi }} x={{ el.x2_expr }}, y={{ el.y2_expr }}, -{{ pi }} color={{ el.rgb_tuple }}, -{{ pi }} font=self.display_manager.{{ el.font_attr }}, -{{ pi }}) -{% endif %} -{% elif el.type == 'countdown' %} -{{ pi }}_cd_target = float(values.get({{ el.binding_key | tojson }}, 0) or 0) -{{ pi }}_cd_secs = max(0.0, _cd_target - datetime.now().timestamp()) -{% if el.countdown_format == 'dhms' %} -{{ pi }}_cd_d, _cd_rem = divmod(int(_cd_secs), 86400) -{{ pi }}_cd_h, _cd_rem = divmod(_cd_rem, 3600) -{{ pi }}_cd_m, _cd_s = divmod(_cd_rem, 60) -{{ pi }}_cd_str = f'{_cd_d}d {_cd_h:02d}:{_cd_m:02d}:{_cd_s:02d}' -{% elif el.countdown_format == 'hms' %} -{{ pi }}_cd_h, _cd_rem = divmod(int(_cd_secs), 3600) -{{ pi }}_cd_m, _cd_s = divmod(_cd_rem, 60) -{{ pi }}_cd_str = f'{_cd_h}h {_cd_m:02d}:{_cd_s:02d}' -{% elif el.countdown_format == 'dhm' %} -{{ pi }}_cd_d, _cd_rem = divmod(int(_cd_secs), 86400) -{{ pi }}_cd_h, _cd_m = divmod(_cd_rem // 60, 60) -{{ pi }}_cd_str = f'{_cd_d}d {_cd_h:02d}h {_cd_m:02d}m' -{% else %} -{{ pi }}_cd_d, _cd_rem = divmod(int(_cd_secs), 86400) -{{ pi }}_cd_h = _cd_rem // 3600 -{{ pi }}_cd_str = f'{_cd_d}d {_cd_h}h' -{% endif %} -{{ pi }}self.display_manager.draw_text( -{{ pi }} _cd_str, -{{ pi }} x={{ el.x_expr }}, y={{ el.y_expr }}, -{{ pi }} color={{ el.rgb_tuple }}, -{{ pi }} font=self.display_manager.{{ el.font_attr }}, -{{ pi }}) -{% elif el.type == 'rectangle' %} -{{ pi }}self.display_manager.draw.rectangle( -{{ pi }} [{{ el.x_expr }}, {{ el.y_expr }}, {{ el.x2_expr }}, {{ el.y2_expr }}], -{{ pi }} fill={{ el.fill_tuple }}, -{{ pi }} outline={{ el.outline_tuple }}, -{{ pi }}) -{% elif el.type == 'arc' %} -{{ pi }}self.display_manager.draw.arc( -{{ pi }} [{{ el.x_expr }}, {{ el.y_expr }}, {{ el.x2_expr }}, {{ el.y2_expr }}], -{{ pi }} start={{ el.start_angle }}, end={{ el.end_angle }}, -{{ pi }} fill={{ el.rgb_tuple }}, -{{ pi }} width={{ el.line_width }}, -{{ pi }}) -{% elif el.type == 'ellipse' %} -{{ pi }}self.display_manager.draw.ellipse( -{{ pi }} [{{ el.x_expr }}, {{ el.y_expr }}, {{ el.x2_expr }}, {{ el.y2_expr }}], -{{ pi }} fill={{ el.fill_tuple }}, -{{ pi }} outline={{ el.outline_tuple }}, -{{ pi }}) -{% elif el.type == 'pixel' %} -{{ pi }}self.display_manager.draw.point( -{{ pi }} [{{ el.x_expr }}, {{ el.y_expr }}], -{{ pi }} fill={{ el.rgb_tuple }}, -{{ pi }}) -{% elif el.type == 'rounded_rectangle' %} -{{ pi }}self.display_manager.draw.rounded_rectangle( -{{ pi }} [{{ el.x_expr }}, {{ el.y_expr }}, {{ el.x2_expr }}, {{ el.y2_expr }}], -{{ pi }} radius={{ el.border_radius }}, -{{ pi }} fill={{ el.fill_tuple }}, -{{ pi }} outline={{ el.outline_tuple }}, -{{ pi }}) -{% elif el.type in ('line', 'divider') %} -{{ pi }}self.display_manager.draw.line( -{{ pi }} [{{ el.x0_expr }}, {{ el.y0_expr }}, {{ el.x1_expr }}, {{ el.y1_expr }}], -{{ pi }} fill={{ el.rgb_tuple }}, -{{ pi }} width={{ el.line_width }}, -{{ pi }}) -{% elif el.type == 'pips' %} -{{ pi }}_pip_filled = max(0, min({{ el.pip_count }}, int(float(values.get({{ el.binding_key | tojson }}, 0) or 0)))) -{{ pi }}for _pip_i in range({{ el.pip_count }}): -{{ pi }} _pip_x = ({{ el.x_expr }}) + _pip_i * ({{ el.pip_size }} + {{ el.pip_spacing }}) -{{ pi }} _pip_color = {{ el.fill_tuple }} if _pip_i < _pip_filled else {{ el.empty_tuple }} -{% if not el.show_empty %} -{{ pi }} if _pip_i >= _pip_filled: -{{ pi }} continue -{% endif %} -{{ pi }} self.display_manager.draw.rectangle( -{{ pi }} [_pip_x, {{ el.y_expr }}, _pip_x + {{ el.pip_size }} - 1, ({{ el.y_expr }}) + {{ el.pip_size }} - 1], -{{ pi }} fill=_pip_color, -{{ pi }} ) -{% elif el.type == 'sparkline' %} -{{ pi }}_sl_raw = str(values.get({{ el.binding_key | tojson }}, '') or '') -{{ pi }}_sl_vals = [float(v.strip()) for v in _sl_raw.split(',') if v.strip()][:{{ el.bar_count }}] -{{ pi }}_sl_vals += [0.0] * max(0, {{ el.bar_count }} - len(_sl_vals)) -{{ pi }}_sl_max = max(_sl_vals) if any(_sl_vals) else 1.0 -{{ pi }}_sl_bw = max(1, ({{ el.bar_width_px }} - {{ el.bar_spacing }} * ({{ el.bar_count }} - 1)) // {{ el.bar_count }}) -{% if el.bg_tuple != 'None' %} -{{ pi }}self.display_manager.draw.rectangle( -{{ pi }} [{{ el.x_expr }}, {{ el.y_expr }}, ({{ el.x_expr }}) + {{ el.bar_width_px }}, ({{ el.y_expr }}) + {{ el.bar_height_px }}], -{{ pi }} fill={{ el.bg_tuple }}, -{{ pi }}) -{% endif %} -{{ pi }}for _sl_i, _sl_v in enumerate(_sl_vals): -{{ pi }} _sl_norm = max(0.0, min(1.0, _sl_v / (_sl_max or 1))) -{{ pi }} _sl_bh = max(1, round({{ el.bar_height_px }} * _sl_norm)) -{{ pi }} _sl_bx = ({{ el.x_expr }}) + (_sl_bw + {{ el.bar_spacing }}) * _sl_i -{{ pi }} _sl_by = ({{ el.y_expr }}) + {{ el.bar_height_px }} - _sl_bh -{{ pi }} self.display_manager.draw.rectangle( -{{ pi }} [_sl_bx, _sl_by, _sl_bx + _sl_bw - 1, _sl_by + _sl_bh - 1], -{{ pi }} fill={{ el.fill_tuple }}, -{{ pi }} ) -{% elif el.type == 'gauge' %} -{{ pi }}_gv = max(0.0, min(100.0, float(values.get({{ el.binding_key | tojson }}, 0) or 0))) -{{ pi }}_g_total = (({{ el.end_angle }} - {{ el.start_angle }}) % 360) or 360 -{{ pi }}_g_sweep = _g_total * _gv / 100.0 -{% if el.track_tuple != 'None' %} -{{ pi }}self.display_manager.draw.arc( -{{ pi }} [{{ el.x_expr }}, {{ el.y_expr }}, {{ el.x2_expr }}, {{ el.y2_expr }}], -{{ pi }} start={{ el.start_angle }}, end={{ el.start_angle }} + _g_total, -{{ pi }} fill={{ el.track_tuple }}, -{{ pi }} width={{ el.line_width }}, -{{ pi }}) -{% endif %} -{{ pi }}if _g_sweep > 0: -{{ pi }} self.display_manager.draw.arc( -{{ pi }} [{{ el.x_expr }}, {{ el.y_expr }}, {{ el.x2_expr }}, {{ el.y2_expr }}], -{{ pi }} start={{ el.start_angle }}, end={{ el.start_angle }} + _g_sweep, -{{ pi }} fill={{ el.rgb_tuple }}, -{{ pi }} width={{ el.line_width }}, -{{ pi }} ) -{% if el.show_label %} -{{ pi }}_g_cx = ({{ el.x_expr }}) + ({{ el.x2_expr }} - ({{ el.x_expr }})) // 2 -{{ pi }}_g_cy = ({{ el.y_expr }}) + ({{ el.y2_expr }} - ({{ el.y_expr }})) // 2 -{{ pi }}self.display_manager.draw_text( -{{ pi }} f'{int(_gv)}%', -{{ pi }} x=_g_cx, y=_g_cy, -{{ pi }} color={{ el.label_tuple }}, -{{ pi }} font=self.display_manager.{{ el.font_attr }}, -{{ pi }}) -{% endif %} -{% elif el.type == 'marquee' %} -{{ pi }}_{{ el.data_key }}_text = {{ el.text | tojson }} -{{ pi }}_{{ el.data_key }}_tw = len(_{{ el.data_key }}_text) * {{ el.char_w }} -{{ pi }}_{{ el.data_key }}_x = int(self._data.get({{ el.data_key | tojson }}, width)) -{% if el.direction == 'right' %} -{{ pi }}_{{ el.data_key }}_x += {{ el.scroll_speed }} -{{ pi }}if _{{ el.data_key }}_x > width: -{{ pi }} _{{ el.data_key }}_x = -(_{{ el.data_key }}_tw + {{ el.gap }}) -{% else %} -{{ pi }}_{{ el.data_key }}_x -= {{ el.scroll_speed }} -{{ pi }}if _{{ el.data_key }}_x < -(_{{ el.data_key }}_tw + {{ el.gap }}): -{{ pi }} _{{ el.data_key }}_x = width -{% endif %} -{{ pi }}self._data[{{ el.data_key | tojson }}] = _{{ el.data_key }}_x -{{ pi }}self.display_manager.draw_text( -{{ pi }} _{{ el.data_key }}_text, -{{ pi }} x=_{{ el.data_key }}_x, y={{ el.y_expr }}, -{{ pi }} color={{ el.rgb_tuple }}, -{{ pi }} font=self.display_manager.{{ el.font_attr }}, -{{ pi }}) -{% elif el.type == 'progress_bar' %} -{{ pi }}_pb_x = {{ el.x_expr }} -{{ pi }}_pb_y = {{ el.y_expr }} -{{ pi }}_pb_pct = max(0.0, min(100.0, float(values.get({{ el.binding_key | tojson }}, 0) or 0))) / 100.0 -{{ pi }}_pb_fill_w = int({{ el.bar_width }} * _pb_pct) -{{ pi }}self.display_manager.draw.rectangle( -{{ pi }} [_pb_x, _pb_y, _pb_x + {{ el.bar_width }}, _pb_y + {{ el.bar_height }}], -{{ pi }} fill={{ el.bg_tuple }}, -{{ pi }} outline={{ el.outline_tuple }}, -{{ pi }}) -{{ pi }}if _pb_fill_w > 0: -{{ pi }} self.display_manager.draw.rectangle( -{{ pi }} [_pb_x, _pb_y, _pb_x + _pb_fill_w, _pb_y + {{ el.bar_height }}], -{{ pi }} fill={{ el.fill_tuple }}, -{{ pi }} ) -{% endif %} -{% endfor %} - # ── End elements ─────────────────────────────────────────────── - - self.display_manager.update_display() - - except Exception as e: - self.logger.error('Display error: %s', e, exc_info=True)