Debug info

azerty9971 · Jan 27, 2025 · ab0f769 · ab0f769
1 parent 8b75b0d
commit ab0f769
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/custom_components/xtend_tuya/multi_manager/shared/merging_manager.py b/custom_components/xtend_tuya/multi_manager/shared/merging_manager.py
@@ -15,11 +15,16 @@
 from ...const import (
     LOGGER,  # noqa: F401
 )
+from ..multi_manager import (
+    MultiManager,
+)
 
 class XTMergingManager:
-    def merge_devices(device1: XTDevice, device2: XTDevice):
+    def merge_devices(device1: XTDevice, device2: XTDevice, multi_manager: MultiManager = None):
         msg_queue: list[str] = []
 
+        if multi_manager:
+            multi_manager.device_watcher.report_message(device1.id, f"About to merge {device1.source}:{device1}\r\n\r\nand\r\n\r\n{device2.source}:{device2}", device1)
         device1_bak = copy.deepcopy(device1)
         device2_bak = copy.deepcopy(device2)
         #Make both devices compliant
@@ -50,6 +55,8 @@ def merge_devices(device1: XTDevice, device2: XTDevice):
         device2.function = device1.function
         device2.status = device1.status
         device2.local_strategy = device1.local_strategy
+        if multi_manager:
+            multi_manager.device_watcher.report_message(device1.id, f"Merged into {device1}", device1)
 
     def _align_device_properties(device1: XTDevice, device2: XTDevice, msg_queue: list[str] | None = None):
         device1.name            = XTMergingManager.smart_merge(device1.name, device2.name, msg_queue, "device.name")

diff --git a/custom_components/xtend_tuya/multi_manager/tuya_iot/xt_tuya_iot_manager.py b/custom_components/xtend_tuya/multi_manager/tuya_iot/xt_tuya_iot_manager.py
@@ -132,10 +132,10 @@ def update_device_function_cache(self, devIds: list = []):
         for device_id in self.device_map:
             device = self.device_map[device_id]
             device_open_api = self.get_open_api_device(device)
-            self.multi_manager.device_watcher.report_message(device_id, f"About to merge {device}\r\n\r\nand\r\n\r\n{device_open_api}", device)
+            #self.multi_manager.device_watcher.report_message(device_id, f"About to merge {device}\r\n\r\nand\r\n\r\n{device_open_api}", device)
             XTMergingManager.merge_devices(device, device_open_api)
             self.multi_manager.virtual_state_handler.apply_init_virtual_states(device)
-            self.multi_manager.device_watcher.report_message(device_id, f"Merged into \n\r{device}", device)
+            #self.multi_manager.device_watcher.report_message(device_id, f"Merged into \n\r{device}", device)
 
     def on_message(self, msg: str):
         super().on_message(msg)
@@ -269,7 +269,7 @@ def get_open_api_device(self, device: XTDevice) -> XTDevice | None:
                                                                                     dp_id=dp_id)
                     if code not in device_properties.status:
                         device_properties.status[code] = dp_property.get("value",None)
-        self.multi_manager.device_watcher.report_message(device_properties.id, f"get_open_api_device: {device}", device_properties)
+        #self.multi_manager.device_watcher.report_message(device_properties.id, f"get_open_api_device: {device}", device_properties)
         return device_properties
 
     def send_property_update(