_all_appliances(), _all_locations() -> _get_appliances(), _get_locations()

Author: bouwew

plugwise/helper.py

@@ -95,14 +95,14 @@ def item_count(self) -> int:
         """Return the item-count."""
         return self._count
 
-    def _all_appliances(self) -> bool:
+    def _get_appliances(self) -> bool:
         """Collect all appliances with relevant info.
 
         Also, collect the P1 smartmeter info from a location
         as this one is not available as an appliance.
         """
         self._count = 0
-        self._all_locations()
+        self._get_locations()
 
         for appliance in self._domain_objects.findall("./appliance"):
             appl = Munch()
@@ -219,7 +219,7 @@ def _add_p1_smartmeter_info(self) -> None:
 
         self._create_gw_entities(appl)
 
-    def _all_locations(self) -> None:
+    def _get_locations(self) -> None:
         """Collect all locations."""
         loc = Munch()
         locations = self._domain_objects.findall("./location")

plugwise/legacy/helper.py

@@ -83,10 +83,10 @@ def item_count(self) -> int:
         """Return the item-count."""
         return self._count
 
-    def _all_appliances(self) -> None:
+    def _get_appliances(self) -> None:
         """Collect all appliances with relevant info."""
         self._count = 0
-        self._all_locations()
+        self._get_locations()
 
         self._create_legacy_gateway()
         # For legacy P1 collect the connected SmartMeter info
@@ -137,7 +137,7 @@ def _all_appliances(self) -> None:
             self._create_gw_entities(appl)
             self._reorder_devices()
 
-    def _all_locations(self) -> None:
+    def _get_locations(self) -> None:
         """Collect all locations."""
         loc = Munch()
 

plugwise/legacy/smile.py

@@ -81,7 +81,7 @@ def get_all_gateway_entities(self) -> None:
         Collect and add switching- and/or pump-group entities.
         Finally, collect the data and states for each entity.
         """
-        self._all_appliances()
+        self._get_appliances()
         if group_data := self._get_groups():
             self.gw_entities.update(group_data)
 

plugwise/smile.py

@@ -111,7 +111,7 @@ def get_all_gateway_entities(self) -> None:
         Collect and add switching- and/or pump-group entities.
         Finally, collect the data and states for each entity.
         """
-        if self._all_appliances():
+        if self._get_appliances():
             if self._is_thermostat:
                 self.therms_with_offset_func = (
                     self._get_appliances_with_offset_functionality()