forked from viewit/KX-Bridge-Release
viewit
23e3831232
_parse_combined_rfid_type()/_match_profile_by_vendor_family() (added in an earlier nightly) were only ever invoked inside _build_lane_data(), which is only reached when OrcaSlicer actively polls the Moonraker lane_data endpoint. The actual MQTT receive path (_on_multicolor_box -> self._ams_slots -> _push_status_update -> dashboard, and the /kx/filament/slots dashboard API, and Happy-Hare gate data) never touched this logic at all, so a combined RFID string like "GEEETECH PLA Bas" kept showing up unmatched everywhere except the one endpoint nobody was looking at - exactly what @Blaim's extensive debugging in the issue thread demonstrated. Centralized the matching into _effective_slot_profile() itself, since all three real consumers already call it. This fixes the dashboard and gate data with a single change instead of duplicating the matching logic per caller (which is what caused the gap in the first place). While centralizing, found and fixed a related edge case: the stale-profile guard compared a manual override's material family directly against the raw combined RFID string, which _material_family() can't parse past the vendor prefix - a valid manual override on an RFID-tagged slot would have been incorrectly treated as stale and dropped. Now resolves the plain material family through the RFID parser first for that comparison. Also added variant-token disambiguation to _match_profile_by_vendor_family() per @Blaim's follow-up request: when a vendor has multiple profiles of the same material family (e.g. "Geeetech PLA Basic" vs. "Geeetech PLA Matte"), the RFID string's truncated third token ("Bas") is now scored against candidate profile names instead of always picking the first match. New tests cover the actual runtime path end-to-end (a realistic multiColorBox/report payload through _on_multicolor_box, verified against the /kx/filament/slots response the dashboard consumes) - the previous test suite only exercised the helper functions and _build_lane_data() in isolation with hand-set state, which is how this gap went unnoticed.