Bug fixes

kgn3400 · Oct 1, 2024 · b3d6a14 · b3d6a14
1 parent 25312c2
commit b3d6a14
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/custom_components/docker_status/config_flow.py b/custom_components/docker_status/config_flow.py
@@ -231,7 +231,7 @@ async def validate_docker_remove_sensor(
     {
         vol.Required(CONF_DOCKER_BASE_NAME, default=""): TextSelector(),
         vol.Required(
-            CONF_DOCKER_BASE_NAME_USE_IN_SENSOR_NAME, default=False
+            CONF_DOCKER_BASE_NAME_USE_IN_SENSOR_NAME, default=True
         ): BooleanSelector(),
         **DOCKER_BASE_SETUP,
     }

diff --git a/custom_components/docker_status/entity.py b/custom_components/docker_status/entity.py
@@ -32,6 +32,6 @@ def __init__(
             identifiers={(DOMAIN, DOMAIN_NAME)},
             manufacturer="KGN",
             suggested_area="",
-            sw_version="1.0.7",
+            sw_version="1.0",
             name=DOMAIN_NAME,
         )
diff --git a/custom_components/docker_status/manifest.json b/custom_components/docker_status/manifest.json
@@ -15,6 +15,6 @@
     "paramiko"
   ],
   "ssdp": [],
-  "version": "1.0.11",
+  "version": "1.0.12",
   "zeroconf": []
 }
diff --git a/custom_components/docker_status/sensor.py b/custom_components/docker_status/sensor.py
@@ -48,6 +48,7 @@ async def async_setup_entry(
                 coordinator,
                 entry,
                 component_api,
+                config.get(CONF_DOCKER_BASE_NAME, ""),
                 sensor[CONF_DOCKER_ENV_SENSOR_NAME],
                 docker_sensor,
                 sensor[CONF_DOCKER_ENGINE_URL],
@@ -84,6 +85,7 @@ def __init__(
         coordinator: DataUpdateCoordinator,
         entry: ConfigEntry,
         component_api: ComponentApi,
+        docker_base_name: str,
         sensor_env_name: str,
         sensor_type: str,
         sensor_engine_url: str,
@@ -95,6 +97,8 @@ def __init__(
         self.hass: HomeAssistant = hass
         self.component_api = component_api
         self.coordinator = coordinator
+        self.entry: ConfigEntry = entry
+        self.docker_base_name = docker_base_name
         self.env_name = sensor_env_name
         self.sensor_type: str = sensor_type
         self.engine_url = sensor_engine_url
@@ -106,7 +110,12 @@ def __init__(
     @property
     def name(self) -> str:
         """Name."""
-        return f"{self.env_name} - {self.sensor_type}"
+
+        return (
+            f"{self.docker_base_name} {self.env_name} - {self.sensor_type}"
+            if self.entry.options.get(CONF_DOCKER_BASE_NAME_USE_IN_SENSOR_NAME, False)
+            else f"{self.env_name} - {self.sensor_type}"
+        )
 
     # ------------------------------------------------------
     # @property
@@ -180,7 +189,7 @@ def __init__(
         coordinator: DataUpdateCoordinator,
         entry: ConfigEntry,
         component_api: ComponentApi,
-        sensor_name: str,
+        docker_base_name: str,
         sensor_type: str,
         sensor_unigue_id: str,
     ) -> None:
@@ -190,7 +199,7 @@ def __init__(
         self.component_api = component_api
         self.entry: ConfigEntry = entry
         self.coordinator = coordinator
-        self._name = sensor_name
+        self.docker_base_name = docker_base_name
         self.sensor_type: str = sensor_type
         self.sensor_unique_id = sensor_unigue_id
 
@@ -201,7 +210,7 @@ def __init__(
     def name(self) -> str:
         """Name."""
         return (
-            f"{self._name} summary - {self.sensor_type}"
+            f"{self.docker_base_name} summary - {self.sensor_type}"
             if self.entry.options.get(CONF_DOCKER_BASE_NAME_USE_IN_SENSOR_NAME, False)
             else f"Summary - {self.sensor_type}"
         )

diff --git a/custom_components/docker_status/translations/da.json b/custom_components/docker_status/translations/da.json
@@ -28,7 +28,7 @@
       "user": {
         "data": {
           "docker_base_name": "Konfiguration navn",
-          "docker_base_name_use_in_sensor_name": "Brug konfigurations navn i sum sensor navne",
+          "docker_base_name_use_in_sensor_name": "Brug konfigurations navn i sensor navne",
           "scan_interval": "Skan interval",
           "check_for_updated_images_hours": "Tjek for opdateringer af image"
         },

diff --git a/custom_components/docker_status/translations/en.json b/custom_components/docker_status/translations/en.json
@@ -28,7 +28,7 @@
       "user": {
         "data": {
           "docker_base_name": "Configuration name",
-          "docker_base_name_use_in_sensor_name": "Use configuration name in sum sensor names",
+          "docker_base_name_use_in_sensor_name": "Use configuration name in sensor names",
           "scan_interval": "Scan interval",
           "check_for_updated_images_hours": "Check for updated images"
         },