Skip to content

Hide hidden media player entities in media panel #12766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zsarnett merged 2 commits into from
May 24, 2022
Merged

Hide hidden media player entities in media panel #12766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebe07cb
Hide hidden media player entities in media panel
balloob May 24, 2022
06deecb
Prettier
balloob May 24, 2022
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
33 changes: 31 additions & 2 deletions src/panels/media-browser/ha-bar-media-player.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
mdiStop,
mdiVolumeHigh,
} from "@mdi/js";
import { UnsubscribeFunc } from "home-assistant-js-websocket";
import {
css,
CSSResultGroup,
Expand All @@ -32,6 +33,7 @@ import "../../components/ha-button-menu";
import "../../components/ha-circular-progress";
import "../../components/ha-icon-button";
import { UNAVAILABLE_STATES } from "../../data/entity";
import { subscribeEntityRegistry } from "../../data/entity_registry";
import {
BROWSER_PLAYER,
cleanupMediaTitle,
Expand All @@ -51,6 +53,7 @@ import {
} from "../../data/media-player";
import { ResolvedMediaSource } from "../../data/media_source";
import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
import { SubscribeMixin } from "../../mixins/subscribe-mixin";
import type { HomeAssistant } from "../../types";
import "../lovelace/components/hui-marquee";
import {
Expand All @@ -65,7 +68,7 @@ declare global {
}

@customElement("ha-bar-media-player")
export class BarMediaPlayer extends LitElement {
export class BarMediaPlayer extends SubscribeMixin(LitElement) {
@property({ attribute: false }) public hass!: HomeAssistant;

@property({ attribute: false }) public entityId!: string;
Expand All @@ -83,6 +86,9 @@ export class BarMediaPlayer extends LitElement {

@state() private _browserPlayer?: BrowserMediaPlayer;

@state()
private _hiddenEntities = new Set<string>();

private _progressInterval?: number;

private _browserPlayerVolume = 0.8;
Expand Down Expand Up @@ -461,7 +467,8 @@ export class BarMediaPlayer extends LitElement {
return Object.values(this.hass!.states).filter(
(entity) =>
computeStateDomain(entity) === "media_player" &&
supportsFeature(entity, SUPPORT_BROWSE_MEDIA)
supportsFeature(entity, SUPPORT_BROWSE_MEDIA) &&
!this._hiddenEntities.has(entity.entity_id)
);
}

Expand All @@ -487,6 +494,28 @@ export class BarMediaPlayer extends LitElement {
}
}

protected override hassSubscribe(): (
| UnsubscribeFunc
| Promise<UnsubscribeFunc>
)[] {
return [
subscribeEntityRegistry(this.hass.connection, (entries) => {
const hiddenEntities = new Set<string>();

for (const entry of entries) {
if (
entry.hidden_by &&
computeDomain(entry.entity_id) === "media_player"
) {
hiddenEntities.add(entry.entity_id);
}
}

this._hiddenEntities = hiddenEntities;
}),
];
}

private _handleControlClick(e: MouseEvent): void {
const action = (e.currentTarget! as HTMLElement).getAttribute("action")!;

Expand Down