jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-26 22:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sonos improve radio metadata handling (#50493)

Browse Source
This commit is contained in:
jjlawren 2021-05-15 14:19:16 -05:00 committed by GitHub
parent e1dd479e15
commit 1afb0a0841
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
homeassistant/components/sonos/speaker.py
View File

@ -8,6 +8,7 @@ import datetime
from functools import partial from functools import partial
import logging import logging
from typing import Any, Callable from typing import Any, Callable
import urllib.parse
import async_timeout import async_timeout
from pysonos.core import MUSIC_SRC_LINE_IN, MUSIC_SRC_RADIO, MUSIC_SRC_TV, SoCo from pysonos.core import MUSIC_SRC_LINE_IN, MUSIC_SRC_RADIO, MUSIC_SRC_TV, SoCo
@ -725,7 +726,7 @@ class SonosSpeaker:
if variables and "transport_state" in variables: if variables and "transport_state" in variables:
self.media.play_mode = variables["current_play_mode"] self.media.play_mode = variables["current_play_mode"]
track_uri = variables["current_track_uri"] track_uri = variables["enqueued_transport_uri"]
music_source = self.soco.music_source_from_uri(track_uri) music_source = self.soco.music_source_from_uri(track_uri)
else: else:
self.media.play_mode = self.soco.play_mode self.media.play_mode = self.soco.play_mode
@ -777,18 +778,25 @@ class SonosSpeaker:
except (TypeError, KeyError, AttributeError): except (TypeError, KeyError, AttributeError):
pass pass
# Non-playing radios will not have a current title. Radios without tagging if not self.media.artist:
# can have part of the radio URI as title. In these cases we try to use the try:
# radio name instead. self.media.artist = variables["current_track_meta_data"].creator
except (KeyError, AttributeError):
pass
# Radios without tagging can have part of the radio URI as title.
# In this case we try to use the radio name instead.
try: try:
uri_meta_data = variables["enqueued_transport_uri_meta_data"] uri_meta_data = variables["enqueued_transport_uri_meta_data"]
if isinstance(uri_meta_data, DidlAudioBroadcast) and ( if isinstance(uri_meta_data, DidlAudioBroadcast) and (
self.media.playback_status != SONOS_STATE_PLAYING self.soco.music_source_from_uri(self.media.title) == MUSIC_SRC_RADIO
or self.soco.music_source_from_uri(self.media.title) == MUSIC_SRC_RADIO
or ( or (
isinstance(self.media.title, str) isinstance(self.media.title, str)
and isinstance(self.media.uri, str) and isinstance(self.media.uri, str)
and self.media.title in self.media.uri and (
self.media.title in self.media.uri
or self.media.title in urllib.parse.unquote(self.media.uri)
)
) )
): ):
self.media.title = uri_meta_data.title self.media.title = uri_meta_data.title