Fixes

reduce to 1 service remove some bugs rename sensor
vingerha · Mar 14, 2024 · 250ee3d · 250ee3d
1 parent aa9956f
commit 250ee3d
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 60 deletions.
diff --git a/custom_components/adsb_lol/coordinator.py b/custom_components/adsb_lol/coordinator.py
@@ -54,19 +54,26 @@ async def _async_update_data(self) -> dict[str, str]:
         self._flight = await self.hass.async_add_executor_job(
                     get_flight, self
                 )     
-
-        self._data = {
-            "registration": self._flight["ac"][0]["r"],
-            "callsign": self._flight["ac"][0]["flight"],
-            "type": self._flight["ac"][0]["t"],
-            "icao24": self._flight["ac"][0]["hex"],
-            "altitude_baro": self._flight["ac"][0]["alt_baro"],
-            "altitude_geom": self._flight["ac"][0]["alt_geom"],
-            "ground_speed": self._flight["ac"][0]["gs"],
-            "mach": self._flight["ac"][0]["mach"],
-            "latitude": self._flight["ac"][0]["lat"],
-            "longitude": self._flight["ac"][0]["lon"],
-        }  
+        if self._flight["ac"]:
+            self._data = {
+                "registration": self._flight["ac"][0]["r"],
+                "callsign": self._flight["ac"][0]["flight"],
+                "type": self._flight["ac"][0]["t"],
+                "icao24": self._flight["ac"][0]["hex"],
+                "altitude_baro": self._flight["ac"][0]["alt_baro"],
+                "altitude_geom": self._flight["ac"][0]["alt_geom"],
+                "ground_speed": self._flight["ac"][0]["gs"],
+                "mach": self._flight["ac"][0]["mach"],
+                "latitude": self._flight["ac"][0]["lat"],
+                "longitude": self._flight["ac"][0]["lon"],
+            }  
+        else:
+            self._data = { 
+                "registration": "Not found",
+                "callsign": "Not found",
+                "type": "Not found",
+                "icao24": "Not found",
+            } 
 
         _LOGGER.debug("Coordinator data: %s", self._data)        
 

diff --git a/custom_components/adsb_lol/sensor.py b/custom_components/adsb_lol/sensor.py
@@ -29,9 +29,6 @@ def get_current_registrations(flights) -> set[str]:
     for key, value in flights.items():
         result.add(key)
     return result
-
-
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -52,6 +49,42 @@ async def async_setup_entry(
         sensors.append(
                 ADSBPointSensor(coordinator, config_entry.data.get('device_tracker_id') )
             )    
+
+        # setup listening for new reg
+        current_registrations = get_current_registrations(coordinator.data)
+
+
+
+        def _async_registrations_listener() -> None:
+            """Listen for new registrations and add sensors if they did not exist."""
+            received_registrations = get_current_registrations(coordinator.data)
+            new_registrations = received_registrations - current_registrations
+            old_registrations = current_registrations - received_registrations
+            _LOGGER.debug("New registrations: %s", new_registrations)
+            _LOGGER.debug("Old registrations: %s", old_registrations)
+
+            if old_registrations:
+                entity_registry = er.async_get(hass)
+                entries = er.async_entries_for_config_entry(entity_registry, config_entry.entry_id)
+                for registration in old_registrations:
+                    for entry in entries:
+                        if entry.entity_id.startswith("sensor.") and entry.unique_id.startswith(registration):
+                            _LOGGER.debug("Removing registration: %s",registration)
+                            entity_registry.async_remove(entry.entity_id)          
+
+            if new_registrations:
+                sensors = []
+                current_registrations.update(new_registrations)
+                for registration in new_registrations:
+                    for key, value in coordinator.data.items():
+                        if key == registration:
+                            _LOGGER.debug("Listener: adding registration: %s", key)
+                            sensors.append(
+                                    ADSBPointACSensor(value, coordinator, config_entry.data.get('device_tracker_id'))
+                                    )
+                async_add_entities(sensors, False)    
+
+        coordinator.async_add_listener(_async_registrations_listener)
 
     else:
         coordinator_t: ADSBUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id][
@@ -65,41 +98,6 @@ async def async_setup_entry(
 
     async_add_entities(sensors, False)
 
-    # setup listening for new reg
-    current_registrations = get_current_registrations(coordinator.data)
-
-    def _async_registrations_listener() -> None:
-        """Listen for new registrations and add sensors if they did not exist."""
-        received_registrations = get_current_registrations(coordinator.data)
-        new_registrations = received_registrations - current_registrations
-        old_registrations = current_registrations - received_registrations
-        _LOGGER.debug("New registrations: %s", new_registrations)
-        _LOGGER.debug("Old registrations: %s", old_registrations)
-
-        if old_registrations:
-            entity_registry = er.async_get(hass)
-            entries = er.async_entries_for_config_entry(entity_registry, config_entry.entry_id)
-            for registration in old_registrations:
-                for entry in entries:
-                    if entry.entity_id.startswith("sensor.") and entry.unique_id.endswith(registration):
-                        _LOGGER.debug("Removing registration: %s",registration)
-                        entity_registry.async_remove(entry.entity_id)          
-
-        if new_registrations:
-            sensors = []
-            current_registrations.update(new_registrations)
-            for registration in new_registrations:
-                for key, value in coordinator.data.items():
-                    if key == registration:
-                        _LOGGER.debug("Listener: adding registration: %s", key)
-                        sensors.append(
-                                ADSBPointACSensor(value, coordinator, config_entry.data.get('device_tracker_id'))
-                                )
-            async_add_entities(sensors, False)                                
-
-
-
-    coordinator.async_add_listener(_async_registrations_listener)
 
 class ADSBFlightTrackerSensor(CoordinatorEntity, SensorEntity):
     """Implementation of a ADSB Flight tracker via registration departures sensor."""
@@ -152,11 +150,11 @@ def __init__(self, coordinator, device_tracker_id) -> None:
 
         self._attr_unique_id = f"adsb-in-radius-{self._name}"
         self._attr_device_info = DeviceInfo(
-            name=f"ADSB - {self._name}",
+            name=f"ADSB",
             entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, f"ADSB - {self._name}")},
+            identifiers={(DOMAIN, "ADSB")},
             manufacturer="ADSB",
-            model=self._name,
+            model="ADSB",
         )
         self._attributes = self._update_attrs()
         self._attr_extra_state_attributes = self._attributes
@@ -191,17 +189,17 @@ class ADSBPointACSensor(CoordinatorEntity, SensorEntity):
     def __init__(self, aircraft, coordinator, device_tracker_id) -> None:
         """Initialize the ADSB sensor."""
         super().__init__(coordinator)            
-        self._name = device_tracker_id + "_" + aircraft["registration"]
+        self._name = aircraft["registration"] + "_in_radius_" + device_tracker_id
         self._device_tracker_id = device_tracker_id
         self._attributes: dict[str, Any] = {}
 
-        self._attr_unique_id = f"adsb-in-radius-{self._name}"
+        self._attr_unique_id = f"{self._name}"
         self._attr_device_info = DeviceInfo(
-            name=f"ADSB - {self._name}",
+            name=f"ADSB",
             entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, f"ADSB - {self._name}")},
+            identifiers={(DOMAIN, "ADSB")},
             manufacturer="ADSB",
-            model=self._name,
+            model="ADSB",
         )
         self._aircraft = aircraft
         self._attributes = self._update_attrs()
@@ -210,7 +208,7 @@ def __init__(self, aircraft, coordinator, device_tracker_id) -> None:
     @property
     def name(self) -> str:
         """Return the name of the sensor."""
-        return "aircraft_radius_" + str(self._name)
+        return str(self._name)
 
     @callback
     def _handle_coordinator_update(self) -> None: