Skip to content
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

Fix static path config for HA 2024.7+ #723

Merged
merged 5 commits into from
Sep 8, 2024
Merged

Fix static path config for HA 2024.7+ #723

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc24c6c
await static_path_config
hmmbob Jul 2, 2024
123d669
StaticPath needs HA 2024.7
hmmbob Jul 2, 2024
b1633f9
Fix StaticPathConfig import
hmmbob Jul 11, 2024
4e2ac70
Keep backward compatibility
hmmbob Jul 11, 2024
a0783df
Styling
hmmbob Jul 11, 2024
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
32 changes: 30 additions & 2 deletions custom_components/webrtc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
from homeassistant.helpers.network import get_url
from homeassistant.helpers.template import Template

try:
from homeassistant.components.http import StaticPathConfig
HA_VERSION_BEFORE_2024_7 = False
except ImportError:
HA_VERSION_BEFORE_2024_7 = True

from . import utils
from .utils import DOMAIN, Server

Expand Down Expand Up @@ -60,14 +66,36 @@ async def async_setup(hass: HomeAssistant, config: dict):
# 1. Serve lovelace card
path = Path(__file__).parent / "www"
for name in ("video-rtc.js", "webrtc-camera.js", "digital-ptz.js"):
hass.http.register_static_path("/webrtc/" + name, str(path / name))
if HA_VERSION_BEFORE_2024_7:
hass.http.register_static_path("/webrtc/" + name, str(path / name))
else:
await hass.http.async_register_static_paths(
[
StaticPathConfig(
"/webrtc/" + name,
str(path / name),
True,
)
]
)

# 2. Add card to resources
version = getattr(hass.data["integrations"][DOMAIN], "version", 0)
await utils.init_resource(hass, "/webrtc/webrtc-camera.js", str(version))

# 3. Serve html page
hass.http.register_static_path("/webrtc/embed", str(path / "embed.html"))
if HA_VERSION_BEFORE_2024_7:
hass.http.register_static_path("/webrtc/embed", str(path / "embed.html"))
else:
await hass.http.async_register_static_paths(
[
StaticPathConfig(
"/webrtc/embed",
"/config/custom_components/webrtc/www/embed.html",
True,
)
]
)

# 4. Serve WebSocket API
hass.http.register_view(WebSocketView)
Expand Down
Loading