Skip to content

Add support for opening camera media source #11633

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
Feb 10, 2022
Merged

Add support for opening camera media source #11633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a884911
Add support for opening camera media source
balloob Feb 10, 2022
bee453a
Update src/data/camera.ts
zsarnett Feb 10, 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
8 changes: 8 additions & 0 deletions src/data/camera.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,11 @@ export const updateCameraPrefs = (
entity_id: entityId,
...prefs,
});

const CAMERA_MEDIA_SOURCE_PREFIX = "media-source://camera/";

export const isCameraMediaSource = (mediaContentId: string) =>
mediaContentId.startsWith(CAMERA_MEDIA_SOURCE_PREFIX);

export const getEntityIdFromCameraMediaSource = (mediaContentId: string) =>
mediaContentId.substring(CAMERA_MEDIA_SOURCE_PREFIX.length);
43 changes: 29 additions & 14 deletions src/panels/media-browser/ha-panel-media-browser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from "lit";
import { customElement, property } from "lit/decorators";
import { LocalStorage } from "../../common/decorators/local-storage";
import { HASSDomEvent } from "../../common/dom/fire_event";
import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
import { navigate } from "../../common/navigate";
import "../../components/ha-menu-button";
import "../../components/ha-icon-button";
Expand All @@ -29,6 +29,10 @@ import type { HomeAssistant, Route } from "../../types";
import "./ha-bar-media-player";
import { showWebBrowserPlayMediaDialog } from "./show-media-player-dialog";
import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
import {
getEntityIdFromCameraMediaSource,
isCameraMediaSource,
} from "../../data/camera";

@customElement("ha-panel-media-browser")
class PanelMediaBrowser extends LitElement {
Expand Down Expand Up @@ -181,23 +185,34 @@ class PanelMediaBrowser extends LitElement {
media_content_id: item.media_content_id,
media_content_type: item.media_content_type,
});
} else if (item.media_content_type.startsWith("audio/")) {
return;
}

if (isCameraMediaSource(item.media_content_id)) {
fireEvent(this, "hass-more-info", {
entityId: getEntityIdFromCameraMediaSource(item.media_content_id),
});
return;
}

if (item.media_content_type.startsWith("audio/")) {
await this.shadowRoot!.querySelector("ha-bar-media-player")!.playItem(
item
);
} else {
const resolvedUrl: any = await resolveMediaSource(
this.hass,
item.media_content_id
);

showWebBrowserPlayMediaDialog(this, {
sourceUrl: resolvedUrl.url,
sourceType: resolvedUrl.mime_type,
title: item.title,
can_play: item.can_play,
});
return;
}

const resolvedUrl: any = await resolveMediaSource(
this.hass,
item.media_content_id
);

showWebBrowserPlayMediaDialog(this, {
sourceUrl: resolvedUrl.url,
sourceType: resolvedUrl.mime_type,
title: item.title,
can_play: item.can_play,
});
}

static get styles(): CSSResultGroup {
Expand Down