Read-from-node_type-cache: add support for reading all used values

Author: bouwew

plugwise_usb/network/cache.py

@@ -30,7 +30,9 @@ async def save_cache(self) -> None:
         for mac, node_type in self._nodetypes.items():
             cache_data_to_save[mac] = node_type.name
         _LOGGER.debug("Save NodeTypes %s", str(len(cache_data_to_save)))
-        await self.write_cache(cache_data_to_save, True)  # rewrite set to True is required
+        await self.write_cache(
+            cache_data_to_save, True
+        )  # rewrite set to True is required
 
     async def clear_cache(self) -> None:
         """Clear current cache."""
@@ -43,11 +45,18 @@ async def restore_cache(self) -> None:
         self._nodetypes = {}
         for mac, node_value in data.items():
             node_type: NodeType | None = None
-            if len(node_value) >= 10:
+            try:
+                node_type = NodeType(int(node_value))  # e.g. "2"
+            except ValueError:
+                tmp_node_value = node_value
+                if len(node_value) >= 12:  # e.g. "NodeType.CIRCLE"
+                    tmp_node_value = node_value[9:]
                 try:
-                    node_type = NodeType[node_value[9:]]
+                    # node_value is e.g. "CIRCLE"
+                    node_type = NodeType.__members__.get(tmp_node_value)
                 except KeyError:
                     node_type = None
+
             if node_type is None:
                 _LOGGER.warning("Invalid NodeType in cache: %s", node_value)
                 continue