Add timezone to on_since attributes (#978)

This allows them to displayed in HA without errors.
This commit is contained in:
Steven B
2024-06-14 22:04:20 +01:00
committed by GitHub
parent 4cf395483f
commit 6cdbbefb90
3 changed files with 30 additions and 26 deletions

View File

@@ -4,7 +4,7 @@ from __future__ import annotations
import base64
import logging
from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone
from typing import TYPE_CHECKING, Any, Mapping, Sequence, cast
from ..aestransport import AesTransport
@@ -357,12 +357,25 @@ class SmartDevice(Device):
@property
def time(self) -> datetime:
"""Return the time."""
if self._parent and Module.Time in self._parent.modules:
_timemod = self._parent.modules[Module.Time]
else:
_timemod = self.modules[Module.Time]
if (self._parent and (time_mod := self._parent.modules.get(Module.Time))) or (
time_mod := self.modules.get(Module.Time)
):
return time_mod.time
return _timemod.time
# We have no device time, use current local time.
return datetime.now(timezone.utc).astimezone().replace(microsecond=0)
@property
def on_since(self) -> datetime | None:
"""Return the time that the device was turned on or None if turned off."""
if (
not self._info.get("device_on")
or (on_time := self._info.get("on_time")) is None
):
return None
on_time = cast(float, on_time)
return self.time - timedelta(seconds=on_time)
@property
def timezone(self) -> dict:
@@ -489,20 +502,6 @@ class SmartDevice(Device):
energy = self.modules[Module.Energy]
return energy.emeter_today
@property
def on_since(self) -> datetime | None:
"""Return the time that the device was turned on or None if turned off."""
if (
not self._info.get("device_on")
or (on_time := self._info.get("on_time")) is None
):
return None
on_time = cast(float, on_time)
if (timemod := self.modules.get(Module.Time)) is not None:
return timemod.time - timedelta(seconds=on_time)
else: # We have no device time, use current local time.
return datetime.now().replace(microsecond=0) - timedelta(seconds=on_time)
async def wifi_scan(self) -> list[WifiNetwork]:
"""Scan for available wifi networks."""