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

linkplay/__main__.py

@@ -1,14 +1,19 @@
 import asyncio
 import aiohttp
 
-from linkplay.discovery import discover_linkplay_bridges, discover_multirooms
+from linkplay.controller import LinkPlayController
 
 
 async def main():
     async with aiohttp.ClientSession() as session:
-        bridges = await discover_linkplay_bridges(session)
-        multirooms = await discover_multirooms(bridges)
-        return bridges, multirooms
+        controller = LinkPlayController(session)
+        await controller.discover()
+
+        for bridge in controller.bridges:
+            print(bridge)
+
+        for multiroom in controller.multirooms:
+            print(multiroom.followers)
 
 if __name__ == "__main__":
     asyncio.run(main())

linkplay/__version__.py

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

linkplay/bridge.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-
+from typing import Any
 from aiohttp import ClientSession
 
 from linkplay.consts import (
@@ -15,8 +15,10 @@ from linkplay.consts import (
     InputMode,
     SpeakerType,
     PlayingMode,
-    INPUT_MODE_MAP
+    INPUT_MODE_MAP,
+    MultiroomAttribute
 )
+
 from linkplay.utils import session_call_api_json, session_call_api_ok, decode_hexstr
 
 
@@ -243,9 +245,21 @@ class LinkPlayMultiroom():
     leader: LinkPlayBridge
     followers: list[LinkPlayBridge]
 
-    def __init__(self, leader: LinkPlayBridge, followers: list[LinkPlayBridge]):
+    def __init__(self, leader: LinkPlayBridge):
         self.leader = leader
-        self.followers = followers
+        self.followers = []
+
+    async def update_status(self, bridges: list[LinkPlayBridge]) -> None:
+        """Updates the multiroom status."""
+        properties: dict[Any, Any] = await self.leader.json_request(LinkPlayCommand.MULTIROOM_LIST)
+
+        self.followers = []
+        if int(properties[MultiroomAttribute.NUM_FOLLOWERS]) == 0:
+            return
+
+        follower_uuids = [follower[MultiroomAttribute.UUID] for follower in properties[MultiroomAttribute.FOLLOWER_LIST]]
+        new_followers = [bridge for bridge in bridges if bridge.device.uuid in follower_uuids]
+        self.followers.extend(new_followers)
 
     async def ungroup(self) -> None:
         """Ungroups the multiroom group."""

linkplay/consts.py

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

linkplay/controller.py

@@ -0,0 +1,34 @@
+from aiohttp import ClientSession
+
+from linkplay.bridge import LinkPlayBridge, LinkPlayMultiroom
+from linkplay.discovery import discover_linkplay_bridges
+
+
+class LinkPlayController():
+    """Represents a LinkPlay controller to manage the devices and multirooms."""
+
+    session: ClientSession
+    bridges: list[LinkPlayBridge]
+    multirooms: list[LinkPlayMultiroom]
+
+    def __init__(self, session: ClientSession):
+        self.session = session
+        self.bridges = []
+        self.multirooms = []
+
+    async def discover(self) -> None:
+        """Attempts to discover LinkPlay devices on the local network."""
+
+        # Discover new bridges
+        discovered_bridges = await discover_linkplay_bridges(self.session)
+        current_bridges = [bridge.device.uuid for bridge in self.bridges]
+        new_bridges = [discovered_bridge for discovered_bridge in discovered_bridges if discovered_bridge.device.uuid not in current_bridges]
+        self.bridges.extend(new_bridges)
+
+        # Create new multirooms
+        for new_bridge in new_bridges:
+            self.multirooms.append(LinkPlayMultiroom(new_bridge))
+
+        # Update multirooms
+        for multiroom in self.multirooms:
+            await multiroom.update_status(self.bridges)

linkplay/discovery.py

@@ -5,7 +5,7 @@ from async_upnp_client.search import async_search
 from async_upnp_client.utils import CaseInsensitiveDict
 
 from linkplay.consts import UPNP_DEVICE_TYPE, LinkPlayCommand, MultiroomAttribute
-from linkplay.bridge import LinkPlayBridge, LinkPlayMultiroom
+from linkplay.bridge import LinkPlayBridge
 from linkplay.exceptions import LinkPlayRequestException
 
 
@@ -21,9 +21,9 @@ async def linkplay_factory_bridge(ip_address: str, session: ClientSession) -> Li
     return bridge
 
 
-async def discover_linkplay_bridges(session: ClientSession) -> list[LinkPlayBridge]:
+async def discover_linkplay_bridges(session: ClientSession, discovery_through_multiroom: bool = True) -> 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,32 +32,36 @@ 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
+    if discovery_through_multiroom:
+        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
 
-async def discover_multirooms(bridges: list[LinkPlayBridge]) -> list[LinkPlayMultiroom]:
-    """Discovers multirooms through the list of provided bridges."""
-    multirooms: list[LinkPlayMultiroom] = []
+    return list(bridges.values())
 
-    for bridge in bridges:
-        properties: dict[Any, Any] = await bridge.json_request(LinkPlayCommand.MULTIROOM_LIST)
 
-        if int(properties[MultiroomAttribute.NUM_FOLLOWERS]) == 0:
-            continue
+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)
 
-        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 int(properties[MultiroomAttribute.NUM_FOLLOWERS]) == 0:
+        return []
 
-        multirooms.append(LinkPlayMultiroom(bridge, followers))
+    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 multirooms
+    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.3.dist-info}/METADATA

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

python_linkplay-0.0.3.dist-info/RECORD

@@ -0,0 +1,14 @@
+linkplay/__init__.py,sha256=y9ZehEq-KhS3cwn-PUpwVSJGfDUx7e5wf_G6guODcTk,56
+linkplay/__main__.py,sha256=hVlIhEeSfIRlTjNsDXVMSAtOatbUqqIMdXPxdwBBE1c,447
+linkplay/__version__.py,sha256=yyLtGsBhynC-sSHdax-rRGvHNjH-gdWxIY68WnPVfDw,22
+linkplay/bridge.py,sha256=NX02ZBcbaz7yZv1EeFvQ9CAUh5jVcuSABtpKIY4aj74,10948
+linkplay/consts.py,sha256=KIBGrRQqxd1B4kRO0Vl0e5-UzbMLzJGC_ECohzkSRwQ,7750
+linkplay/controller.py,sha256=Rp92CQdpwreH-I132DrxogiZ_I8NngdmCeXzfQYAFMQ,1244
+linkplay/discovery.py,sha256=NIUC3FVPH-FcHvMmojJw0s0w2Q-WCuulGrQA-PDLcsw,2642
+linkplay/exceptions.py,sha256=tWJWHsKVkUEq3Yet1Z739IxcaQT8YamDeSp0tqHde9c,107
+linkplay/utils.py,sha256=E_SjIyeK76ishhwuU24m28y1FDAMEj1QbRNt-aHIMdA,2137
+python_linkplay-0.0.3.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
+python_linkplay-0.0.3.dist-info/METADATA,sha256=ifK_uu-ZBe81Wcqo8YoIObMiuPQ6ub1QUio7Mnm5JYE,2859
+python_linkplay-0.0.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+python_linkplay-0.0.3.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
+python_linkplay-0.0.3.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,,