valetudo-map-parser 0.1.9b33__py3-none-any.whl → 0.1.9b34__py3-none-any.whl

valetudo_map_parser/config/types.py

@@ -7,7 +7,7 @@ import asyncio
 import json
 import logging
 from dataclasses import asdict, dataclass
-from typing import Any, Dict, Tuple, Union
+from typing import Any, Dict, Tuple, Union, Optional
 
 import numpy as np
 from PIL import Image
@@ -74,44 +74,43 @@ class TrimCropData:
         )
 
 
-# pylint: disable=no-member
 class RoomStore:
-    """Store the room data for the vacuum."""
+    """Singleton RoomStore to store room data per vacuum."""
 
-    _instance = None
-    _lock = asyncio.Lock()
+    _instances: Dict[str, "RoomStore"] = {}  # Stores instances by vacuum ID
+    _lock = asyncio.Lock()  # Ensures thread-safe access
 
-    def __init__(self):
-        self.vacuums_data = {}
+    def __new__(cls, vacuum_id: str, rooms_data: Optional[dict] = None) -> "RoomStore":
+        """Create a new instance or return an existing one."""
+        if vacuum_id not in cls._instances:
+            instance = super().__new__(cls)
+            instance.vacuum_id = vacuum_id
+            instance.vacuums_data = rooms_data or {}  # Store room data
+            cls._instances[vacuum_id] = instance  # Store the instance
+        return cls._instances[vacuum_id]
 
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super(RoomStore, cls).__new__(cls)
-            cls._instance.vacuums_data = {}
-        return cls._instance
+    def __init__(self, vacuum_id: str, rooms_data: Optional[dict] = None):
+        """Initialize the instance."""
+        self.vacuum_id = vacuum_id
+        self.vacuums_data = rooms_data or {}
 
-    async def async_set_rooms_data(self, vacuum_id: str, rooms_data: dict) -> None:
-        """Set the room data for the vacuum."""
-        print("Setting room data")
-        async with self._lock:
-            self.vacuums_data[vacuum_id] = rooms_data
+    def get_rooms(self) -> dict:
+        """Return the stored rooms data."""
+        return self.vacuums_data
+
+    def set_rooms(self, rooms_data: dict) -> None:
+        """Update the rooms data."""
+        self.vacuums_data = rooms_data
+
+    def get_rooms_count(self) -> int:
+        """Return the number of rooms stored for this vacuum."""
+        return len(self.vacuums_data)
+
+    @classmethod
+    def get_all_instances(cls) -> Dict[str, "RoomStore"]:
+        """Return all active instances (for debugging)."""
+        return cls._instances
 
-    async def async_get_rooms_data(self, vacuum_id: str) -> dict:
-        """Get the room data for a vacuum."""
-        async with self._lock:
-            data = self.vacuums_data.get(vacuum_id, {})
-            if isinstance(data, str):
-                json_data = json.loads(data)
-                return json_data
-            return data
-
-    async def async_get_rooms_count(self, vacuum_id: str) -> int:
-        """Count the number of rooms for a vacuum."""
-        async with self._lock:
-            count = len(self.vacuums_data.get(vacuum_id, {}))
-            if count == 0:
-                return DEFAULT_ROOMS
-            return count
 
 
 # pylint: disable=no-member

valetudo_map_parser/hypfer_handler.py

@@ -83,9 +83,8 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                         "y": ((y_min + y_max) // 2),
                     }
         if room_properties:
-            rooms = RoomStore()
-            await rooms.async_set_rooms_data(self.file_name, room_properties)
-            _LOGGER.debug("%s: Rooms data extracted!", self.file_name)
+            rooms = RoomStore(self.file_name, room_properties)
+            _LOGGER.debug("%s: Rooms data extracted! %s", self.file_name, rooms.get_rooms())
         else:
             _LOGGER.debug("%s: Rooms data not available!", self.file_name)
             self.rooms_pos = None

valetudo_map_parser/rand25_handler.py

@@ -121,8 +121,8 @@ class ReImageHandler(BaseHandler, AutoCrop):
                     _LOGGER.debug(
                         "%s: Rooms and Zones data not available!", self.file_name
                     )
-                rooms = RoomStore()
-                await rooms.async_set_rooms_data(self.file_name, room_properties)
+                rooms = RoomStore(self.file_name, room_properties)
+                _LOGGER.debug("Rooms Data: %s", rooms.get_rooms())
                 return room_properties, zone_properties, point_properties
         except RuntimeError as e:
             _LOGGER.debug(

{valetudo_map_parser-0.1.9b33.dist-info → valetudo_map_parser-0.1.9b34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b33
+Version: 0.1.9b34
 Summary: A Python library to parse Valetudo map data returning a PIL Image object.
 License: Apache-2.0
 Author: Sandro Cantarella

{valetudo_map_parser-0.1.9b33.dist-info → valetudo_map_parser-0.1.9b34.dist-info}/RECORD

@@ -6,16 +6,16 @@ valetudo_map_parser/config/colors_man.py,sha256=9b5c6XmpMzhEiunwfIjVkOk1lDyV-UFo
 valetudo_map_parser/config/drawable.py,sha256=hsrEJCMVOrjs5sJfr26SeqJD0VNlYWwxcVkkHeaxx7U,20356
 valetudo_map_parser/config/rand25_parser.py,sha256=kIayyqVZBfQfAMkiArzqrrj9vqZB3pkgT0Y5ufrQmGA,16448
 valetudo_map_parser/config/shared.py,sha256=LunTeR-qAip0VzGNMtBw665rR6-MrH3rC7U8OExY3bA,10119
-valetudo_map_parser/config/types.py,sha256=Zwg9W4F99M6HjeX8mlC1VSiAOTCAgKdINi3pQZkJlD8,17378
+valetudo_map_parser/config/types.py,sha256=ZUXza0nWICBUS7xbSw7jz6McrbNGRvU1GdcJjOxD0yM,17525
 valetudo_map_parser/config/utils.py,sha256=yPutV-FEQlDB2z3LhOOFznoprHCApF-zrQMiOtkcO-k,19198
 valetudo_map_parser/hypfer_draw.py,sha256=1trtil-CQcDSiAMBWPBmuP5L9MWHGTp5OlY7MX8FgDg,14932
-valetudo_map_parser/hypfer_handler.py,sha256=6bXEUfx1zSzQzWws_p35OrIgg6cQ0EfqhTbrjLWgcHU,12996
+valetudo_map_parser/hypfer_handler.py,sha256=WIWoHUtBoML9E5dHGwMiCwf0RUrV9EvBz9qapCfs0Cs,12971
 valetudo_map_parser/map_data.py,sha256=6FbQfgxFB6E4kcOWokReJOVSekVaE1kStyhTQhAhiOg,19469
 valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valetudo_map_parser/rand25_handler.py,sha256=UbMAkY1y9FMa11Z9vXF_zaI1EF9EQNGOpQ1jXjvgBq0,15240
+valetudo_map_parser/rand25_handler.py,sha256=_etitjAnt2EBjopRgFYynJwWFwNF6M6-SlVhfCwWaN4,15256
 valetudo_map_parser/reimg_draw.py,sha256=V0JUASavKVnEtAhv7nOV4pjsRxZrNsjIUtctbKO8wvk,12507
-valetudo_map_parser-0.1.9b33.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b33.dist-info/METADATA,sha256=YXuqWt46jT1RDsUL6N4ZV6K7TxxiySfTg_gSREGKYrU,1029
-valetudo_map_parser-0.1.9b33.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b33.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-valetudo_map_parser-0.1.9b33.dist-info/RECORD,,
+valetudo_map_parser-0.1.9b34.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b34.dist-info/METADATA,sha256=pgeNzSLgXBYp6K2IWxLwLrxd3BrZRYhpzDo70i4Iaes,1029
+valetudo_map_parser-0.1.9b34.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b34.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+valetudo_map_parser-0.1.9b34.dist-info/RECORD,,