From 08003c5287c02fd285256bd8af2a92aa75482648 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Sun, 5 Dec 2021 00:39:18 -0800 Subject: [PATCH] Improve nest media source event timestamp display (#61027) Drop subsecond text from the nest media source event timestamp display, using a common date/time template string. --- homeassistant/components/nest/media_source.py | 4 ++-- tests/components/nest/test_media_source.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/nest/media_source.py b/homeassistant/components/nest/media_source.py index e21be20380a..af51c296e43 100644 --- a/homeassistant/components/nest/media_source.py +++ b/homeassistant/components/nest/media_source.py @@ -46,7 +46,7 @@ from homeassistant.components.nest.const import DATA_SUBSCRIBER, DOMAIN from homeassistant.components.nest.device_info import NestDeviceInfo from homeassistant.components.nest.events import MEDIA_SOURCE_EVENT_TITLE_MAP from homeassistant.core import HomeAssistant -import homeassistant.util.dt as dt_util +from homeassistant.helpers.template import DATE_STR_FORMAT _LOGGER = logging.getLogger(__name__) @@ -250,7 +250,7 @@ def _browse_event( media_content_type=MEDIA_TYPE_IMAGE, title=CLIP_TITLE_FORMAT.format( event_name=MEDIA_SOURCE_EVENT_TITLE_MAP.get(event.event_type, "Event"), - event_time=dt_util.as_local(event.timestamp), + event_time=event.timestamp.strftime(DATE_STR_FORMAT), ), can_play=True, can_expand=False, diff --git a/tests/components/nest/test_media_source.py b/tests/components/nest/test_media_source.py index 4cda781ebeb..67d6ba2f229 100644 --- a/tests/components/nest/test_media_source.py +++ b/tests/components/nest/test_media_source.py @@ -17,6 +17,7 @@ from homeassistant.components.media_player.errors import BrowseError from homeassistant.components.media_source import const from homeassistant.components.media_source.error import Unresolvable from homeassistant.helpers import device_registry as dr +from homeassistant.helpers.template import DATE_STR_FORMAT import homeassistant.util.dt as dt_util from .common import async_setup_sdm_platform @@ -211,7 +212,7 @@ async def test_camera_event(hass, auth, hass_client): assert len(browse.children) == 1 assert browse.children[0].domain == DOMAIN assert browse.children[0].identifier == f"{device.id}/{event_id}" - event_timestamp_string = event_timestamp.isoformat(timespec="seconds", sep=" ") + event_timestamp_string = event_timestamp.strftime(DATE_STR_FORMAT) assert browse.children[0].title == f"Person @ {event_timestamp_string}" assert not browse.children[0].can_expand assert len(browse.children[0].children) == 0 @@ -291,7 +292,7 @@ async def test_event_order(hass, auth): assert len(browse.children) == 2 assert browse.children[0].domain == DOMAIN assert browse.children[0].identifier == f"{device.id}/{event_id2}" - event_timestamp_string = event_timestamp2.isoformat(timespec="seconds", sep=" ") + event_timestamp_string = event_timestamp2.strftime(DATE_STR_FORMAT) assert browse.children[0].title == f"Motion @ {event_timestamp_string}" assert not browse.children[0].can_expand @@ -299,7 +300,7 @@ async def test_event_order(hass, auth): assert browse.children[1].domain == DOMAIN assert browse.children[1].identifier == f"{device.id}/{event_id1}" - event_timestamp_string = event_timestamp1.isoformat(timespec="seconds", sep=" ") + event_timestamp_string = event_timestamp1.strftime(DATE_STR_FORMAT) assert browse.children[1].title == f"Person @ {event_timestamp_string}" assert not browse.children[1].can_expand @@ -435,7 +436,7 @@ async def test_camera_event_clip_preview(hass, auth, hass_client): assert len(browse.children) == 1 assert browse.children[0].domain == DOMAIN actual_event_id = browse.children[0].identifier - event_timestamp_string = event_timestamp.isoformat(timespec="seconds", sep=" ") + event_timestamp_string = event_timestamp.strftime(DATE_STR_FORMAT) assert browse.children[0].title == f"Event @ {event_timestamp_string}" assert not browse.children[0].can_expand assert len(browse.children[0].children) == 0