From 031756ef3273aee37bbd23a3dcfaafae2a4739d0 Mon Sep 17 00:00:00 2001
From: Alex X <alexey.khit@gmail.com>
Date: Sun, 7 Apr 2024 11:25:45 +0300
Subject: [PATCH] DashCast code refactoring

---
 custom_components/webrtc/__init__.py |  2 +-
 custom_components/webrtc/utils.py    | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/custom_components/webrtc/__init__.py b/custom_components/webrtc/__init__.py
index add87a2..3063594 100644
--- a/custom_components/webrtc/__init__.py
+++ b/custom_components/webrtc/__init__.py
@@ -108,7 +108,7 @@ async def dash_cast(call: ServiceCallType):
             hass,
             call.data[ATTR_ENTITY_ID],
             f"{get_url(hass)}/webrtc/embed?" + urlencode(query),
-            call.data.get("force"),
+            call.data.get("force", False),
         )
 
     hass.services.async_register(DOMAIN, "create_link", create_link, CREATE_LINK_SCHEMA)
diff --git a/custom_components/webrtc/utils.py b/custom_components/webrtc/utils.py
index 48208e8..65a25d6 100644
--- a/custom_components/webrtc/utils.py
+++ b/custom_components/webrtc/utils.py
@@ -169,29 +169,24 @@ async def init_resource(hass: HomeAssistant, url: str, ver: str) -> bool:
 
 
 # noinspection PyProtectedMember
-def dash_cast(hass: HomeAssistant, cast_entities: list, url: str, force=False):
+def dash_cast(hass: HomeAssistant, entities: list, url: str, force: bool):
     """Cast webpage to chromecast device via DashCast application."""
     try:
-        entities = [
-            e
-            for e in hass.data[DATA_INSTANCES]["media_player"].entities
-            if e.entity_id in cast_entities and getattr(e, "_chromecast", 0)
-        ]
-        if not entities:
-            _LOGGER.warning(f"Can't find {cast_entities} for DashCast")
-
-        for entity in entities:
-            from pychromecast.controllers.dashcast import DashCastController
+        for entity in hass.data[DATA_INSTANCES]["media_player"].entities:
+            if entity.entity_id not in entities or not hasattr(entity, "_chromecast"):
+                continue
 
             if not hasattr(entity, "dashcast"):
+                from pychromecast.controllers.dashcast import DashCastController
+
                 entity.dashcast = DashCastController()
                 entity._chromecast.register_handler(entity.dashcast)
 
             _LOGGER.debug(f"DashCast to {entity.entity_id}")
-            entity.dashcast.load_url(url, force = force)
+            entity.dashcast.load_url(url, force=force)
 
-    except Exception:
-        _LOGGER.exception(f"Can't DashCast to {cast_entities}")
+    except Exception as e:
+        _LOGGER.error(f"Can't DashCast to {entities}", exc_info=e)
 
 
 def validate_signed_request(request: web.Request) -> bool: