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

Remove references to name key in android ip webcam (#99590)

Browse Source
This commit is contained in:
Rami Mosleh 2023-10-06 19:10:32 +03:00 committed by GitHub
parent 86cf2e29b2
commit c8d1a7ff4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/android_ip_webcam/camera.py
View File

@ -5,7 +5,6 @@ from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ( from homeassistant.const import (
CONF_HOST, CONF_HOST,
CONF_NAME,
CONF_PASSWORD, CONF_PASSWORD,
CONF_USERNAME, CONF_USERNAME,
HTTP_BASIC_AUTHENTICATION, HTTP_BASIC_AUTHENTICATION,
@ -39,14 +38,7 @@ class IPWebcamCamera(MjpegCamera):
def __init__(self, coordinator: AndroidIPCamDataUpdateCoordinator) -> None: def __init__(self, coordinator: AndroidIPCamDataUpdateCoordinator) -> None:
"""Initialize the camera.""" """Initialize the camera."""
name = None
# keep imported name until YAML is removed
if CONF_NAME in coordinator.config_entry.data:
name = coordinator.config_entry.data[CONF_NAME]
self._attr_has_entity_name = False
super().__init__( super().__init__(
name=name,
mjpeg_url=coordinator.cam.mjpeg_url, mjpeg_url=coordinator.cam.mjpeg_url,
still_image_url=coordinator.cam.image_url, still_image_url=coordinator.cam.image_url,
authentication=HTTP_BASIC_AUTHENTICATION, authentication=HTTP_BASIC_AUTHENTICATION,
@ -56,5 +48,5 @@ class IPWebcamCamera(MjpegCamera):
self._attr_unique_id = f"{coordinator.config_entry.entry_id}-camera" self._attr_unique_id = f"{coordinator.config_entry.entry_id}-camera"
self._attr_device_info = DeviceInfo( self._attr_device_info = DeviceInfo(
identifiers={(DOMAIN, coordinator.config_entry.entry_id)}, identifiers={(DOMAIN, coordinator.config_entry.entry_id)},
name=name or coordinator.config_entry.data[CONF_HOST], name=coordinator.config_entry.data[CONF_HOST],
) )

5
homeassistant/components/android_ip_webcam/entity.py
View File

@ -19,11 +19,6 @@ class AndroidIPCamBaseEntity(CoordinatorEntity[AndroidIPCamDataUpdateCoordinator
) -> None: ) -> None:
"""Initialize the base entity.""" """Initialize the base entity."""
super().__init__(coordinator) super().__init__(coordinator)
if CONF_NAME in coordinator.config_entry.data:
# name is legacy imported from YAML config
# this block can be removed when removing import from YAML
self._attr_name = f"{coordinator.config_entry.data[CONF_NAME]} {self.entity_description.name}"
self._attr_has_entity_name = False
self.cam = coordinator.cam self.cam = coordinator.cam
self._attr_device_info = DeviceInfo( self._attr_device_info = DeviceInfo(
identifiers={(DOMAIN, coordinator.config_entry.entry_id)}, identifiers={(DOMAIN, coordinator.config_entry.entry_id)},