diff --git a/homeassistant/components/lametric/__init__.py b/homeassistant/components/lametric/__init__.py index 1c84c4f5510..970bdd4b3b6 100644 --- a/homeassistant/components/lametric/__init__.py +++ b/homeassistant/components/lametric/__init__.py @@ -1,6 +1,4 @@ """Support for LaMetric time.""" -import logging - from lmnotify import LaMetricManager import voluptuous as vol @@ -9,12 +7,7 @@ from homeassistant.core import HomeAssistant import homeassistant.helpers.config_validation as cv from homeassistant.helpers.typing import ConfigType -_LOGGER = logging.getLogger(__name__) - - -DOMAIN = "lametric" - -LAMETRIC_DEVICES = "LAMETRIC_DEVICES" +from .const import DOMAIN, LOGGER CONFIG_SCHEMA = vol.Schema( { @@ -31,18 +24,18 @@ CONFIG_SCHEMA = vol.Schema( def setup(hass: HomeAssistant, config: ConfigType) -> bool: """Set up the LaMetricManager.""" - _LOGGER.debug("Setting up LaMetric platform") + LOGGER.debug("Setting up LaMetric platform") conf = config[DOMAIN] hlmn = HassLaMetricManager( client_id=conf[CONF_CLIENT_ID], client_secret=conf[CONF_CLIENT_SECRET] ) if not (devices := hlmn.manager.get_devices()): - _LOGGER.error("No LaMetric devices found") + LOGGER.error("No LaMetric devices found") return False hass.data[DOMAIN] = hlmn for dev in devices: - _LOGGER.debug("Discovered LaMetric device: %s", dev) + LOGGER.debug("Discovered LaMetric device: %s", dev) return True @@ -53,7 +46,7 @@ class HassLaMetricManager: def __init__(self, client_id: str, client_secret: str) -> None: """Initialize HassLaMetricManager and connect to LaMetric.""" - _LOGGER.debug("Connecting to LaMetric") + LOGGER.debug("Connecting to LaMetric") self.manager = LaMetricManager(client_id, client_secret) self._client_id = client_id self._client_secret = client_secret diff --git a/homeassistant/components/lametric/const.py b/homeassistant/components/lametric/const.py new file mode 100644 index 00000000000..85e61cd8d9a --- /dev/null +++ b/homeassistant/components/lametric/const.py @@ -0,0 +1,16 @@ +"""Constants for the LaMetric integration.""" + +import logging +from typing import Final + +DOMAIN: Final = "lametric" + +LOGGER = logging.getLogger(__package__) + +AVAILABLE_PRIORITIES: Final = ["info", "warning", "critical"] +AVAILABLE_ICON_TYPES: Final = ["none", "info", "alert"] + +CONF_CYCLES: Final = "cycles" +CONF_LIFETIME: Final = "lifetime" +CONF_PRIORITY: Final = "priority" +CONF_ICON_TYPE: Final = "icon_type" diff --git a/homeassistant/components/lametric/notify.py b/homeassistant/components/lametric/notify.py index 034deb911d1..f3c098a841e 100644 --- a/homeassistant/components/lametric/notify.py +++ b/homeassistant/components/lametric/notify.py @@ -1,7 +1,6 @@ """Support for LaMetric notifications.""" from __future__ import annotations -import logging from typing import Any from lmnotify import Model, SimpleFrame, Sound @@ -20,17 +19,17 @@ from homeassistant.core import HomeAssistant import homeassistant.helpers.config_validation as cv from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType -from . import DOMAIN, HassLaMetricManager - -_LOGGER = logging.getLogger(__name__) - -AVAILABLE_PRIORITIES = ["info", "warning", "critical"] -AVAILABLE_ICON_TYPES = ["none", "info", "alert"] - -CONF_CYCLES = "cycles" -CONF_LIFETIME = "lifetime" -CONF_PRIORITY = "priority" -CONF_ICON_TYPE = "icon_type" +from . import HassLaMetricManager +from .const import ( + AVAILABLE_ICON_TYPES, + AVAILABLE_PRIORITIES, + CONF_CYCLES, + CONF_ICON_TYPE, + CONF_LIFETIME, + CONF_PRIORITY, + DOMAIN, + LOGGER, +) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( { @@ -85,7 +84,7 @@ class LaMetricNotificationService(BaseNotificationService): targets = kwargs.get(ATTR_TARGET) data = kwargs.get(ATTR_DATA) - _LOGGER.debug("Targets/Data: %s/%s", targets, data) + LOGGER.debug("Targets/Data: %s/%s", targets, data) icon = self._icon cycles = self._cycles sound = None @@ -99,16 +98,16 @@ class LaMetricNotificationService(BaseNotificationService): if "sound" in data: try: sound = Sound(category="notifications", sound_id=data["sound"]) - _LOGGER.debug("Adding notification sound %s", data["sound"]) + LOGGER.debug("Adding notification sound %s", data["sound"]) except AssertionError: - _LOGGER.error("Sound ID %s unknown, ignoring", data["sound"]) + LOGGER.error("Sound ID %s unknown, ignoring", data["sound"]) if "cycles" in data: cycles = int(data["cycles"]) if "icon_type" in data: if data["icon_type"] in AVAILABLE_ICON_TYPES: icon_type = data["icon_type"] else: - _LOGGER.warning( + LOGGER.warning( "Priority %s invalid, using default %s", data["priority"], priority, @@ -117,13 +116,13 @@ class LaMetricNotificationService(BaseNotificationService): if data["priority"] in AVAILABLE_PRIORITIES: priority = data["priority"] else: - _LOGGER.warning( + LOGGER.warning( "Priority %s invalid, using default %s", data["priority"], priority, ) text_frame = SimpleFrame(icon, message) - _LOGGER.debug( + LOGGER.debug( "Icon/Message/Cycles/Lifetime: %s, %s, %d, %d", icon, message, @@ -138,11 +137,11 @@ class LaMetricNotificationService(BaseNotificationService): try: self._devices = lmn.get_devices() except TokenExpiredError: - _LOGGER.debug("Token expired, fetching new token") + LOGGER.debug("Token expired, fetching new token") lmn.get_token() self._devices = lmn.get_devices() except RequestsConnectionError: - _LOGGER.warning( + LOGGER.warning( "Problem connecting to LaMetric, using cached devices instead" ) for dev in self._devices: @@ -155,6 +154,6 @@ class LaMetricNotificationService(BaseNotificationService): priority=priority, icon_type=icon_type, ) - _LOGGER.debug("Sent notification to LaMetric %s", dev["name"]) + LOGGER.debug("Sent notification to LaMetric %s", dev["name"]) except OSError: - _LOGGER.warning("Cannot connect to LaMetric %s", dev["name"]) + LOGGER.warning("Cannot connect to LaMetric %s", dev["name"])