[stream-mapparr] Bump version to 1.26.1720023 (#138)

Author: PiratesIRC

plugins/stream-mapparr/CHANGELOG.md

@@ -6,6 +6,46 @@ _Nothing yet._
 
 ---
 
+## v1.26.1720023 (June 21, 2026)
+
+**Type**: Bugfix release — OTA (broadcast) callsign matching restored, and a
+data-loss guard for overwrite runs. Fixes bug-063 (user-reported: running
+Match & Assign against US: ABC/CBS/FOX/NBC left almost every channel with no
+streams).
+
+### Fixed
+
+- **Overwrite no longer wipes streams on a zero-match run.** In
+  `add_streams_to_channels`, a channel that matched 0 streams while
+  `overwrite_streams=True` previously had all its existing `ChannelStream`
+  rows deleted and nothing assigned — so a run that matched nothing (wrong
+  threshold, a database/callsign gap) silently emptied every channel.
+  "Overwrite" now only replaces when there are actual replacement streams;
+  an empty match set leaves existing streams untouched.
+
+- **OTA affiliates match by callsign again.** OTA detection in
+  `_match_streams_to_channel` depended solely on a `US_channels.json` database
+  lookup, but that database carries no `broadcast`/`callsign` entries — so
+  affiliates like `ABC - AL Montgomery (WNCF)` fell through to strict fuzzy
+  name matching and matched nothing. New `_resolve_ota_callsign()` resolves the
+  callsign from the FCC station table first, then falls back to a
+  parenthesized callsign in the Dispatcharr channel name.
+
+### Added
+
+- **FCC station table (`networks.json`) is now loaded and used.** Stream-Mapparr
+  already shipped `networks.json` (1915 US OTA stations: callsign → network /
+  city / state) but never loaded it. `FuzzyMatcher._load_broadcast_stations()`
+  (ported from Channel-Maparr) now indexes it into `channel_lookup` on every
+  load, giving authoritative callsign validation. `_build_us_callsign_database`
+  (used by `Match US OTA Only`) is repointed from the empty `US_channels.json`
+  to `networks.json`, reviving that action. **`networks.json` is now part of the
+  deploy file set** (it was missing from the container entirely).
+
+- 19 regression tests in `tests/test_ota_callsign_fallback.py`.
+
+---
+
 ## v1.26.1650116 (June 13, 2026)
 
 **Type**: Maintenance — plugin manifest cleanup (no runtime behavior change).

plugins/stream-mapparr/fuzzy_matcher.py

@@ -341,8 +341,54 @@ def _load_channel_databases(self):
                 self.logger.error(f"Error loading {channel_file}: {e}")
 
         self.logger.info(f"Total channels loaded: {total_broadcast} broadcast, {total_premium} premium")
+        self._load_broadcast_stations()
         return True
 
+    def _load_broadcast_stations(self):
+        """Load the FCC station table (networks.json) into the OTA lookup.
+
+        The per-country *_channels.json databases ship only premium
+        (National/Regional) entries — no ``broadcast`` type, no ``callsign``
+        field — so OTA/callsign matching relies on this US station table:
+        callsign -> {network_affiliation, community_served_city,
+        community_served_state, ...}. Each station is appended to
+        ``broadcast_channels`` and indexed in ``channel_lookup`` by both its
+        full callsign (``WEWS-TV``) and base callsign (``WEWS``) so a stream
+        citing either form resolves. A missing file is non-fatal. Ported from
+        Channel-Maparr to revive OTA matching after the US database lost its
+        broadcast entries. bug-063.
+
+        Returns the number of stations loaded.
+        """
+        stations_path = os.path.join(self.plugin_dir, "networks.json")
+        if not os.path.exists(stations_path):
+            self.logger.info("No networks.json present — OTA station table not loaded")
+            return 0
+
+        try:
+            with open(stations_path, 'r', encoding='utf-8') as f:
+                stations = json.load(f)
+        except Exception as e:
+            self.logger.error(f"Error loading networks.json: {e}")
+            return 0
+
+        loaded = 0
+        for station in stations:
+            callsign = (station.get('callsign') or '').strip().upper()
+            if not callsign:
+                continue
+            self.broadcast_channels.append(station)
+            # setdefault: keep the first (primary) station for a given key so a
+            # later subchannel entry can't clobber the main affiliate.
+            self.channel_lookup.setdefault(callsign, station)
+            base_callsign = re.sub(r'-(?:TV|CD|LP|DT|LD)$', '', callsign)
+            if base_callsign != callsign:
+                self.channel_lookup.setdefault(base_callsign, station)
+            loaded += 1
+
+        self.logger.info(f"Loaded {loaded} OTA broadcast stations from networks.json")
+        return loaded
+
     def reload_databases(self, country_codes=None):
         """
         Reload channel databases with specific country codes.
@@ -429,6 +475,7 @@ def reload_databases(self, country_codes=None):
                 self.logger.error(f"Error loading {channel_file}: {e}")
 
         self.logger.info(f"Total channels loaded: {total_broadcast} broadcast, {total_premium} premium")
+        self._load_broadcast_stations()
         return True
 
     def extract_callsign(self, channel_name):
@@ -446,7 +493,15 @@ def extract_callsign(self, channel_name):
             callsign = paren_match.group(1).upper()
             if callsign not in ['WEST', 'EAST', 'KIDS', 'WOMEN', 'WILD', 'WORLD']:
                 return callsign
-        
+
+        # Priority 1b: grandfathered 3-letter callsigns in parentheses without a suffix
+        # (WWL/WJZ/KYW/WRC). Suffixed forms fall through to Priority 2. bug-062.
+        paren3_match = re.search(r'\(([KW][A-Z]{2})\)', channel_name, re.IGNORECASE)
+        if paren3_match:
+            callsign = paren3_match.group(1).upper()
+            if callsign not in ['WEST', 'EAST', 'KIDS', 'WOMEN', 'WILD', 'WORLD']:
+                return callsign
+
         # Priority 2: Callsigns with suffix in parentheses
         paren_suffix_match = re.search(r'\(([KW][A-Z]{2,4}-(?:TV|CD|LP|DT|LD))\)', channel_name, re.IGNORECASE)
         if paren_suffix_match: