Merge pull request #275 from sca075/refactoring_camera

Releasing 2024.11.1

Author: sca075

custom_components/mqtt_vacuum_camera/__init__.py

@@ -2,6 +2,7 @@
 Version: 2024.11.1"""
 
 import logging
+from functools import partial
 import os
 
 from homeassistant import config_entries, core
@@ -27,7 +28,7 @@
     DOMAIN,
 )
 from .coordinator import MQTTVacuumCoordinator
-from .utils.camera.camera_services import reset_trims, reload_config
+from .utils.camera.camera_services import reset_trims, reload_camera_config
 from .utils.files_operations import (
     async_clean_up_all_auto_crop_files,
     async_get_translations_vacuum_id,
@@ -83,10 +84,10 @@ async def async_setup_entry(hass: core.HomeAssistant, entry: ConfigEntry) -> boo
     # Register Services
     if not hass.services.has_service(DOMAIN, SERVICE_RELOAD):
         async_register_admin_service(
-            hass, DOMAIN, SERVICE_RELOAD, lambda call: reload_config(hass, DOMAIN)
+            hass, DOMAIN, SERVICE_RELOAD, partial(reload_camera_config, hass=hass)
         )
         hass.services.async_register(
-            DOMAIN, "reset_trims", lambda call: reset_trims(hass, call, DOMAIN)
+            DOMAIN, "reset_trims", partial(reset_trims, hass=hass)
         )
         await async_register_vacuums_services(hass, data_coordinator)
     # Registers update listener to update config entry when options are updated.

custom_components/mqtt_vacuum_camera/utils/camera/camera_services.py

@@ -1,59 +1,59 @@
 """Camera-related services for the MQTT Vacuum Camera integration."""
 
+import logging
 import asyncio
 import async_timeout
-import logging
-
 
 from homeassistant.core import ServiceCall, HomeAssistant
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import SERVICE_RELOAD
 
 from ...utils.files_operations import async_clean_up_all_auto_crop_files
+from ...const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-async def reset_trims(hass: HomeAssistant, call: ServiceCall, domain: str) -> None:
+
+async def reset_trims(call: ServiceCall, hass: HomeAssistant) -> None:
     """Action Reset Map Trims."""
-    _LOGGER.debug(f"Resetting trims for {domain}")
+    _LOGGER.debug(f"Resetting trims for {DOMAIN}")
     try:
         await async_clean_up_all_auto_crop_files(hass)
-        await hass.services.async_call(domain, SERVICE_RELOAD)
-        hass.bus.async_fire(f"event_{domain}_reset_trims", context=call.context)
+        await hass.services.async_call(DOMAIN, SERVICE_RELOAD)
+        hass.bus.async_fire(f"event_{DOMAIN}_reset_trims", context=call.context)
     except Exception as err:
         _LOGGER.error(f"Error resetting trims: {err}")
 
 
-async def reload_config(hass: HomeAssistant, domain: str) -> None:
+async def reload_camera_config(call: ServiceCall, hass: HomeAssistant) -> None:
     """Reload the camera platform for all entities in the integration."""
-    _LOGGER.debug(f"Reloading the config entry for all {domain} entities")
-    camera_entries = hass.config_entries.async_entries(domain)
+
+    _LOGGER.debug(f"Reloading the config entry for all {DOMAIN} entities")
+    camera_entries = hass.config_entries.async_entries(DOMAIN)
     total_entries = len(camera_entries)
     processed = 0
 
     for camera_entry in camera_entries:
         processed += 1
         _LOGGER.info(f"Processing entry {processed}/{total_entries}")
         if camera_entry.state == ConfigEntryState.LOADED:
-            _LOGGER.debug(f"Unloading entry: {camera_entry.entry_id}")
             try:
-                async with async_timeout.timeout(30):
-                    await hass.config_entries.async_unload(camera_entry.entry_id)
-
-                _LOGGER.debug(f"Reloading entry: {camera_entry.entry_id}")
-                await hass.config_entries.async_setup(camera_entry.entry_id)
+                with async_timeout.timeout(10):
+                    _LOGGER.debug(f"Reloading entry: {camera_entry.entry_id}")
+                    hass.config_entries.async_schedule_reload(camera_entry.entry_id)
             except asyncio.TimeoutError:
-                _LOGGER.error(f"Timeout while processing entry {camera_entry.entry_id}")
-                continue
+                _LOGGER.error(f"Timeout processing entry {camera_entry.entry_id}")
             except Exception as err:
                 _LOGGER.error(f"Error processing entry {camera_entry.entry_id}: {err}")
                 continue
         else:
-            _LOGGER.debug(
-                f"Skipping entry {camera_entry.entry_id} as it is NOT_LOADED"
-            )
-
-    hass.bus.async_fire(f"event_{domain}_reloaded", {
-        "processed": processed,
-        "total": total_entries
-    })
+            _LOGGER.debug(f"Skipping entry {camera_entry.entry_id} as it is NOT_LOADED")
+
+    hass.bus.async_fire(
+        f"event_{DOMAIN}_reloaded",
+        event_data={
+            "processed": processed,
+            "total": total_entries,
+        },
+        context=call.context,
+    )

custom_components/mqtt_vacuum_camera/utils/vacuum/mqtt_vacuum_services.py

@@ -50,7 +50,9 @@ async def vacuum_clean_segments(call: ServiceCall, coordinator) -> None:
                     service_data["payload"],
                 )
             except Exception as e:
-                raise ServiceValidationError(f"Error sending command to vacuum: {e}") from e
+                raise ServiceValidationError(
+                    f"Error sending command to vacuum: {e}"
+                ) from e
 
             coordinator.hass.bus.async_fire(
                 f"event_{DOMAIN}.vacuum_clean_zone",