- Finish entities integration from Factory

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@3014 b32b6428-25c9-4566-ad07-03861ab6144f

apps/homeassistant/xaal/bridge.py

@@ -79,15 +79,15 @@ class Bridge(object):
         if cnt==0:
             self.warm_once(f"Unable to find entity for {dev.address} {dev.dev_type} ")
        
-    def add_entity(self, addr: bindings.UUID, entity: XAALEntity) -> None:
-        """register a new entity (called from factories)"""
-        _LOGGER.debug(f"new Entity {addr} {entity}")
-        self._entities.update({addr: entity})
+    def add_entities(self, addr: bindings.UUID, entities: list[XAALEntity]) -> None:
+        """register a some entities (called from factories)"""
+        _LOGGER.debug(f"new Entity {addr} {entities}")
+        self._entities.update({addr: entities})
 
-    def remove_entity(self, addr: bindings.UUID) -> None:
+    def remove_entities(self, addr: bindings.UUID) -> None:
         self._entities.pop(addr)
 
-    def get_entity(self, addr: bindings.UUID) -> XAALEntity:
+    def get_entities(self, addr: bindings.UUID) -> list[XAALEntity] | None:
         return self._entities.get(addr, None)
 
     #####################################################
@@ -122,14 +122,15 @@ class Bridge(object):
     # Monitor events & callbacks
     #####################################################
     def monitor_event(self, notif: Notification, dev: MonitorDevice):
-        entity = self.get_entity(dev.address)
+        entities = self.get_entities(dev.address)
         # update entities if found
-        if entity and (notif in [Notification.attribute_change, Notification.description_change, Notification.metadata_change]):
-            if entity.available:
-                entity.schedule_update_ha_state()
+        if entities and (notif in [Notification.attribute_change, Notification.description_change, Notification.metadata_change]):
+            for ent in entities:
+                if ent.available:
+                    ent.schedule_update_ha_state()
             return
         # Not found, so it's a new entity 
-        if entity is None and dev.is_ready():
+        if entities is None and dev.is_ready():
             self.build_entities(dev)
 
     def monitor_notification(self, msg: Message):
@@ -137,10 +138,12 @@ class Bridge(object):
         # both monitor events & messages.
         if (not msg.is_notify()) or msg.is_alive() or msg.is_attributes_change():
             return
-        entity = self.get_entity(msg.source)
-        if entity and hasattr(entity, 'handle_notification'):
-            msg.dump()
-            entity.handle_notification(msg)
+        entities = self.get_entities(msg.source)
+        if entities :
+            for ent in entities:
+                if hasattr(ent, 'handle_notification'):
+                    msg.dump()
+                    ent.handle_notification(msg)
 
     #####################################################
     # Miscs

apps/homeassistant/xaal/core.py

@@ -90,10 +90,6 @@ class EntityFactory(object):
         self._async_add_entitites = async_add_entitites
         self._bridge.add_factory(self)
 
-    def add_entities(self, entities: Entity, address: bindings.UUID) -> None:
-        self._async_add_entitites(entities)
-        self._bridge.add_entity(address, entities[0])
-
     def build_entities(self, device: MonitorDevice) -> bool:
         """ return True if this factory managed to build some entities"""
         result = []
@@ -103,7 +99,8 @@ class EntityFactory(object):
                     entity = k(device, self._bridge)
                     result.append(entity)
                 # an factory can match only one dev_type
-                self.add_entities(result, device.address)
+                self._async_add_entitites(result)
+                self._bridge.add_entities(device.address, result)
                 return True
         return False