From 1503cd79d1327aa39a6b15bf1f1b6debb479562c Mon Sep 17 00:00:00 2001 From: Tomaae Date: Wed, 2 Feb 2022 22:18:05 +0100 Subject: [PATCH] renamed format_value to helper.py --- custom_components/mikrotik_router/binary_sensor.py | 13 +------------ .../mikrotik_router/device_tracker.py | 14 +------------- custom_components/mikrotik_router/helper.py | 12 ++++++++++++ 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/custom_components/mikrotik_router/binary_sensor.py b/custom_components/mikrotik_router/binary_sensor.py index d575ba9..cc86436 100644 --- a/custom_components/mikrotik_router/binary_sensor.py +++ b/custom_components/mikrotik_router/binary_sensor.py @@ -2,6 +2,7 @@ import logging from typing import Any, Dict, Optional + from homeassistant.helpers.entity import EntityCategory from homeassistant.components.binary_sensor import ( BinarySensorEntity, @@ -115,18 +116,6 @@ DEVICE_ATTRIBUTES_PPP_SECRET = [ ] -# --------------------------- -# format_value -# --------------------------- -def format_value(res): - res = res.replace("dhcp", "DHCP") - res = res.replace("dns", "DNS") - res = res.replace("capsman", "CAPsMAN") - res = res.replace("wireless", "Wireless") - res = res.replace("restored", "Restored") - return res - - # --------------------------- # async_setup_entry # --------------------------- diff --git a/custom_components/mikrotik_router/device_tracker.py b/custom_components/mikrotik_router/device_tracker.py index 508e6fc..f41cd4d 100644 --- a/custom_components/mikrotik_router/device_tracker.py +++ b/custom_components/mikrotik_router/device_tracker.py @@ -15,7 +15,7 @@ from homeassistant.core import callback from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.util.dt import get_age, utcnow -from .helper import format_attribute +from .helper import format_attribute, format_value from .const import ( DOMAIN, DATA_CLIENT, @@ -38,18 +38,6 @@ DEVICE_ATTRIBUTES_HOST = [ ] -# --------------------------- -# format_value -# --------------------------- -def format_value(res): - res = res.replace("dhcp", "DHCP") - res = res.replace("dns", "DNS") - res = res.replace("capsman", "CAPsMAN") - res = res.replace("wireless", "Wireless") - res = res.replace("restored", "Restored") - return res - - # --------------------------- # async_setup_entry # --------------------------- diff --git a/custom_components/mikrotik_router/helper.py b/custom_components/mikrotik_router/helper.py index 507e254..2722693 100644 --- a/custom_components/mikrotik_router/helper.py +++ b/custom_components/mikrotik_router/helper.py @@ -15,3 +15,15 @@ def format_attribute(attr): res = res.replace(" tx", " TX") res = res.replace(" rx", " RX") return res + + +# --------------------------- +# format_value +# --------------------------- +def format_value(res): + res = res.replace("dhcp", "DHCP") + res = res.replace("dns", "DNS") + res = res.replace("capsman", "CAPsMAN") + res = res.replace("wireless", "Wireless") + res = res.replace("restored", "Restored") + return res