Break-out _get_plugwise_notifications(), replace _update_domain_objects()

Author: bouwew

plugwise/__init__.py

@@ -537,14 +537,18 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
             if result.find(locator_2) is not None:
                 self._elga = True
 
-    async def _update_domain_objects(self) -> None:
-        """Helper-function for smile.py: full_update_device() and async_update().
-
-        Request domain_objects data.
-        """
+    async def _full_update_device(self) -> None:
+        """Perform a first fetch of all XML data, needed for initialization."""
         self._domain_objects = await self._request(DOMAIN_OBJECTS)
+        self._get_plugwise_notifications()
+        self._locations = await self._request(LOCATIONS)
+        self._modules = await self._request(MODULES)
+        # P1 legacy has no appliances
+        if not (self.smile_type == "power" and self._smile_legacy):
+            self._appliances = await self._request(APPLIANCES)
 
-        # If Plugwise notifications present:
+    def _get_plugwise_notifications(self) -> None:
+        """Collect the Plugwise notifications."""
         self._notifications = {}
         for notification in self._domain_objects.findall("./notification"):
             try:
@@ -559,15 +563,6 @@ async def _update_domain_objects(self) -> None:
                     f"{self._endpoint}{DOMAIN_OBJECTS}",
                 )
 
-    async def _full_update_device(self) -> None:
-        """Perform a first fetch of all XML data, needed for initialization."""
-        await self._update_domain_objects()
-        self._locations = await self._request(LOCATIONS)
-        self._modules = await self._request(MODULES)
-        # P1 legacy has no appliances
-        if not (self.smile_type == "power" and self._smile_legacy):
-            self._appliances = await self._request(APPLIANCES)
-
     async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
         # Perform a full update at day-change
@@ -585,7 +580,8 @@ async def async_update(self) -> PlugwiseData:
             self.get_all_devices()
         # Otherwise perform an incremental update
         else:
-            await self._update_domain_objects()
+            self._domain_objects = await self._request(DOMAIN_OBJECTS)
+            self._get_plugwise_notifications()
             match self._target_smile:
                 case "smile_v2":
                     self._modules = await self._request(MODULES)