valetudo-map-parser 0.1.10b5__tar.gz → 0.1.10b7__tar.gz

{valetudo_map_parser-0.1.10b5 → valetudo_map_parser-0.1.10b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.10b5
+Version: 0.1.10b7
 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.10b5 → valetudo_map_parser-0.1.10b7}/SCR/valetudo_map_parser/__init__.py

@@ -1,5 +1,7 @@
 """Valetudo map parser.
-Version: 0.1.9"""
+Version: 0.1.10"""
+
+from pathlib import Path
 
 from .config.colors import ColorsManagement
 from .config.drawable import Drawable
@@ -19,12 +21,23 @@ from .config.types import (
     NumpyArray,
     ImageSize,
 )
+from .config.status_text.status_text import StatusText
+from .config.status_text.translations import translations as STATUS_TEXT_TRANSLATIONS
 from .hypfer_handler import HypferMapImageHandler
 from .rand256_handler import ReImageHandler
 from .rooms_handler import RoomsHandler, RandRoomsHandler
 from .map_data import HyperMapData
 
 
+def get_default_font_path() -> str:
+    """Return the absolute path to the bundled default font directory.
+
+    This returns the path to the fonts folder; the caller can join a specific font file
+    to avoid hard-coding a particular font here.
+    """
+    return str((Path(__file__).resolve().parent / "config" / "fonts").resolve())
+
+
 __all__ = [
     "RoomsHandler",
     "RandRoomsHandler",
@@ -49,4 +62,7 @@ __all__ = [
     "PilPNG",
     "NumpyArray",
     "ImageSize",
+    "StatusText",
+    "STATUS_TEXT_TRANSLATIONS",
+    "get_default_font_path",
 ]

{valetudo_map_parser-0.1.10b5 → valetudo_map_parser-0.1.10b7}/SCR/valetudo_map_parser/config/drawable.py

@@ -11,6 +11,7 @@ Optimized with NumPy and SciPy for better performance.
 from __future__ import annotations
 
 import logging
+from pathlib import Path
 
 import numpy as np
 from PIL import Image, ImageDraw, ImageFont
@@ -874,11 +875,15 @@ class Drawable:
         position: bool,
     ) -> None:
         """Draw the status text on the image."""
-        path_default_font = (
-            "custom_components/mqtt_vacuum_camera/utils/fonts/FiraSans.ttf"
-        )
-        default_font = ImageFont.truetype(path_default_font, size)
-        user_font = ImageFont.truetype(path_font, size)
+        module_dir = Path(__file__).resolve().parent
+        default_font_path = module_dir / "fonts" / "FiraSans.ttf"
+        default_font = ImageFont.truetype(str(default_font_path), size)
+
+        user_font_path = Path(path_font)
+        if not user_font_path.is_absolute():
+            repo_root = module_dir.parents[2]
+            user_font_path = (repo_root / user_font_path).resolve()
+        user_font = ImageFont.truetype(str(user_font_path), size)
         if position:
             x, y = 10, 10
         else:

{valetudo_map_parser-0.1.10b5 → valetudo_map_parser-0.1.10b7}/SCR/valetudo_map_parser/config/shared.py

@@ -58,6 +58,7 @@ class CameraShared:
         self.frame_number: int = 0  # camera Frame number
         self.destinations: list = []  # MQTT rand destinations
         self.rand256_active_zone: list = []  # Active zone for rand256
+        self.rand256_zone_coordinates: list = []  # Active zone coordinates for rand256
         self.is_rand: bool = False  # MQTT rand data
         self._new_mqtt_message = False  # New MQTT message
         # Initialize last_image with default gray image (250x150 minimum)
@@ -82,7 +83,7 @@ class CameraShared:
         self.user_colors = Colors  # User base colors
         self.rooms_colors = Colors  # Rooms colors
         self.vacuum_battery = 0  # Vacuum battery state
-        self.vacuum_connection = None  # Vacuum connection state
+        self.vacuum_connection = False  # Vacuum connection state
         self.vacuum_state = None  # Vacuum state
         self.charger_position = None  # Vacuum Charger position
         self.show_vacuum_state = None  # Show vacuum state on the map

valetudo_map_parser-0.1.10b7/SCR/valetudo_map_parser/config/status_text/status_text.py

@@ -0,0 +1,95 @@
+"""
+Version: 0.1.10
+Status text of the vacuum cleaners.
+Class to handle the status text of the vacuum cleaners.
+"""
+
+from __future__ import annotations
+
+from ..types import LOGGER, PilPNG
+from .translations import translations
+
+LOGGER.propagate = True
+
+
+class StatusText:
+    """
+    Status text of the vacuum cleaners.
+    """
+
+    def __init__(self, camera_shared):
+        self._shared = camera_shared
+        self.file_name = self._shared.file_name
+
+    @staticmethod
+    async def get_vacuum_status_translation(
+        language: str = "en",
+    ) -> dict[str, str] | None:
+        """
+        Get the vacuum status translation.
+        @param language: Language code, default 'en'.
+        @return: Mapping for the given language or None.
+        """
+        return translations.get((language or "en").lower())
+
+    async def translate_vacuum_status(self) -> str:
+        """Return the translated status with EN fallback and safe default."""
+        status = self._shared.vacuum_state or "unknown"
+        language = (self._shared.user_language or "en").lower()
+        translation = await self.get_vacuum_status_translation(language)
+        if not translation:
+            translation = translations.get("en", {})
+        return translation.get(status, str(status).capitalize())
+
+    async def get_status_text(self, text_img: PilPNG) -> tuple[list[str], int]:
+        """
+        Compose the image status text.
+        :param text_img: Image to draw the text on.
+        :return status_text, text_size: List of the status text and the text size.
+        """
+        status_text = ["If you read me, something really went wrong.."]  # default text
+        text_size_coverage = 1.5  # resize factor for the text
+        text_size = self._shared.vacuum_status_size  # default text size
+        charge_level = "\u03de"  # unicode Koppa symbol
+        charging = "\u2211"  # unicode Charging symbol
+        vacuum_state = await self.translate_vacuum_status()
+        if self._shared.show_vacuum_state:
+            status_text = [f"{self.file_name}: {vacuum_state}"]
+            language = (self._shared.user_language or "en").lower()
+            lang_map = translations.get(language) or translations.get("en", {})
+            if not self._shared.vacuum_connection:
+                mqtt_disc = lang_map.get(
+                    "mqtt_disconnected",
+                    translations.get("en", {}).get(
+                        "mqtt_disconnected", "Disconnected from MQTT?"
+                    ),
+                )
+                status_text = [f"{self.file_name}: {mqtt_disc}"]
+            else:
+                if self._shared.current_room:
+                    in_room = self._shared.current_room.get("in_room")
+                    if in_room:
+                        status_text.append(f" ({in_room})")
+                if self._shared.vacuum_state == "docked":
+                    if self._shared.vacuum_bat_charged():
+                        status_text.append(" \u00b7 ")
+                        status_text.append(f"{charging}{charge_level} ")
+                        status_text.append(f"{self._shared.vacuum_battery}%")
+                    else:
+                        status_text.append(" \u00b7 ")
+                        status_text.append(f"{charge_level} ")
+                        ready_txt = lang_map.get(
+                            "ready",
+                            translations.get("en", {}).get("ready", "Ready."),
+                        )
+                        status_text.append(ready_txt)
+                else:
+                    status_text.append(" \u00b7 ")
+                    status_text.append(f"{charge_level}")
+                    status_text.append(f" {self._shared.vacuum_battery}%")
+                if text_size >= 50 and getattr(text_img, "width", None):
+                    text_pixels = max(1, sum(len(text) for text in status_text))
+                    text_size = int(
+                        (text_size_coverage * text_img.width) // text_pixels
+                    )
+        return status_text, text_size

valetudo_map_parser-0.1.10b7/SCR/valetudo_map_parser/config/status_text/translations.py

@@ -0,0 +1,280 @@
+"""Translations for vacuum status and status text snippets."""
+
+translations = {
+    "en": {
+        "connected": "Connected",
+        "disconnected": "Disconnected",
+        "charging": "Charging",
+        "cleaning": "Cleaning",
+        "docked": "Docked",
+        "idle": "Idle",
+        "paused": "Paused",
+        "returning": "Returning",
+        "ready": "Ready.",
+        "mqtt_disconnected": "Disconnected from MQTT?",
+    },
+    "de": {
+        "connected": "Verbunden",
+        "disconnected": "Nicht verbunden",
+        "charging": "Laden",
+        "cleaning": "Reinigen",
+        "docked": "Angefahren",
+        "idle": "Inaktiv",
+        "paused": "Pausiert",
+        "returning": "Zurückkehren",
+        "ready": "Bereit.",
+        "mqtt_disconnected": "Von MQTT getrennt?",
+    },
+    "fr": {
+        "connected": "Connecté",
+        "disconnected": "Déconnecté",
+        "charging": "En charge",
+        "cleaning": "Nettoyage",
+        "docked": "Ancré",
+        "idle": "Inactif",
+        "paused": "En pause",
+        "returning": "Retour",
+        "ready": "Prêt.",
+        "mqtt_disconnected": "Déconnecté de MQTT ?",
+    },
+    "it": {
+        "connected": "Connesso",
+        "disconnected": "Disconnesso",
+        "charging": "Caricamento",
+        "cleaning": "Pulizia",
+        "docked": "Ancorato",
+        "idle": "Inattivo",
+        "paused": "In pausa",
+        "returning": "Ritorno",
+        "ready": "Pronto.",
+        "mqtt_disconnected": "Disconnesso da MQTT?",
+    },
+    "pl": {
+        "connected": "Połączony",
+        "disconnected": "Rozłączony",
+        "charging": "Ładowanie",
+        "cleaning": "Czyszczenie",
+        "docked": "Zaparkowany",
+        "idle": "Nieaktywny",
+        "paused": "Wstrzymany",
+        "returning": "Powrót",
+        "ready": "Gotowy.",
+        "mqtt_disconnected": "Odłączono od MQTT?",
+    },
+    "pt": {
+        "connected": "Conectado",
+        "disconnected": "Desconectado",
+        "charging": "Carregando",
+        "cleaning": "Limpando",
+        "docked": "Anclado",
+        "idle": "Inativo",
+        "paused": "Pausado",
+        "returning": "Retornando",
+        "ready": "Pronto.",
+        "mqtt_disconnected": "Desconectado do MQTT?",
+    },
+    "ru": {
+        "connected": "Подключен",
+        "disconnected": "Отключен",
+        "charging": "Заряжается",
+        "cleaning": "Очищается",
+        "docked": "Закреплен",
+        "idle": "Неактивен",
+        "paused": "Приостановлен",
+        "returning": "Возвращается",
+        "ready": "Готово.",
+        "mqtt_disconnected": "Отключено от MQTT?",
+    },
+    "tr": {
+        "connected": "Bağlandı",
+        "disconnected": "Bağlantı kesildi",
+        "charging": "Şarj ediliyor",
+        "cleaning": "Temizleniyor",
+        "docked": "Dokundu",
+        "idle": "Boşta",
+        "paused": "Duraklatıldı",
+        "returning": "Geri dönüyor",
+        "ready": "Hazır.",
+        "mqtt_disconnected": "MQTT bağlantısı kesildi mi?",
+    },
+    "zh": {
+        "connected": "已连接",
+        "disconnected": "未连接",
+        "charging": "充电中",
+        "cleaning": "清扫中",
+        "docked": "已停靠",
+        "idle": "空闲",
+        "paused": "已暂停",
+        "returning": "返回中",
+        "ready": "已就绪。",
+        "mqtt_disconnected": "MQTT 已断开？",
+    },
+    "ja": {
+        "connected": "接続済み",
+        "disconnected": "切断されました",
+        "charging": "充電中",
+        "cleaning": "掃除中",
+        "docked": "停泊中",
+        "idle": "アイドル",
+        "paused": "一時停止中",
+        "returning": "戻り中",
+        "ready": "準備完了。",
+        "mqtt_disconnected": "MQTT から切断されていますか？",
+    },
+    "ko": {
+        "connected": "연결됨",
+        "disconnected": "연결 해제됨",
+        "charging": "충전 중",
+        "cleaning": "청소 중",
+        "docked": "도킹됨",
+        "idle": "대기 중",
+        "paused": "일시 중지됨",
+        "returning": "돌아오는 중",
+        "ready": "준비 완료.",
+        "mqtt_disconnected": "MQTT에서 연결이 끊겼나요?",
+    },
+    "ar": {
+        "connected": "متصل",
+        "disconnected": "غير متصل",
+        "charging": "جار الت충ّد",
+        "cleaning": "washering",
+        "docked": "anchored",
+        "idle": "iddle",
+        "paused": "paused",
+        "returning": "returning",
+        "ready": "جاهز.",
+        "mqtt_disconnected": "هل تم قطع الاتصال بـ MQTT؟",
+    },
+    "hi": {
+        "connected": "संयुक्त",
+        "disconnected": "असंयुक्त",
+        "charging": "चार्जिंग",
+        "cleaning": "साफ़ कर रहा है",
+        "docked": "डॉक में",
+        "idle": "रूक गया है",
+        "paused": "रूक गया है",
+        "returning": "वापस आ रहा है",
+        "ready": "तैयार.",
+        "mqtt_disconnected": "MQTT से डिसकनेक्ट?",
+    },
+    "bn": {
+        "connected": "যোগাযোগ করা হয়েছে",
+        "disconnected": "বিরাজিত",
+        "charging": "চার্জিং",
+        "cleaning": "সাফ করা হচ্ছে",
+        "docked": "ডকেড",
+        "idle": "বিনা কর্মে",
+        "paused": "বিরত",
+        "returning": "পুনরায় আসছে",
+        "ready": "প্রস্তুত।",
+        "mqtt_disconnected": "MQTT থেকে সংযোগ বিচ্ছিন্ন?",
+    },
+    "sv": {
+        "connected": "Ansluten",
+        "disconnected": "Frånkopplad",
+        "charging": "Laddar",
+        "cleaning": "Rensar",
+        "docked": "Anknyttad",
+        "idle": "Väntande",
+        "paused": "Paus",
+        "returning": "Återvänder",
+        "ready": "Klar.",
+        "mqtt_disconnected": "Frånkopplad från MQTT?",
+    },
+    "fn": {
+        "connected": "Konektado",
+        "disconnected": "Hindi konektado",
+        "charging": "Kinakarga",
+        "cleaning": "Binabagay",
+        "docked": "Ankore",
+        "idle": "Idle",
+        "paused": "Napupaua",
+        "returning": "Nagbabalik",
+        "ready": "Handa.",
+        "mqtt_disconnected": "Na-disconnect sa MQTT?",
+    },
+    "no": {
+        "connected": "Tilkoblet",
+        "disconnected": "Frakoblet",
+        "charging": "Lader",
+        "cleaning": "Renser",
+        "docked": "Ankoblet",
+        "idle": "Inaktiv",
+        "paused": "Pause",
+        "returning": "Gir tilbake",
+        "ready": "Klar.",
+        "mqtt_disconnected": "Frakoblet fra MQTT?",
+    },
+    "cz": {
+        "connected": "Připojeno",
+        "disconnected": "Odpojeno",
+        "charging": "Nabíjení",
+        "cleaning": "Čištění",
+        "docked": "Zaparkováno",
+        "idle": "Nečinný",
+        "paused": "Pozastaveno",
+        "returning": "Vrací se",
+        "ready": "Připraven.",
+        "mqtt_disconnected": "Odpojeno od MQTT?",
+    },
+    "da": {
+        "connected": "Tilsluttet",
+        "disconnected": "Afvist",
+        "charging": "Oplader",
+        "cleaning": "Renser",
+        "docked": "Ankeret",
+        "idle": "Inaktiv",
+        "paused": "Pause",
+        "returning": "Returnerer",
+        "ready": "Klar.",
+        "mqtt_disconnected": "Afbrudt fra MQTT?",
+    },
+    "fi": {
+        "connected": "Yhdistetty",
+        "disconnected": "Yhteys katkaistu",
+        "charging": "Lataa",
+        "cleaning": "Siivous",
+        "docked": "Ankeroitu",
+        "idle": "Lähes",
+        "paused": "Tauko",
+        "returning": "Palauttaa",
+        "ready": "Valmis.",
+        "mqtt_disconnected": "Yhteys katkennut MQTT:stä?",
+    },
+    "el": {
+        "connected": "Συνδεδεμένος",
+        "disconnected": "Αποσυνδεδεμένος",
+        "charging": "Φορτώνει",
+        "cleaning": "Καθαρισμός",
+        "docked": "Ανκερώθηκε",
+        "idle": "Αδρανής",
+        "paused": "Παύση",
+        "returning": "Επιστρέφει",
+        "ready": "Έτοιμο.",
+        "mqtt_disconnected": "Αποσυνδεδεμένο από MQTT;",
+    },
+    "es": {
+        "connected": "Conectado",
+        "disconnected": "Desconectado",
+        "charging": "Cargando",
+        "cleaning": "Limpiando",
+        "docked": "Anclado",
+        "idle": "Inactivo",
+        "paused": "Pausado",
+        "returning": "Regresando",
+        "ready": "Listo.",
+        "mqtt_disconnected": "¿Desconectado de MQTT?",
+    },
+    "nl": {
+        "connected": "Verbonden",
+        "disconnected": "Niet verbonden",
+        "charging": "Laden",
+        "cleaning": "Schoonmaken",
+        "docked": "Aangeschoten",
+        "idle": "Inactief",
+        "paused": "Gepauzeerd",
+        "returning": "Terugkeren",
+        "ready": "Klaar.",
+        "mqtt_disconnected": "Verbinding met MQTT verbroken?",
+    },
+}

{valetudo_map_parser-0.1.10b5 → valetudo_map_parser-0.1.10b7}/SCR/valetudo_map_parser/config/types.py

@@ -283,7 +283,7 @@ DEFAULT_VALUES = {
     "auto_zoom": False,
     "zoom_lock_ratio": True,
     "show_vac_status": False,
-    "vac_status_font": "custom_components/mqtt_vacuum_camera/utils/fonts/FiraSans.ttf",
+    "vac_status_font": "SCR/valetudo_map_parser/config/fonts/FiraSans.ttf",
     "vac_status_size": 50,
     "vac_status_position": True,
     "get_svg_file": False,
@@ -443,31 +443,31 @@ RATIO_VALUES = [
 FONTS_AVAILABLE = [
     {
         "label": "Fira Sans",
-        "value": "config/utils/fonts/FiraSans.ttf",
+        "value": "config/fonts/FiraSans.ttf",
     },
     {
         "label": "Inter",
-        "value": "config/utils/fonts/Inter-VF.ttf",
+        "value": "config/fonts/Inter-VF.ttf",
     },
     {
         "label": "M Plus Regular",
-        "value": "config/utils/fonts/MPLUSRegular.ttf",
+        "value": "config/fonts/MPLUSRegular.ttf",
     },
     {
         "label": "Noto Sans CJKhk",
-        "value": "config/utils/fonts/NotoSansCJKhk-VF.ttf",
+        "value": "config/fonts/NotoSansCJKhk-VF.ttf",
     },
     {
         "label": "Noto Kufi Arabic",
-        "value": "config/utils/fonts/NotoKufiArabic-VF.ttf",
+        "value": "config/fonts/NotoKufiArabic-VF.ttf",
     },
     {
         "label": "Noto Sans Khojki",
-        "value": "config/utils/fonts/NotoSansKhojki.ttf",
+        "value": "config/fonts/NotoSansKhojki.ttf",
     },
     {
         "label": "Lato Regular",
-        "value": "config/utils/fonts/Lato-Regular.ttf",
+        "value": "config/fonts/Lato-Regular.ttf",
     },
 ]
 

{valetudo_map_parser-0.1.10b5 → valetudo_map_parser-0.1.10b7}/SCR/valetudo_map_parser/config/utils.py

@@ -14,6 +14,7 @@ from PIL import Image, ImageOps
 from .drawable import Drawable
 from .drawable_elements import DrawingConfig
 from .enhanced_drawable import EnhancedDrawable
+from .status_text.status_text import StatusText
 from .types import (
     LOGGER,
     ChargerPosition,
@@ -25,6 +26,7 @@ from .types import (
 )
 from ..map_data import HyperMapData
 
+
 @dataclass
 class ResizeParams:
     """Resize the image to the given dimensions and aspect ratio."""
@@ -86,8 +88,6 @@ class BaseHandler:
         m_json: dict | None,
         destinations: list | None = None,
         bytes_format: bool = False,
-        text_enabled: bool = False,
-        vacuum_status: str | None = None,
     ) -> PilPNG | None:
         """
         Unified async function to get PIL image from JSON data for both Hypfer and Rand256 handlers.
@@ -139,7 +139,17 @@ class BaseHandler:
             # Store the new image in shared data
             if new_image is not None:
                 self.shared.new_image = new_image
-
+                if self.shared.show_vacuum_state:
+                    text_editor = StatusText(self.shared)
+                    img_text = await text_editor.get_status_text(new_image)
+                    Drawable.status_text(
+                        new_image,
+                        img_text[1],
+                        self.shared.user_colors[8],
+                        img_text[0],
+                        self.shared.vacuum_status_font,
+                        self.shared.vacuum_status_position,
+                    )
                 # Convert to binary (PNG bytes) if requested
                 if bytes_format:
                     with io.BytesIO() as buf:

{valetudo_map_parser-0.1.10b5 → valetudo_map_parser-0.1.10b7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "valetudo-map-parser"
-version = "0.1.10b5"
+version = "0.1.10b7"
 description = "A Python library to parse Valetudo map data returning a PIL Image object."
 authors = ["Sandro Cantarella <gsca075@gmail.com>"]
 license = "Apache-2.0"