Migrate matcher onto the shared vendored core (partial: shared primitives)

.github/workflows/tests.yml

@@ -29,7 +29,18 @@ jobs:
           pip install -r requirements-dev.txt
 
       - name: Compile-check shipped plugin sources
-        run: python -m py_compile Channel-Maparr/plugin.py Channel-Maparr/fuzzy_matcher.py Channel-Maparr/logo_matcher.py Channel-Maparr/progress_status.py Channel-Maparr/aliases.py
+        run: python -m py_compile Channel-Maparr/plugin.py Channel-Maparr/fuzzy_matcher.py Channel-Maparr/matching_core.py Channel-Maparr/logo_matcher.py Channel-Maparr/progress_status.py Channel-Maparr/aliases.py
+
+      # Explicit, named drift gate: freezes the pure matcher primitives against
+      # tests/matcher_golden_baseline.json (Stage 0 of the matcher standardization
+      # plan). -o addopts="" neutralizes any inherited ini options for a clean run.
+      - name: Matcher golden drift gate
+        run: python -m pytest tests/test_matcher_golden.py -q -o addopts=""
+
+      # The vendored shared matching core must stay byte-identical to its pinned hash
+      # (catches a stray hand-edit to the vendored copy or a CRLF checkout).
+      - name: Vendored-core parity gate
+        run: python -m pytest tests/test_core_parity.py -q -o addopts=""
 
       - name: Run test suite
         run: python -m pytest

Channel-Maparr/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "Channel Mapparr",
-  "version": "1.26.1701952",
+  "version": "1.26.1791324",
   "description": "Standardizes broadcast (OTA) and premium/cable channel names using network data and channel lists. Supports M3U stream import, category organization, and fuzzy matching across 42K+ channels in 11 countries.",
   "author": "PiratesIRC",
   "license": "MIT",

Channel-Maparr/plugin.py

@@ -44,7 +44,7 @@
 class PluginConfig:
     """Configuration constants for Channel Maparr."""
 
-    PLUGIN_VERSION = "1.26.1701952"
+    PLUGIN_VERSION = "1.26.1791324"
 
     # Channel Database Settings
     DEFAULT_CHANNEL_DATABASES = "US"

scripts/core_manifest.json

@@ -0,0 +1,3 @@
+{
+  "matching_core.py": "2ac7ac4cb283306152701bfd977ff2f13700d63d8023fdfa280b1480f5a969dc"
+}

scripts/sync_core.py

@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+"""Vendor the shared matching core into a plugin's flat inner folder (Stage 0.5 tooling).
+
+This is the CANONICAL template. At each plugin's migration it is copied verbatim into
+that plugin's tracked ``scripts/sync_core.py`` and run by the /release flow. It self-
+locates assuming the layout ``<workspace>/<Plugin>/scripts/sync_core.py`` with the shared
+source of truth at ``<workspace>/_shared/`` and the deployable inner folder at
+``<workspace>/<Plugin>/<Plugin>/``.
+
+Modes:
+  (default)  write: copy _shared/{matching_core,aliases_base}.py into the inner folder
+             and (re)write scripts/core_manifest.json with their sha256 hashes.
+  --check    verify the vendored copies are byte-identical to _shared (the "forgot to
+             sync" gate). Needs _shared present, so it runs LOCALLY (release skill /
+             pre-commit), never in per-plugin GitHub CI. Exit != 0 on any drift.
+  --dry-run  print what write would do (hashes + targets) without touching anything.
+
+The per-plugin CI gate is SEPARATE and needs no _shared: it asserts
+sha256(inner/<file>) == core_manifest.json (see tests/test_core_parity.py). Keep the two
+vendored files OUT of any bump_version lockstep stamping, or the hash gate fails forever.
+See MATCHER-STANDARDIZATION-PLAN.md §6.
+"""
+from __future__ import annotations
+
+import argparse
+import hashlib
+import json
+import shutil
+import sys
+from pathlib import Path
+
+# The matcher is vendored now; aliases_base.py joins this list at the alias-migration
+# stage (when each plugin's aliases.py becomes a de-drifted base + per-market overlay).
+SHARED_FILES = ["matching_core.py"]
+
+
+def file_sha256(path: Path) -> str:
+    return hashlib.sha256(path.read_bytes()).hexdigest()
+
+
+def locate():
+    """Return (inner_dir, shared_dir, manifest_path) from this script's location.
+
+    Layout: <workspace>/<Plugin>/scripts/sync_core.py
+            <workspace>/_shared/{matching_core,aliases_base}.py
+            <workspace>/<Plugin>/<Plugin>/   (flat inner folder = deploy artifact)
+    """
+    here = Path(__file__).resolve()
+    repo_root = here.parent.parent           # <Plugin>/
+    workspace = repo_root.parent             # <workspace>/
+    shared_dir = workspace / "_shared"
+    inner_dir = next((p.parent for p in repo_root.glob("*/fuzzy_matcher.py")), repo_root / repo_root.name)
+    manifest_path = here.parent / "core_manifest.json"
+    return inner_dir, shared_dir, manifest_path
+
+
+def do_write(inner_dir: Path, shared_dir: Path, manifest_path: Path, dry_run: bool) -> int:
+    manifest = {}
+    for fname in SHARED_FILES:
+        src = shared_dir / fname
+        if not src.exists():
+            print(f"ERROR: shared source missing: {src}")
+            return 1
+        digest = file_sha256(src)
+        manifest[fname] = digest
+        dst = inner_dir / fname
+        if dry_run:
+            print(f"  would copy {src} -> {dst}  ({digest[:12]}…)")
+        else:
+            shutil.copyfile(src, dst)
+            print(f"  vendored {fname}  ({digest[:12]}…)")
+    if dry_run:
+        print(f"  would write manifest {manifest_path}")
+        return 0
+    manifest_path.parent.mkdir(parents=True, exist_ok=True)
+    manifest_path.write_text(json.dumps(manifest, indent=2, sort_keys=True) + "\n", encoding="utf-8")
+    print(f"  wrote manifest {manifest_path}")
+    return 0
+
+
+def do_check(inner_dir: Path, shared_dir: Path) -> int:
+    drift = 0
+    for fname in SHARED_FILES:
+        src, dst = shared_dir / fname, inner_dir / fname
+        if not src.exists():
+            print(f"ERROR: shared source missing: {src}")
+            return 1
+        if not dst.exists():
+            print(f"DRIFT: vendored copy missing: {dst} (run sync_core.py)")
+            drift += 1
+            continue
+        if file_sha256(src) != file_sha256(dst):
+            print(f"DRIFT: {fname} vendored copy differs from _shared (run sync_core.py)")
+            drift += 1
+    if drift:
+        print(f"sync check FAILED: {drift} file(s) out of sync")
+        return 1
+    print("sync check OK: vendored core matches _shared")
+    return 0
+
+
+def main() -> int:
+    ap = argparse.ArgumentParser(description="Vendor the shared matching core into this plugin.")
+    ap.add_argument("--check", action="store_true", help="verify vendored == _shared, don't write")
+    ap.add_argument("--dry-run", action="store_true", help="show what write would do")
+    args = ap.parse_args()
+
+    inner_dir, shared_dir, manifest_path = locate()
+    if args.check:
+        return do_check(inner_dir, shared_dir)
+    return do_write(inner_dir, shared_dir, manifest_path, dry_run=args.dry_run)
+
+
+if __name__ == "__main__":
+    sys.exit(main())