Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
- [Изменение языка Алисы](#изменение-языка-алисы)
- [Несколько TTS в конфиге](#несколько-tts-в-конфиге)
- [Звук Яндекс.Станции по HDMI](#звук-яндексстанции-по-hdmi)
- [Тип контента ТВ и Кинопоиска](#тип-контента-тв-и-кинопоиска)
- [Управление яркостью экрана станции Макс](#управление-яркостью-станции-макс)
- [Поиск и устранение проблем](#troubleshooting)
- [Полезные автоматизации](#полезные-автоматизации)
Expand Down Expand Up @@ -973,6 +974,22 @@ script:
source: HDMI
```

## Тип контента ТВ и Кинопоиска

При локальном подключении атрибут `media_content_type` показывает, что воспроизводится:

- `music` и `radio` — музыка и радио;
- `channel` — эфирный телеканал;
- `movie` — фильм;
- `tvshow` — серия, с названием сериала в `media_series_title`;
- `video` — другое видео; если формат не распознан, тип остаётся неизвестным.

На YaOS фоновая музыка не перебивает карточку открытого видео, в том числе на паузе. Громкость и состояние Алисы обновляются как обычно, а запуск музыки сразу переключает карточку на трек. Play в HA продолжает Кинопоиск после паузы через сценарий `player_continue`, без голосовых реплик Алисы. Для музыки сохраняется обычная команда `play`.

Проверено на Станции Макс с YaOS 3.364.14 через сервисы HA; другие модели и прошивки отдельно не проверялись. Пауза прямого эфира этим исправлением не добавляется.

**Для старых прошивок:** неразмеченный `ru.yandex.quasar.app` теперь получает `video` вместо `tvshow`. Если карточки или автоматизации проверяли именно `tvshow`, их условия может понадобиться изменить.

## Управление яркостью экрана станции Макс

**Только для Яндекс.Станции Макс**
Expand Down
150 changes: 104 additions & 46 deletions custom_components/yandex_station/core/yandex_station.py
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@ def update_device_info(self, sw_version: str):

@callback
def async_set_state(self, data: dict):
self._local_media_accepted = False
if data is None:
if self._attr_assumed_state:
return
Expand Down Expand Up @@ -556,16 +557,48 @@ def async_set_state(self, data: dict):

state = data["state"]
state.pop("timeSinceLastVoiceActivity", None)

# skip same state
previous = self.local_state or {}
current_player = previous.get("playerState") or {}
incoming_player = state.get("playerState") or {}
current_type = current_player.get("playerType")
screen_closed = (
state.get("playing") is False
and incoming_player.get("showPlayer") is False
and all(incoming_player.get(key) == "" for key in ("playerType", "type", "id", "title"))
)
retain_media = (
current_type in ("com.yandex.tv.videoplayer", "com.yandex.tv.live")
and incoming_player.get("playerType") == "music_thin"
and state.get("playing") is False
and incoming_player.get("showPlayer") is True
) or (
screen_closed
and current_type == "music_thin"
and current_player.get("showPlayer") is True
)
if retain_media:
# Keep selected media, but accept the speaker's volume/Alice state.
selected = (
{**current_player, "showPlayer": False}
if screen_closed else current_player
)
state = {**state, "playerState": selected, "playing": previous["playing"]}
elif screen_closed:
# A populated but cleared playerState is idle, not an unknown pause.
state = {**state, "playerState": {}}

self._local_media_accepted = not retain_media
media_changed = not retain_media and (
self.local_state is None
or previous.get("playerState") != state.get("playerState")
or previous.get("playing") != state.get("playing")
)
if sw_version := data.get("softwareVersion"):
self.update_device_info(sw_version)
if self.local_state == state:
return

self.local_state = state

if sw_version := data.get("softwareVersion"):
self.update_device_info(sw_version)

# возвращаем из состояния mute, если нужно
# if self.prev_volume and state['volume']:
# self.prev_volume = None
Expand All @@ -577,8 +610,22 @@ def async_set_state(self, data: dict):
self._attr_assumed_state = False
self._attr_available = True
self._attr_should_poll = False
self._attr_supported_features = LOCAL_FEATURES
if media_changed:
self._update_local_player(state)

if isinstance(state["volume"], float):
if state["volume"] > 0:
self._attr_is_volume_muted = False
self._attr_volume_level = state["volume"]
else:
self._attr_is_volume_muted = True

if self.hass:
self.async_write_ha_state()

@callback
def _update_local_player(self, state: dict):
self._attr_supported_features = LOCAL_FEATURES
# optional attributes for local mode
self._attr_media_artist = None
self._attr_media_channel = None
Expand All @@ -597,19 +644,31 @@ def async_set_state(self, data: dict):
if player_state["duration"]:
self._attr_supported_features |= MediaPlayerEntityFeature.SEEK

# https://github.com/home-assistant/frontend/blob/dev/src/data/media-player.ts
# supported computeMediaDescription: music/image/playlist/tvshow/channel
if player_state["type"] == "Track":
self._attr_media_artist = player_state["subtitle"] or None
# Audio first, then live TV, explicit VOD types and generic video.
content_type = player_state.get("type")
player_type = player_state.get("playerType")
subtitle = player_state.get("subtitle") or None
if content_type == "Track":
self._attr_media_artist = subtitle
self._attr_media_content_type = MediaType.MUSIC
elif player_state["type"] == "FmRadio":
elif content_type == "FmRadio":
self._attr_media_content_type = "radio"
elif player_state["liveStreamText"] == "Прямой эфир":
self._attr_media_channel = player_state["subtitle"] or None
elif (
player_type in ("com.yandex.tv.live", "live")
or player_state.get("liveStreamText") == "Прямой эфир"
):
self._attr_media_channel = subtitle
self._attr_media_content_type = MediaType.CHANNEL
elif player_state["playerType"] == "ru.yandex.quasar.app":
elif content_type == "movie":
self._attr_media_content_type = MediaType.MOVIE
elif content_type == "tv_show_episode":
self._attr_media_content_type = MediaType.TVSHOW
self._attr_media_series_title = player_state["subtitle"] or None
self._attr_media_series_title = subtitle
elif (
content_type == "video"
or player_type in ("com.yandex.tv.videoplayer", "ru.yandex.quasar.app")
):
self._attr_media_content_type = MediaType.VIDEO

if player_state["playlistType"] == "Track":
self._attr_media_playlist = MediaType.TRACK
Expand Down Expand Up @@ -659,16 +718,6 @@ def async_set_state(self, data: dict):
self._attr_media_title = None
self._attr_state = MediaPlayerState.IDLE

if isinstance(state["volume"], float):
if state["volume"] > 0:
self._attr_is_volume_muted = False
self._attr_volume_level = state["volume"]
else:
self._attr_is_volume_muted = True

if self.hass:
self.async_write_ha_state()

# BASE MEDIA PLAYER FUNCTIONS

@property
Expand Down Expand Up @@ -780,6 +829,14 @@ async def async_media_play(self):
)
return

player_type = (self.local_state.get("playerState") or {}).get("playerType")
if player_type in ("com.yandex.tv.videoplayer", "com.yandex.tv.live"):
# YaOS video uses the continue scenario; play targets the audio player.
await self.glagol.send(
utils.update_form("personal_assistant.scenarios.player_continue")
)
return

await self.glagol.send({"command": "play"})

else:
Expand Down Expand Up @@ -1105,28 +1162,29 @@ async def async_media_seek(self, position):
def async_set_state(self, data: dict):
super().async_set_state(data)

if not self.sync_enabled or data is None or "playerState" not in data["state"]:
if not self.sync_enabled or data is None:
return

state = data["state"]
player_state = state["playerState"]

if self.sync_playing != data["state"]["playing"]:
self.sync_playing = data["state"]["playing"]
if self.sync_playing:
if self.sync_id == player_state["id"]:
# продолжаем играть, если ID не изменился
self.sync_service_call("media_play")
else:
# останавливаем, если ничего не играет
self.sync_service_call("media_pause")

# Состояние проверяем для исправления бага Станция Макс 2020
# https://github.com/AlexxIT/YandexStation/issues/819
# https://github.com/AlexxIT/YandexStation/issues/835
if self.sync_id != player_state["id"] and data["state"]["playing"]:
self.sync_id = player_state["id"]
self.hass.create_task(self.sync_play_media(data))
state = self.local_state
player_state = state.get("playerState") or {}
# Common speaker fields still apply when this frame's media was rejected.
if self._local_media_accepted and "playing" in state:
if self.sync_playing != state["playing"]:
self.sync_playing = state["playing"]
if self.sync_playing:
if player_state and self.sync_id == player_state["id"]:
# продолжаем играть, если ID не изменился
self.sync_service_call("media_play")
else:
# останавливаем, если ничего не играет
self.sync_service_call("media_pause")

# Состояние проверяем для исправления бага Станция Макс 2020
# https://github.com/AlexxIT/YandexStation/issues/819
# https://github.com/AlexxIT/YandexStation/issues/835
if player_state and self.sync_id != player_state["id"] and state["playing"]:
self.sync_id = player_state["id"]
self.hass.create_task(self.sync_play_media(data))

if state["volume"] and self.sync_volume != state["volume"]:
self.sync_volume = state["volume"]
Expand Down
Loading
Loading