Move Adam-related under one if

Author: bouwew

plugwise/helper.py

@@ -323,20 +323,19 @@ def _appl_gateway_info(self, appl: Munch, appliance: etree) -> Munch:
         appl.vendor_name = "Plugwise"
 
         # Adam: collect the ZigBee MAC address of the Smile
-        if self.smile(ADAM) and (
-            (found := self._domain_objects.find(".//protocols/zig_bee_coordinator")) is not None
-        ):
-            appl.zigbee_mac = found.find("mac_address").text
-
-        # Adam: collect regulation_modes and check for cooling, indicating cooling-mode is present
-        self._appl_regulation_mode_info(appliance)
-
-        # Adam: collect the gateway_modes
-        self._gw_allowed_modes = []
-        locator = "./actuator_functionalities/gateway_mode_control_functionality[type='gateway_mode']/allowed_modes"
-        if appliance.find(locator) is not None:
-            # Limit the possible gateway-modes
-            self._gw_allowed_modes = ["away", "full", "vacation"]
+        if self.smile(ADAM):
+            if (found := self._domain_objects.find(".//protocols/zig_bee_coordinator")) is not None:
+                appl.zigbee_mac = found.find("mac_address").text
+
+            # Also, collect regulation_modes and check for cooling, indicating cooling-mode is present
+            self._appl_regulation_mode_info(appliance)
+
+            # Finally, collect the gateway_modes
+            self._gw_allowed_modes = []
+            locator = "./actuator_functionalities/gateway_mode_control_functionality[type='gateway_mode']/allowed_modes"
+            if appliance.find(locator) is not None:
+                # Limit the possible gateway-modes
+                self._gw_allowed_modes = ["away", "full", "vacation"]
 
         return appl