meteocat 2.2.6 → 2.3.0

package/custom_components/meteocat/helpers.py

@@ -2,11 +2,23 @@ from __future__ import annotations
 
 import logging
 from datetime import datetime
+from pathlib import Path
+from homeassistant.core import HomeAssistant
 from homeassistant.util.dt import as_local, as_utc, start_of_local_day
 from homeassistant.helpers.sun import get_astral_event_date
 
 _LOGGER = logging.getLogger(__name__)
 
+# Ruta base para guardar archivos persistentes que se descargan de la API y que son utilizados por los coordinadores
+def get_storage_dir(hass: HomeAssistant, subdir: str | None = None) -> Path:
+    """Devuelve una ruta persistente en config/meteocat_files[/subdir]."""
+    base_dir = Path(hass.config.path("meteocat_files"))
+    if subdir:
+        base_dir = base_dir / subdir
+    base_dir.mkdir(parents=True, exist_ok=True)
+    return base_dir
+
+# Cálculo de amanecer y atardecer para definir cuando es de noche
 def get_sun_times(hass, current_time=None):
     """Obtén las horas de amanecer y atardecer para el día actual."""
     if current_time is None:

package/custom_components/meteocat/manifest.json

@@ -1,13 +1,24 @@
 {
-    "domain": "meteocat",
-    "name": "Meteocat",
-    "codeowners": ["@figorr"],
-    "config_flow": true,
-    "dependencies": ["persistent_notification", "http"],
-    "documentation": "https://github.com/figorr/meteocat",
-    "iot_class": "cloud_polling",
-    "issue_tracker": "https://github.com/figorr/meteocat/issues",
-    "loggers": ["meteocatpy"],
-    "requirements": ["meteocatpy==1.0.1", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "2.2.6"
+  "domain": "meteocat",
+  "name": "Meteocat",
+  "codeowners": [
+    "@figorr"
+  ],
+  "config_flow": true,
+  "dependencies": [
+    "persistent_notification",
+    "http"
+  ],
+  "documentation": "https://github.com/figorr/meteocat",
+  "iot_class": "cloud_polling",
+  "issue_tracker": "https://github.com/figorr/meteocat/issues",
+  "loggers": [
+    "meteocatpy"
+  ],
+  "requirements": [
+    "meteocatpy==1.0.1",
+    "packaging>=20.3",
+    "wrapt>=1.14.0"
+  ],
+  "version": ""
 }

package/custom_components/meteocat/options_flow.py

@@ -43,6 +43,8 @@ class MeteocatOptionsFlowHandler(OptionsFlow):
                 return await self.async_step_update_api_and_limits()
             elif user_input["option"] == "update_limits_only":
                 return await self.async_step_update_limits_only()
+            elif user_input["option"] == "regenerate_assets":
+                return await self.async_step_confirm_regenerate_assets()
         
         return self.async_show_form(
             step_id="init",
@@ -51,7 +53,8 @@ class MeteocatOptionsFlowHandler(OptionsFlow):
                     SelectSelectorConfig(
                         options=[
                             "update_api_and_limits",
-                            "update_limits_only"
+                            "update_limits_only",
+                            "regenerate_assets"
                         ],
                         translation_key="option"
                     )
@@ -173,4 +176,45 @@ class MeteocatOptionsFlowHandler(OptionsFlow):
         })
         return self.async_show_form(
             step_id="update_limits_only", data_schema=schema, errors=errors
-        )
+        )
+    
+    async def async_step_confirm_regenerate_assets(self, user_input: dict | None = None):
+        """Confirma si el usuario realmente quiere regenerar los assets."""
+        if user_input is not None:
+            if user_input.get("confirm") is True:
+                return await self.async_step_regenerate_assets()
+            else:
+                # Volver al menú inicial si el usuario cancela
+                return await self.async_step_init()
+
+        schema = vol.Schema({
+            vol.Required("confirm", default=False): bool
+        })
+        return self.async_show_form(
+            step_id="confirm_regenerate_assets",
+            data_schema=schema,
+            description_placeholders={
+                "warning": "Esto regenerará los archivos faltantes de towns.json, stations.json, variables.json, symbols.json y stations_<town_id>.json. ¿Desea continuar?"
+            }
+        )
+
+    async def async_step_regenerate_assets(self, user_input: dict | None = None):
+        """Regenera los archivos de assets."""
+        from . import ensure_assets_exist  # importamos la función desde __init__.py
+
+        errors = {}
+        try:
+            # Llamar a la función que garantiza que los assets existan
+            await ensure_assets_exist(self.hass, self._config_entry.data)
+
+            _LOGGER.info("Archivos de assets regenerados correctamente.")
+            # Forzar recarga de la integración
+            await self.hass.config_entries.async_reload(self._config_entry.entry_id)
+
+            return self.async_create_entry(title="", data={})
+
+        except Exception as ex:
+            _LOGGER.error("Error al regenerar assets: %s", ex)
+            errors["base"] = "regenerate_failed"
+
+        return self.async_show_form(step_id="regenerate_assets", errors=errors)

package/custom_components/meteocat/sensor.py

@@ -1357,6 +1357,13 @@ class MeteocatAlertRegionSensor(CoordinatorEntity[MeteocatAlertsRegionCoordinato
         # Assign entity_category if defined in the description
         self._attr_entity_category = getattr(description, "entity_category", None)
 
+    def _map_meteor_case_insensitive(self, meteor: str) -> str:
+        """Busca el meteor en el mapping sin importar mayúsculas/minúsculas."""
+        for key, value in self.METEOR_MAPPING.items():
+            if key.lower() == meteor.lower():
+                return value
+        return "unknown"
+
     @property
     def native_value(self):
         """Devuelve el número de alertas activas."""
@@ -1368,10 +1375,13 @@ class MeteocatAlertRegionSensor(CoordinatorEntity[MeteocatAlertsRegionCoordinato
         meteor_details = self.coordinator.data.get("detalles", {}).get("meteor", {})
         
         # Convertimos las claves al formato deseado usando el mapping
-        attributes = {
-            f"alert_{i+1}": self.METEOR_MAPPING.get(meteor, "unknown")
-            for i, meteor in enumerate(meteor_details.keys())
-        }
+        attributes = {}
+        for i, meteor in enumerate(meteor_details.keys()):
+            mapped_name = self._map_meteor_case_insensitive(meteor)
+            if not mapped_name:
+                _LOGGER.warning("Meteor desconocido sin mapeo: '%s'. Añadirlo a 'METEOR_MAPPING' del coordinador 'MeteocatAlertRegionSensor' si es necesario.", meteor)
+                mapped_name = "unknown"
+            attributes[f"alert_{i+1}"] = mapped_name
 
         _LOGGER.info("Atributos traducidos del sensor: %s", attributes)
         return attributes
@@ -1461,6 +1471,23 @@ class MeteocatAlertMeteorSensor(CoordinatorEntity[MeteocatAlertsRegionCoordinato
             self._attr_unique_id,
         )
     
+    def _get_meteor_data_case_insensitive(self, meteor_type: str) -> dict:
+        """Busca en los datos de meteor de forma case-insensitive."""
+        meteor_data_dict = self.coordinator.data.get("detalles", {}).get("meteor", {})
+        for key, value in meteor_data_dict.items():
+            if key.lower() == meteor_type.lower():
+                return value
+        return {}
+    
+    def _get_umbral_case_insensitive(self, umbral: str) -> str:
+        """Convierte un umbral a su clave interna usando case-insensitive."""
+        if umbral is None:
+            return "unknown"
+        for key, value in self.UMBRAL_MAPPING.items():
+            if key.lower() == umbral.lower():
+                return value
+        return "unknown"
+
     @property
     def native_value(self):
         """Devuelve el estado de la alerta específica."""
@@ -1468,7 +1495,7 @@ class MeteocatAlertMeteorSensor(CoordinatorEntity[MeteocatAlertsRegionCoordinato
         if not meteor_type:
             return "Desconocido"
 
-        meteor_data = self.coordinator.data.get("detalles", {}).get("meteor", {}).get(meteor_type, {})
+        meteor_data = self._get_meteor_data_case_insensitive(meteor_type)
 
         # Convertir estado para translation_key
         estado_original = meteor_data.get("estado", "Tancat")
@@ -1479,15 +1506,27 @@ class MeteocatAlertMeteorSensor(CoordinatorEntity[MeteocatAlertsRegionCoordinato
         """Devuelve los atributos específicos de la alerta."""
         meteor_type = self.METEOR_MAPPING.get(self.entity_description.key)
         if not meteor_type:
-            return {}
+            _LOGGER.warning(
+                "Tipo de meteor desconocido para sensor %s: '%s'. Añadirlo a 'METEOR_MAPPING' del coordinador 'MeteocatAlertMeteorSensor' si es necesario.",
+                self.entity_description.key,
+                self.coordinator.data.get("detalles", {}).get("meteor", {}).keys(),
+            )
+            return "unknown"
 
-        meteor_data = self.coordinator.data.get("detalles", {}).get("meteor", {}).get(meteor_type, {})
+        meteor_data = self._get_meteor_data_case_insensitive(meteor_type)
         if not meteor_data:
             return {}
         
         # Convertir umbral para translation_key
         umbral_original = meteor_data.get("umbral")
-        umbral_convertido = self.UMBRAL_MAPPING.get(umbral_original, "unknown")
+        umbral_convertido = self._get_umbral_case_insensitive(umbral_original)
+
+        if umbral_convertido == "unknown" and umbral_original is not None:
+            _LOGGER.warning(
+                "Umbral desconocido para sensor %s: '%s'. Añadirlo a 'UMBRAL_MAPPING' del coordinador 'MeteocatAlertMeteorSensor' si es necesario.", 
+                self.entity_description.key, 
+                umbral_original
+            )
 
         return {
             "inicio": meteor_data.get("inicio"),

package/custom_components/meteocat/strings.json

@@ -36,7 +36,7 @@
   "options": {
     "step":{
       "init": {
-        "description": "Setup the API Key and the API limits.",
+        "description": "Setup the API Key, the API limits and regenerate 'assets' files.",
         "title": "Setup options",
         "data": {
           "option": "Options"
@@ -49,6 +49,13 @@
       "update_limits_only": {
         "description": "Setup the API limits.",
         "title": "API limits"
+      },
+      "confirm_regenerate_assets": {
+        "description": "Regenerate missing assets files.",
+        "title": "Regenerate assets",
+        "data": {
+          "confirm": "Confirm"
+        }
       }
     },
     "error": {
@@ -61,7 +68,8 @@
     "option": {
       "options": {
         "update_api_and_limits": "Update API Key and limits.",
-        "update_limits_only": "Update API limits."
+        "update_limits_only": "Update API limits.",
+        "regenerate_assets": "Regenerate 'assets' files."
       }
     }
   },

package/custom_components/meteocat/translations/ca.json

@@ -36,7 +36,7 @@
   "options": {
     "step":{
       "init": {
-        "description": "Configura l'API Key i els límits de l'API.",
+        "description": "Configura l'API Key, els límits de l'API i regenera els arxius a 'assets'.",
         "title": "Opcions de configuració",
         "data": {
           "option": "Opcions"
@@ -49,6 +49,13 @@
       "update_limits_only": {
         "description": "Configura els límits de l'API.",
         "title": "Límits de l'API"
+      },
+      "confirm_regenerate_assets": {
+        "description": "Regenera els arxius a 'assets'.",
+        "title": "Regenera 'assets'",
+        "data": {
+          "confirm": "Confirmar"
+        }
       }
     },
     "error": {
@@ -61,7 +68,8 @@
     "option": {
       "options": {
         "update_api_and_limits": "Actualitzar API Key i limits.",
-        "update_limits_only": "Actualitzar API limits."
+        "update_limits_only": "Actualitzar API limits.",
+        "regenerate_assets": "Regenera arxius a 'assets'."
       }
     }
   },

package/custom_components/meteocat/translations/en.json

@@ -36,7 +36,7 @@
   "options": {
     "step":{
       "init": {
-        "description": "Setup the API Key and the API limits.",
+        "description": "Setup the API Key, the API limits and regenerate 'assets' files.",
         "title": "Setup options",
         "data": {
           "option": "Options"
@@ -49,6 +49,13 @@
       "update_limits_only": {
         "description": "Setup the API limits.",
         "title": "API limits"
+      },
+      "confirm_regenerate_assets": {
+        "description": "Regenerate missing assets files.",
+        "title": "Regenerate assets",
+        "data": {
+          "confirm": "Confirm"
+        }
       }
     },
     "error": {
@@ -61,7 +68,8 @@
     "option": {
       "options": {
         "update_api_and_limits": "Update API Key and limits.",
-        "update_limits_only": "Update API limits."
+        "update_limits_only": "Update API limits.",
+        "regenerate_assets": "Regenerate 'assets' files."
       }
     }
   },

package/custom_components/meteocat/translations/es.json

@@ -36,7 +36,7 @@
   "options": {
     "step":{
       "init": {
-        "description": "Configura el API Key y los límites de la API.",
+        "description": "Configura el API Key, los límites de la API y regenera los archivos en 'assets'.",
         "title": "Opciones de configuración",
         "data": {
           "option": "Opciones"
@@ -49,6 +49,13 @@
       "update_limits_only": {
         "description": "Configura los límites de la API.",
         "title": "Límites de la API"
+      },
+      "confirm_regenerate_assets": {
+        "description": "Regenera los archivos de 'assets'.",
+        "title": "Regenera 'assets'",
+        "data": {
+          "confirm": "Confirmar"
+        }
       }
     },
     "error": {
@@ -61,7 +68,8 @@
     "option": {
       "options": {
         "update_api_and_limits": "Actualizar API Key y límites.",
-        "update_limits_only": "Actualizar API límites."
+        "update_limits_only": "Actualizar API límites.",
+        "regenerate_assets": "Regenerar archivos de 'assets'."
       }
     }
   },

package/custom_components/meteocat/version.py

@@ -1,2 +1 @@
-# version.py
-__version__ = "2.2.6"
+__version__ = ""

package/filetree.txt

@@ -1,7 +1,15 @@
 └── .github/
+    └── ISSUE_TEMPLATE/
+        ├── bug_report.md
+        ├── config.yml
     └── workflows/
+        ├── autocloser.yaml
+        ├── close-duplicates.yml
         ├── hassfest.yaml
+        ├── publish-zip.yml
         ├── release.yml
+        ├── stale.yml
+        ├── sync-gitlab.yml
         ├── validate.yaml
 ├── .gitignore
 ├── .gitlab-ci.yml
@@ -42,6 +50,7 @@
     ├── diagnostic_sensors.png
     ├── dynamic_sensors.png
     ├── login.png
+    ├── options.png
     ├── pick_area.png
     ├── pick_station.png
     ├── pick_town.png

package/hacs.json

@@ -1,5 +1,8 @@
 {
   "name": "Meteocat",
-  "render_readme": true
+  "homeassistant": "2025.8.3",
+  "hide_default_branch": true,
+  "render_readme": true,
+  "zip_release": true,
+  "filename": "meteocat.zip"
 }
-  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteocat",
-  "version": "2.2.6",
+  "version": "2.3.0",
   "description": "[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)\r [![Python version compatibility](https://img.shields.io/pypi/pyversions/meteocat)](https://pypi.org/project/meteocat)\r [![pipeline status](https://gitlab.com/figorr/meteocat/badges/master/pipeline.svg)](https://gitlab.com/figorr/meteocat/commits/master)",
   "main": "index.js",
   "directories": {

package/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "meteocat"
-version = "2.2.6"
+version = ""
 description = "Script para obtener datos meteorológicos de la API de Meteocat"
 authors = ["figorr <jdcuartero@yahoo.es>"]
 license = "Apache-2.0"

package/.releaserc.toml

@@ -1,14 +0,0 @@
-branches = ["master"]
-
-[plugins]
-"@semantic-release/gitlab" = {}
-"@semantic-release/github" = {}
-"@semantic-release/changelog" = {}
-"@semantic-release/commit-analyzer" = { preset = "conventional" }
-"@semantic-release/release-notes-generator" = {}
-"@semantic-release/git" = {}
-
-[[plugins]]
-path = "@semantic-release/git"
-assets = ["meteocat/version.py"]
-message = "chore(release): update version to ${nextRelease.version}"

package/releaserc.json

@@ -1,18 +0,0 @@
-{
-    "branches": ["master"],
-    "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
-      "@semantic-release/changelog",
-      [
-        "@semantic-release/exec",
-        {
-          "prepareCmd": "python setup.py sdist bdist_wheel",
-          "publishCmd": "twine upload dist/* -u ${PYPI_USERNAME} -p ${PYPI_PASSWORD}"
-        }
-      ],
-      "@semantic-release/github",
-      "@semantic-release/git"
-    ]
-  }
-