mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 21:27:38 +00:00
Use new SsdpServiceInfo location in remaining components (#136053)
This commit is contained in:
parent
877e44e3c9
commit
f7f6c1163d
@ -33,6 +33,7 @@ from homeassistant.const import CONF_DEVICE_ID, CONF_MAC, CONF_TYPE, CONF_URL
|
|||||||
from homeassistant.core import CoreState, HomeAssistant
|
from homeassistant.core import CoreState, HomeAssistant
|
||||||
from homeassistant.helpers import device_registry as dr, entity_registry as er
|
from homeassistant.helpers import device_registry as dr, entity_registry as er
|
||||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
||||||
|
from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
|
||||||
|
|
||||||
from .const import (
|
from .const import (
|
||||||
CONF_BROWSE_UNFILTERED,
|
CONF_BROWSE_UNFILTERED,
|
||||||
@ -246,7 +247,7 @@ class DlnaDmrEntity(MediaPlayerEntity):
|
|||||||
await self._device_disconnect()
|
await self._device_disconnect()
|
||||||
|
|
||||||
async def async_ssdp_callback(
|
async def async_ssdp_callback(
|
||||||
self, info: ssdp.SsdpServiceInfo, change: ssdp.SsdpChange
|
self, info: SsdpServiceInfo, change: ssdp.SsdpChange
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Handle notification from SSDP of device state change."""
|
"""Handle notification from SSDP of device state change."""
|
||||||
_LOGGER.debug(
|
_LOGGER.debug(
|
||||||
|
@ -29,6 +29,7 @@ from homeassistant.config_entries import ConfigEntry
|
|||||||
from homeassistant.const import CONF_DEVICE_ID, CONF_URL
|
from homeassistant.const import CONF_DEVICE_ID, CONF_URL
|
||||||
from homeassistant.core import HomeAssistant, callback
|
from homeassistant.core import HomeAssistant, callback
|
||||||
from homeassistant.helpers import aiohttp_client
|
from homeassistant.helpers import aiohttp_client
|
||||||
|
from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
|
||||||
|
|
||||||
from .const import (
|
from .const import (
|
||||||
CONF_SOURCE_ID,
|
CONF_SOURCE_ID,
|
||||||
@ -220,7 +221,7 @@ class DmsDeviceSource:
|
|||||||
await self.device_disconnect()
|
await self.device_disconnect()
|
||||||
|
|
||||||
async def async_ssdp_callback(
|
async def async_ssdp_callback(
|
||||||
self, info: ssdp.SsdpServiceInfo, change: ssdp.SsdpChange
|
self, info: SsdpServiceInfo, change: ssdp.SsdpChange
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Handle notification from SSDP of device state change."""
|
"""Handle notification from SSDP of device state change."""
|
||||||
LOGGER.debug(
|
LOGGER.debug(
|
||||||
|
@ -34,6 +34,7 @@ from homeassistant.helpers import (
|
|||||||
)
|
)
|
||||||
from homeassistant.helpers.dispatcher import async_dispatcher_send
|
from homeassistant.helpers.dispatcher import async_dispatcher_send
|
||||||
from homeassistant.helpers.event import async_call_later, async_track_time_interval
|
from homeassistant.helpers.event import async_call_later, async_track_time_interval
|
||||||
|
from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
|
||||||
from homeassistant.helpers.typing import ConfigType
|
from homeassistant.helpers.typing import ConfigType
|
||||||
from homeassistant.util.async_ import create_eager_task
|
from homeassistant.util.async_ import create_eager_task
|
||||||
|
|
||||||
@ -500,7 +501,7 @@ class SonosDiscoveryManager:
|
|||||||
|
|
||||||
@callback
|
@callback
|
||||||
def _async_ssdp_discovered_player(
|
def _async_ssdp_discovered_player(
|
||||||
self, info: ssdp.SsdpServiceInfo, change: ssdp.SsdpChange
|
self, info: SsdpServiceInfo, change: ssdp.SsdpChange
|
||||||
) -> None:
|
) -> None:
|
||||||
uid = info.upnp[ssdp.ATTR_UPNP_UDN]
|
uid = info.upnp[ssdp.ATTR_UPNP_UDN]
|
||||||
if not uid.startswith("uuid:RINCON_"):
|
if not uid.startswith("uuid:RINCON_"):
|
||||||
@ -529,7 +530,7 @@ class SonosDiscoveryManager:
|
|||||||
def async_discovered_player(
|
def async_discovered_player(
|
||||||
self,
|
self,
|
||||||
source: str,
|
source: str,
|
||||||
info: ssdp.SsdpServiceInfo,
|
info: SsdpServiceInfo,
|
||||||
discovered_ip: str,
|
discovered_ip: str,
|
||||||
uid: str,
|
uid: str,
|
||||||
boot_seqnum: str | int | None,
|
boot_seqnum: str | int | None,
|
||||||
|
@ -13,6 +13,7 @@ from homeassistant.const import Platform
|
|||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.exceptions import ConfigEntryNotReady
|
from homeassistant.exceptions import ConfigEntryNotReady
|
||||||
from homeassistant.helpers import device_registry as dr
|
from homeassistant.helpers import device_registry as dr
|
||||||
|
from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
|
||||||
|
|
||||||
from .const import (
|
from .const import (
|
||||||
CONFIG_ENTRY_FORCE_POLL,
|
CONFIG_ENTRY_FORCE_POLL,
|
||||||
@ -49,10 +50,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool
|
|||||||
|
|
||||||
# Register device discovered-callback.
|
# Register device discovered-callback.
|
||||||
device_discovered_event = asyncio.Event()
|
device_discovered_event = asyncio.Event()
|
||||||
discovery_info: ssdp.SsdpServiceInfo | None = None
|
discovery_info: SsdpServiceInfo | None = None
|
||||||
|
|
||||||
async def device_discovered(
|
async def device_discovered(
|
||||||
headers: ssdp.SsdpServiceInfo, change: ssdp.SsdpChange
|
headers: SsdpServiceInfo, change: ssdp.SsdpChange
|
||||||
) -> None:
|
) -> None:
|
||||||
if change == ssdp.SsdpChange.BYEBYE:
|
if change == ssdp.SsdpChange.BYEBYE:
|
||||||
return
|
return
|
||||||
|
@ -16,10 +16,11 @@ from async_upnp_client.search import SsdpSearchListener
|
|||||||
from async_upnp_client.utils import CaseInsensitiveDict
|
from async_upnp_client.utils import CaseInsensitiveDict
|
||||||
|
|
||||||
from homeassistant import config_entries
|
from homeassistant import config_entries
|
||||||
from homeassistant.components import network, ssdp
|
from homeassistant.components import network
|
||||||
from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
|
from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
|
||||||
from homeassistant.helpers import discovery_flow
|
from homeassistant.helpers import discovery_flow
|
||||||
from homeassistant.helpers.event import async_call_later, async_track_time_interval
|
from homeassistant.helpers.event import async_call_later, async_track_time_interval
|
||||||
|
from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
|
||||||
from homeassistant.util.async_ import create_eager_task
|
from homeassistant.util.async_ import create_eager_task
|
||||||
|
|
||||||
from .const import (
|
from .const import (
|
||||||
@ -171,7 +172,7 @@ class YeelightScanner:
|
|||||||
self._hass,
|
self._hass,
|
||||||
DOMAIN,
|
DOMAIN,
|
||||||
context={"source": config_entries.SOURCE_SSDP},
|
context={"source": config_entries.SOURCE_SSDP},
|
||||||
data=ssdp.SsdpServiceInfo(
|
data=SsdpServiceInfo(
|
||||||
ssdp_usn="",
|
ssdp_usn="",
|
||||||
ssdp_st=SSDP_ST,
|
ssdp_st=SSDP_ST,
|
||||||
ssdp_headers=response,
|
ssdp_headers=response,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user