valetudo-map-parser 0.1.9b24__py3-none-any.whl → 0.1.9b25__py3-none-any.whl

valetudo_map_parser/config/auto_crop.py

@@ -8,7 +8,7 @@ import logging
 import numpy as np
 from numpy import rot90
 
-from .types import Color, NumpyArray, TrimCropData
+from .types import Color, NumpyArray, TrimCropData, TrimsData
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -68,10 +68,10 @@ class AutoCrop:
             )
         return trimmed_width, trimmed_height
 
-    async def _async_auto_crop_data(self, tdata=None):  # , tdata=None
+    async def _async_auto_crop_data(self, tdata: TrimsData = None):  # , tdata=None
         """Load the auto crop data from the Camera config."""
         if not self.imh.auto_crop:
-            trims_data = TrimCropData.from_dict(dict(tdata)).to_list()
+            trims_data = TrimCropData.from_dict(dict(tdata.to_dict())).to_list()
             (
                 self.imh.trim_left,
                 self.imh.trim_up,

valetudo_map_parser/config/shared.py

@@ -104,22 +104,9 @@ class CameraShared:
         self.map_old_path = None  # Old path data
         self.user_language = None  # User language
         self.trim_crop_data = None
-        self.trims: Dict[TrimsData, int] = {
-            TrimsData.TRIM_LEFT: 0,
-            TrimsData.TRIM_UP: 0,
-            TrimsData.TRIM_RIGHT: 0,
-            TrimsData.TRIM_DOWN: 0,
-        }
+        self.trims = TrimsData  # Trims data
         self.skip_room_ids: List[str] = []
 
-    def get_trims_dictionary(self):
-        return {
-            "trim_left": self.trims.get(TrimsData.TRIM_LEFT, 0),
-            "trim_up": self.trims.get(TrimsData.TRIM_UP, 0),
-            "trim_right": self.trims.get(TrimsData.TRIM_RIGHT, 0),
-            "trim_down": self.trims.get(TrimsData.TRIM_DOWN, 0),
-        }
-
     def update_user_colors(self, user_colors):
         """Update the user colors."""
         self.user_colors = user_colors
@@ -240,20 +227,9 @@ class CameraSharedManager:
             instance.enable_snapshots = device_info.get(
                 CONF_SNAPSHOTS_ENABLE, DEFAULT_VALUES["enable_www_snapshots"]
             )
-            instance.trims = {
-                TrimsData.TRIM_LEFT: device_info.get(
-                    "trims_data", DEFAULT_VALUES["trims_data"]
-                ).get("trim_left", 0),
-                TrimsData.TRIM_UP: device_info.get(
-                    "trims_data", DEFAULT_VALUES["trims_data"]
-                ).get("trim_up", 0),
-                TrimsData.TRIM_RIGHT: device_info.get(
-                    "trims_data", DEFAULT_VALUES["trims_data"]
-                ).get("trim_right", 0),
-                TrimsData.TRIM_DOWN: device_info.get(
-                    "trims_data", DEFAULT_VALUES["trims_data"]
-                ).get("trim_down", 0),
-            }
+            instance.trims.from_dict(
+                device_info.get("trims_data", DEFAULT_VALUES["trims_data"])
+            )
 
         except TypeError as ex:
             _LOGGER.error("Shared data can't be initialized due to a TypeError! %s", ex)

valetudo_map_parser/config/types.py

@@ -6,7 +6,7 @@ Version 0.0.1
 import asyncio
 import json
 import logging
-from dataclasses import dataclass
+from dataclasses import dataclass, asdict
 from enum import Enum
 from typing import Any, Dict, Tuple, Union
 
@@ -593,10 +593,30 @@ class CameraModes:
     CAMERA_ON = True
 
 
-class TrimsData(Enum):
-    """Constants for the trims data."""
+@dataclass
+class TrimsData:
+    """Dataclass to store and manage trims data."""
+
+    trim_left: int = 0
+    trim_up: int = 0
+    trim_right: int = 0
+    trim_down: int = 0
 
-    TRIM_LEFT = "trim_left"
-    TRIM_UP = "trim_up"
-    TRIM_RIGHT = "trim_right"
-    TRIM_DOWN = "trim_down"
+    @classmethod
+    def from_json(cls, json_data: str):
+        """Create a TrimsConfig instance from a JSON string."""
+        data = json.loads(json_data)
+        return cls(
+            trim_left=data.get("trim_left", 0),
+            trim_up=data.get("trim_up", 0),
+            trim_right=data.get("trim_right", 0),
+            trim_down=data.get("trim_down", 0),
+        )
+
+    def to_json(self) -> str:
+        """Convert TrimsConfig instance to a JSON string."""
+        return json.dumps(asdict(self))
+
+    def to_dict(self) -> dict:
+        """Convert TrimsConfig instance to a dictionary."""
+        return asdict(self)

{valetudo_map_parser-0.1.9b24.dist-info → valetudo_map_parser-0.1.9b25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b24
+Version: 0.1.9b25
 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.9b24.dist-info → valetudo_map_parser-0.1.9b25.dist-info}/RECORD

@@ -1,11 +1,11 @@
 valetudo_map_parser/__init__.py,sha256=Wmd20bdI1btzMq-0x8NxGYWskTjdUmD-Fem9MTfziwU,810
 valetudo_map_parser/config/__init__.py,sha256=DQ9plV3ZF_K25Dp5ZQHPDoG-40dQoJNdNi-dfNeR3Zc,48
-valetudo_map_parser/config/auto_crop.py,sha256=Vn3lbg_v8gbbe1F1tKOueaHF_qsIXCiiBORWIZmOG2k,10308
+valetudo_map_parser/config/auto_crop.py,sha256=6YjxxTKwO-O3DKOBriNHo_HfmRIBkRJnVhGEUs7TakQ,10342
 valetudo_map_parser/config/colors.py,sha256=IzTT9JvF12YGGJxaTiEJRuwUdCCsFCLzsR9seCDfYWs,6515
 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=MrQ1dTcOK40reAWQE86OvN_FE8-sUJ9sOeHqNazAFMs,10723
-valetudo_map_parser/config/types.py,sha256=-tjuZ3skkf40G_BhzmB8pxFer1Sgb_c-JO6aLGSZoMU,16407
+valetudo_map_parser/config/shared.py,sha256=Wfqisi13y4Xy8IY2yivAW8efEJ06w_nCvlSmfcoSUl0,9709
+valetudo_map_parser/config/types.py,sha256=LVHrdDIUq-829RjITyccobcua1vKMnVCS_2KwKtzTxk,17044
 valetudo_map_parser/config/utils.py,sha256=8TBqH5jKr7wMM5dtWqnk5pPwZa_D0ApOpmdZUaqiRl8,18679
 valetudo_map_parser/hypfer_draw.py,sha256=1trtil-CQcDSiAMBWPBmuP5L9MWHGTp5OlY7MX8FgDg,14932
 valetudo_map_parser/hypfer_handler.py,sha256=yxjDq4dIjJQVuK3Gv93QW9LQrRuKBG4TXIKSqiwZaCI,13790
@@ -13,8 +13,8 @@ valetudo_map_parser/map_data.py,sha256=6FbQfgxFB6E4kcOWokReJOVSekVaE1kStyhTQhAhi
 valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valetudo_map_parser/rand25_handler.py,sha256=wn0CbjXwznqKpnR400HbImQtfLWRXTRRtfRqaQqFzU4,15693
 valetudo_map_parser/reimg_draw.py,sha256=V0JUASavKVnEtAhv7nOV4pjsRxZrNsjIUtctbKO8wvk,12507
-valetudo_map_parser-0.1.9b24.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b24.dist-info/METADATA,sha256=SMSX6FilINyKlUWEsJlsygZTBfXfKCQ-xbZlnIKyCEk,1029
-valetudo_map_parser-0.1.9b24.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b24.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-valetudo_map_parser-0.1.9b24.dist-info/RECORD,,
+valetudo_map_parser-0.1.9b25.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b25.dist-info/METADATA,sha256=OzQEDbQoIxtup4ufDxHOrjtqHpOuRqbjuxT5nJTI_cw,1029
+valetudo_map_parser-0.1.9b25.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b25.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+valetudo_map_parser-0.1.9b25.dist-info/RECORD,,