python-linkplay 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

linkplay/__version__.py

@@ -1 +1 @@
-__version__ = '0.0.1'
+__version__ = '0.0.2'

linkplay/consts.py

@@ -285,3 +285,4 @@ class MultiroomAttribute(StrEnum):
     NUM_FOLLOWERS = "slaves"
     FOLLOWER_LIST = "slave_list"
     UUID = "uuid"
+    IP = "ip"

linkplay/discovery.py

@@ -23,7 +23,7 @@ async def linkplay_factory_bridge(ip_address: str, session: ClientSession) -> Li
 
 async def discover_linkplay_bridges(session: ClientSession) -> list[LinkPlayBridge]:
     """Attempts to discover LinkPlay devices on the local network."""
-    devices: list[LinkPlayBridge] = []
+    bridges: dict[str, LinkPlayBridge] = {}
 
     async def add_linkplay_device_to_list(upnp_device: CaseInsensitiveDict):
         ip_address: str | None = upnp_device.get('_host')
@@ -32,19 +32,27 @@ async def discover_linkplay_bridges(session: ClientSession) -> list[LinkPlayBrid
             return
 
         if bridge := await linkplay_factory_bridge(ip_address, session):
-            devices.append(bridge)
+            bridges[bridge.device.uuid] = bridge
 
     await async_search(
         search_target=UPNP_DEVICE_TYPE,
         async_callback=add_linkplay_device_to_list
     )
 
-    return devices
+    # Discover additional bridges through grouped multirooms
+    multiroom_discovered_bridges: dict[str, LinkPlayBridge] = {}
+    for bridge in bridges.values():
+        for new_bridge in await discover_bridges_through_multiroom(bridge, session):
+            multiroom_discovered_bridges[new_bridge.device.uuid] = new_bridge
+
+    bridges = bridges | multiroom_discovered_bridges
+    return list(bridges.values())
 
 
 async def discover_multirooms(bridges: list[LinkPlayBridge]) -> list[LinkPlayMultiroom]:
     """Discovers multirooms through the list of provided bridges."""
     multirooms: list[LinkPlayMultiroom] = []
+    bridges_dict: dict[str, LinkPlayBridge] = {bridge.device.uuid: bridge for bridge in bridges}
 
     for bridge in bridges:
         properties: dict[Any, Any] = await bridge.json_request(LinkPlayCommand.MULTIROOM_LIST)
@@ -54,10 +62,25 @@ async def discover_multirooms(bridges: list[LinkPlayBridge]) -> list[LinkPlayMul
 
         followers: list[LinkPlayBridge] = []
         for follower in properties[MultiroomAttribute.FOLLOWER_LIST]:
-            follower_uuid = follower[MultiroomAttribute.UUID]
-            if follower_bridge := next((b for b in bridges if b.device.uuid == follower_uuid), None):
-                followers.append(follower_bridge)
+            if follower[MultiroomAttribute.UUID] in bridges_dict:
+                followers.append(bridges_dict[follower[MultiroomAttribute.UUID]])
 
         multirooms.append(LinkPlayMultiroom(bridge, followers))
 
     return multirooms
+
+
+async def discover_bridges_through_multiroom(bridge: LinkPlayBridge,
+                                             session: ClientSession) -> list[LinkPlayBridge]:
+    """Discovers bridges through the multiroom of the provided bridge."""
+    properties: dict[Any, Any] = await bridge.json_request(LinkPlayCommand.MULTIROOM_LIST)
+
+    if int(properties[MultiroomAttribute.NUM_FOLLOWERS]) == 0:
+        return []
+
+    followers: list[LinkPlayBridge] = []
+    for follower in properties[MultiroomAttribute.FOLLOWER_LIST]:
+        if new_bridge := await linkplay_factory_bridge(follower[MultiroomAttribute.IP], session):
+            followers.append(new_bridge)
+
+    return followers

linkplay/utils.py

@@ -56,4 +56,7 @@ async def session_call_api_ok(endpoint: str, session: ClientSession, command: st
 
 def decode_hexstr(hexstr: str) -> str:
     """Decode a hex string."""
-    return bytes.fromhex(hexstr).decode("utf-8")
+    try:
+        return bytes.fromhex(hexstr).decode("utf-8")
+    except ValueError:
+        return hexstr

{python_linkplay-0.0.1.dist-info → python_linkplay-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python_linkplay
-Version: 0.0.1
+Version: 0.0.2
 Summary: A Python Library for Seamless LinkPlay Device Control
 Author: Velleman Group nv
 License: MIT

python_linkplay-0.0.2.dist-info/RECORD

@@ -0,0 +1,13 @@
+linkplay/__init__.py,sha256=y9ZehEq-KhS3cwn-PUpwVSJGfDUx7e5wf_G6guODcTk,56
+linkplay/__main__.py,sha256=AiwpQKJIV9HrSqj0qU-a8MKE-AUjbfTrQ6st45U78rE,382
+linkplay/__version__.py,sha256=miSsqPy2PFJ18TW9kocQJLcv4HFpkfQhcTzgAO-GTVE,22
+linkplay/bridge.py,sha256=l5Vvtp2SHF2FYMa67Yf-daRGsErMRXB1GMPzHhwwG6k,10344
+linkplay/consts.py,sha256=KIBGrRQqxd1B4kRO0Vl0e5-UzbMLzJGC_ECohzkSRwQ,7750
+linkplay/discovery.py,sha256=l4vRkkFYwdD8iqbSUHGZ16yBV8RqylkhBNL2zAqXVP0,3428
+linkplay/exceptions.py,sha256=tWJWHsKVkUEq3Yet1Z739IxcaQT8YamDeSp0tqHde9c,107
+linkplay/utils.py,sha256=E_SjIyeK76ishhwuU24m28y1FDAMEj1QbRNt-aHIMdA,2137
+python_linkplay-0.0.2.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
+python_linkplay-0.0.2.dist-info/METADATA,sha256=esFb5Hu0jcGykawjsfEqJk7YpQxU4paUQhwOuCg6eBU,2859
+python_linkplay-0.0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+python_linkplay-0.0.2.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
+python_linkplay-0.0.2.dist-info/RECORD,,

python_linkplay-0.0.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-linkplay/__init__.py,sha256=y9ZehEq-KhS3cwn-PUpwVSJGfDUx7e5wf_G6guODcTk,56
-linkplay/__main__.py,sha256=AiwpQKJIV9HrSqj0qU-a8MKE-AUjbfTrQ6st45U78rE,382
-linkplay/__version__.py,sha256=DsAHdxLC16H2VjdFOU5tBx2xT9VnNQ-XbTS24fRCa_w,22
-linkplay/bridge.py,sha256=l5Vvtp2SHF2FYMa67Yf-daRGsErMRXB1GMPzHhwwG6k,10344
-linkplay/consts.py,sha256=XpRJaPmz39EKFAZrgZEJRloL5lEI3p8jLPgrEJHgbjk,7736
-linkplay/discovery.py,sha256=wmF7fsCd4htr7zHfDRh9z0J2cu1OjK50ZQaBfg3WlaU,2303
-linkplay/exceptions.py,sha256=tWJWHsKVkUEq3Yet1Z739IxcaQT8YamDeSp0tqHde9c,107
-linkplay/utils.py,sha256=L8P7n1JtI0Q62fHV2TC5K03TuPQXesSikXLVje6Av-E,2079
-python_linkplay-0.0.1.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
-python_linkplay-0.0.1.dist-info/METADATA,sha256=-JpSNww6wpyDmpWHdQ-fAZXYBP4cCbPPUpSQCxh6sg0,2859
-python_linkplay-0.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-python_linkplay-0.0.1.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
-python_linkplay-0.0.1.dist-info/RECORD,,