From ebc582c813b35b49911cee1cc9166ce2d2cbd26b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 18 May 2026 12:26:45 +0200 Subject: [PATCH] Return media_content_id as string in forked_daapd (#171059) --- homeassistant/components/forked_daapd/media_player.py | 6 ++++-- tests/components/forked_daapd/test_media_player.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/forked_daapd/media_player.py b/homeassistant/components/forked_daapd/media_player.py index eb9d361504d5..2a5e04361582 100644 --- a/homeassistant/components/forked_daapd/media_player.py +++ b/homeassistant/components/forked_daapd/media_player.py @@ -470,9 +470,11 @@ class ForkedDaapdMaster(MediaPlayerEntity): return self._player["volume"] == 0 @property - def media_content_id(self): + def media_content_id(self) -> str | None: """Content ID of current playing media.""" - return self._player["item_id"] + if (item_id := self._player["item_id"]) == 0: + return None + return str(item_id) @property def media_content_type(self): diff --git a/tests/components/forked_daapd/test_media_player.py b/tests/components/forked_daapd/test_media_player.py index 8f0105d48d78..d3bbcb4ec2bd 100644 --- a/tests/components/forked_daapd/test_media_player.py +++ b/tests/components/forked_daapd/test_media_player.py @@ -367,7 +367,7 @@ def test_master_state(hass: HomeAssistant) -> None: assert state.attributes[ATTR_SUPPORTED_FEATURES] == SUPPORTED_FEATURES assert not state.attributes[ATTR_MEDIA_VOLUME_MUTED] assert state.attributes[ATTR_MEDIA_VOLUME_LEVEL] == 0.2 - assert state.attributes[ATTR_MEDIA_CONTENT_ID] == 12322 + assert state.attributes[ATTR_MEDIA_CONTENT_ID] == "12322" assert state.attributes[ATTR_MEDIA_CONTENT_TYPE] == MediaType.MUSIC assert state.attributes[ATTR_MEDIA_DURATION] == 0.05 assert state.attributes[ATTR_MEDIA_POSITION] == 0.005