Resync with ha core

Author: benjamin-dcs

custom_components/file_plusplus/config_flow.py

@@ -21,7 +21,7 @@
     CONF_PLATFORM,
     CONF_UNIT_OF_MEASUREMENT,
     CONF_VALUE_TEMPLATE,
-    Platform
+    Platform,
 )
 
 from homeassistant.core import callback
@@ -136,9 +136,7 @@ async def async_step_sensor(
         """Handle file sensor config flow."""
         return await self._async_handle_step(Platform.SENSOR.value, user_input)
 
-    async def async_step_import(
-        self, import_data: dict[str, Any]
-    ) -> ConfigFlowResult:
+    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
         """Import `file`` config from configuration.yaml."""
         self._async_abort_entries_match(import_data)
         platform = import_data[CONF_PLATFORM]

custom_components/file_plusplus/const.py

@@ -4,5 +4,5 @@
 
 CONF_TIMESTAMP = "timestamp"
 
-DEFAULT_NAME = "file_plusplus"
+DEFAULT_NAME = "File++"
 FILE_ICON = "mdi:file"

custom_components/file_plusplus/sensor.py

@@ -5,7 +5,6 @@
 import logging
 import os
 
-# from file_read_backwards import FileReadBackwards
 import voluptuous as vol
 
 from homeassistant.components.sensor import (
@@ -98,157 +97,7 @@ def __init__(
     def update(self) -> None:
         """Get the latest entry from a file and updates the state."""
         try:
-            # with FileReadBackwards(self._file_path, encoding="utf-8") as file_data:
-            #     for line in file_data:
-            #         data = line
-            #         break
-            #     data = data.strip()
-            with open(self._file_path, encoding="utf-8") as f:
-                data = f.read()
-        except (IndexError, FileNotFoundError, IsADirectoryError, UnboundLocalError) as e:
-            _LOGGER.warning(
-                "File or data not present at the moment: %s",
-                os.path.basename(self._file_path),
-            )
-            return
 
-        self._attr_native_value = "Ok"
-
-        # if self._val_tpl is not None:
-        #     self._attr_native_value = (
-        #         self._val_tpl.async_render_with_possible_json_value(data, None)
-        #     )
-        # else:
-        #     self._attr_native_value = data
-
-    @property
-    def extra_state_attributes(self):
-        """Return device state attributes."""
-
-        try:
-            with open(self._file_path, encoding="utf-8") as f:
-                data = f.read()
-        except (IndexError, FileNotFoundError, IsADirectoryError, UnboundLocalError) as e:
-            _LOGGER.warning(
-                "File or data not present at the moment: %s",
-                os.path.basename(self._file_path),
-            )
-            return
-
-        if self._val_tpl is not None:
-            content = (
-                self._val_tpl.async_render_with_possible_json_value(data, None)
-            )
-        else:
-            content = data
-
-        return {
-            "content": content,
-        }"""Support for sensor value(s) stored in local files."""
-
-from __future__ import annotations
-
-import logging
-import os
-
-# from file_read_backwards import FileReadBackwards
-import voluptuous as vol
-
-from homeassistant.components.sensor import (
-    PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
-    SensorEntity,
-)
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_FILE_PATH,
-    CONF_NAME,
-    CONF_UNIT_OF_MEASUREMENT,
-    CONF_VALUE_TEMPLATE,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.template import Template
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-
-from .const import DEFAULT_NAME, FILE_ICON
-
-_LOGGER = logging.getLogger(__name__)
-
-PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_FILE_PATH): cv.isfile,
-        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        vol.Optional(CONF_VALUE_TEMPLATE): cv.string,
-        vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
-    }
-)
-
-
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the file sensor from YAML.
-
-    The YAML platform config is automatically
-    imported to a config entry, this method can be removed
-    when YAML support is removed.
-    """
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the file sensor."""
-    config = dict(entry.data)
-    options = dict(entry.options)
-    file_path: str = config[CONF_FILE_PATH]
-    unique_id: str = entry.entry_id
-    name: str = config.get(CONF_NAME, DEFAULT_NAME)
-    unit: str | None = options.get(CONF_UNIT_OF_MEASUREMENT)
-    value_template: Template | None = None
-
-    if CONF_VALUE_TEMPLATE in options:
-        value_template = Template(options[CONF_VALUE_TEMPLATE], hass)
-
-    async_add_entities(
-        [FileSensor(unique_id, name, file_path, unit, value_template)], True
-    )
-
-
-class FileSensor(SensorEntity):
-    """Implementation of a file sensor."""
-
-    _attr_icon = FILE_ICON
-
-    def __init__(
-        self,
-        unique_id: str,
-        name: str,
-        file_path: str,
-        unit_of_measurement: str | None,
-        value_template: Template | None,
-    ) -> None:
-        """Initialize the file sensor."""
-        self._attr_name = name
-        self._file_path = file_path
-        self._attr_native_unit_of_measurement = unit_of_measurement
-        self._val_tpl = value_template
-        self._attr_unique_id = unique_id
-
-    def update(self) -> None:
-        """Get the latest entry from a file and updates the state."""
-        try:
-            # with FileReadBackwards(self._file_path, encoding="utf-8") as file_data:
-            #     for line in file_data:
-            #         data = line
-            #         break
-            #     data = data.strip()
             with open(self._file_path, encoding="utf-8") as f:
                 data = f.read()
         except (IndexError, FileNotFoundError, IsADirectoryError, UnboundLocalError) as e:
@@ -260,13 +109,6 @@ def update(self) -> None:
 
         self._attr_native_value = "Ok"
 
-        # if self._val_tpl is not None:
-        #     self._attr_native_value = (
-        #         self._val_tpl.async_render_with_possible_json_value(data, None)
-        #     )
-        # else:
-        #     self._attr_native_value = data
-
     @property
     def extra_state_attributes(self):
         """Return device state attributes."""