python-linkplay 0.0.12__py3-none-any.whl → 0.0.15__py3-none-any.whl

linkplay/__version__.py

@@ -1 +1 @@
-__version__ = '0.0.12'
+__version__ = '0.0.15'

linkplay/bridge.py

@@ -4,6 +4,7 @@ from typing import Any
 
 from linkplay.consts import (
     INPUT_MODE_MAP,
+    LOGGER,
     PLAY_MODE_SEND_MAP,
     ChannelType,
     DeviceAttribute,
@@ -258,11 +259,13 @@ class LinkPlayBridge:
     endpoint: LinkPlayEndpoint
     device: LinkPlayDevice
     player: LinkPlayPlayer
+    multiroom: LinkPlayMultiroom | None
 
     def __init__(self, *, endpoint: LinkPlayEndpoint):
         self.endpoint = endpoint
         self.device = LinkPlayDevice(self)
         self.player = LinkPlayPlayer(self)
+        self.multiroom = None
 
     def __str__(self) -> str:
         if self.device.name == "":
@@ -276,14 +279,20 @@ class LinkPlayBridge:
             "endpoint": self.endpoint.to_dict(),
             "device": self.device.to_dict(),
             "player": self.player.to_dict(),
+            "multiroom": self.multiroom.to_dict() if self.multiroom else None,
         }
 
     async def json_request(self, command: str) -> dict[str, str]:
         """Performs a GET request on the given command and returns the result as a JSON object."""
-        return await self.endpoint.json_request(command)
+        LOGGER.debug(str.format("Request {} at {}", command, self.endpoint))
+        response = await self.endpoint.json_request(command)
+        LOGGER.debug(str.format("Response {}: {}", command, response))
+        return response
 
     async def request(self, command: str) -> None:
         """Performs a GET request on the given command and verifies the result."""
+
+        LOGGER.debug(str.format("Request command at {}: {}", self.endpoint, command))
         await self.endpoint.request(command)
 
 
@@ -298,6 +307,13 @@ class LinkPlayMultiroom:
         self.leader = leader
         self.followers = []
 
+    def to_dict(self):
+        """Return the state of the LinkPlayMultiroom."""
+        return {
+            "leader": self.leader.to_dict(),
+            "followers": [follower.to_dict() for follower in self.followers],
+        }
+
     async def update_status(self, bridges: list[LinkPlayBridge]) -> None:
         """Updates the multiroom status."""
         properties: dict[Any, Any] = await self.leader.json_request(

linkplay/consts.py

@@ -1,7 +1,10 @@
+import logging
 from enum import IntFlag, StrEnum
 
+LOGGER = logging.getLogger("linkplay")
+
 API_ENDPOINT: str = "{}/httpapi.asp?command={}"
-API_TIMEOUT: int = 2
+API_TIMEOUT: int = 5
 UNKNOWN_TRACK_PLAYING: str = "Unknown"
 UPNP_DEVICE_TYPE = "urn:schemas-upnp-org:device:MediaRenderer:1"
 TCPPORT = 8899

linkplay/controller.py

@@ -40,31 +40,40 @@ class LinkPlayController:
     async def discover_multirooms(self) -> None:
         """Attempts to discover multirooms on the local network."""
 
+        # Find and update existing multirooms
+        multirooms = [
+            bridge.multiroom
+            for bridge in self.bridges
+            if bridge.multiroom and bridge.multiroom.leader is bridge
+        ]
+
+        removed_multirooms = []
+        for multiroom in multirooms:
+            for follower in multiroom.followers:
+                follower.multiroom = None
+            await multiroom.update_status(self.bridges)
+            if len(multiroom.followers) > 0:
+                for follower in multiroom.followers:
+                    follower.multiroom = multiroom
+            else:
+                multiroom.leader.multiroom = None
+                removed_multirooms.append(multiroom)
+
         # Create new multirooms from new bridges
-        new_multirooms = []
         for bridge in self.bridges:
-            has_multiroom = any(
-                multiroom for multiroom in self.multirooms if multiroom.leader == bridge
-            )
-
-            if has_multiroom:
+            if bridge.multiroom:
                 continue
 
             multiroom = LinkPlayMultiroom(bridge)
             await multiroom.update_status(self.bridges)
             if len(multiroom.followers) > 0:
-                new_multirooms.append(multiroom)
-
-        # Update existing multirooms
-        for multiroom in self.multirooms:
-            await multiroom.update_status(self.bridges)
+                multirooms.append(multiroom)
+                bridge.multiroom = multiroom
+                for follower in multiroom.followers:
+                    follower.multiroom = multiroom
 
-        # Remove multirooms if they have no followers
-        empty_multirooms = [
-            multiroom for multiroom in self.multirooms if not multiroom.followers
-        ]
-        for empty_multiroom in empty_multirooms:
-            self.multirooms.remove(empty_multiroom)
+        # Remove multirooms with no followers
+        multirooms = [item for item in multirooms if item not in removed_multirooms]
 
-        # Add new multirooms
-        self.multirooms.extend(new_multirooms)
+        # Update multirooms in controller
+        self.multirooms = multirooms

linkplay/utils.py

@@ -24,8 +24,6 @@ from linkplay.consts import (
 )
 from linkplay.exceptions import LinkPlayRequestException
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def session_call_api(endpoint: str, session: ClientSession, command: str) -> str:
     """Calls the LinkPlay API and returns the result as a string.

{python_linkplay-0.0.12.dist-info → python_linkplay-0.0.15.dist-info}/METADATA

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

python_linkplay-0.0.15.dist-info/RECORD

@@ -0,0 +1,15 @@
+linkplay/__init__.py,sha256=y9ZehEq-KhS3cwn-PUpwVSJGfDUx7e5wf_G6guODcTk,56
+linkplay/__main__.py,sha256=Wcza80QaWfOaHjyJEfQYhB9kiPLE0NOqIj4zVWv2Nqs,577
+linkplay/__version__.py,sha256=o8ktXEQwpPz87S9ENy9HQ1pZX4vOWks2rVYTxs5_YVY,23
+linkplay/bridge.py,sha256=A5W8Qgtn9KVNYdhxEmwP9iKoH5YTAknFrKJxDKd5juY,13120
+linkplay/consts.py,sha256=IoIEKT8yUULqtc2dui_5qBFTqx3OD15zzbHAkWHF-wY,13457
+linkplay/controller.py,sha256=i3eLlaZ5pWoGgRT27I564Z9Bmi_aiY9g6lUocXE2qmk,2894
+linkplay/discovery.py,sha256=aEzN_94pKLmHKYIL7DxSW0FYRsaF2ruZe2bwXz0zf5U,4299
+linkplay/endpoint.py,sha256=5Ybr54aroFVEZ6fnFYP41QAuSP7-J9qHYAzLod4S3KY,2459
+linkplay/exceptions.py,sha256=tWJWHsKVkUEq3Yet1Z739IxcaQT8YamDeSp0tqHde9c,107
+linkplay/utils.py,sha256=aU_9TL39ngQaEMhFWMtlwB3POba2GjGlfNBshLFFS90,7788
+python_linkplay-0.0.15.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
+python_linkplay-0.0.15.dist-info/METADATA,sha256=1YOxNR-y7rIZbjipaYnkK_Vot5LK2VPuaY93K7LSOgU,2988
+python_linkplay-0.0.15.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+python_linkplay-0.0.15.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
+python_linkplay-0.0.15.dist-info/RECORD,,

python_linkplay-0.0.12.dist-info/RECORD

@@ -1,15 +0,0 @@
-linkplay/__init__.py,sha256=y9ZehEq-KhS3cwn-PUpwVSJGfDUx7e5wf_G6guODcTk,56
-linkplay/__main__.py,sha256=Wcza80QaWfOaHjyJEfQYhB9kiPLE0NOqIj4zVWv2Nqs,577
-linkplay/__version__.py,sha256=9pBH_sWelBMNY03FEugYdlVXfX9_b6TK-v2lLt7j0dY,23
-linkplay/bridge.py,sha256=Ew9zKOL3bFlXSaxskPcF1ZFPYeZsc9O4gLJHz8K5C3o,12465
-linkplay/consts.py,sha256=fck-MIcJ1MVwkWa5K1dTTWcleRuXs1EO7RY4MwJga8s,13402
-linkplay/controller.py,sha256=IYoXvHh2zhrsRoRG7gwYFoWSIrL5Hl9hR7c2dhGPNX8,2484
-linkplay/discovery.py,sha256=aEzN_94pKLmHKYIL7DxSW0FYRsaF2ruZe2bwXz0zf5U,4299
-linkplay/endpoint.py,sha256=5Ybr54aroFVEZ6fnFYP41QAuSP7-J9qHYAzLod4S3KY,2459
-linkplay/exceptions.py,sha256=tWJWHsKVkUEq3Yet1Z739IxcaQT8YamDeSp0tqHde9c,107
-linkplay/utils.py,sha256=WVKdxITDymLCmKGqlD9Ieyb96qZ-QSC9oIe-KGW4IFU,7827
-python_linkplay-0.0.12.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
-python_linkplay-0.0.12.dist-info/METADATA,sha256=I_YhOhrdEBBE5Ye5h9t6pSpoOaED_CL6yENZRvIv7DE,2988
-python_linkplay-0.0.12.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-python_linkplay-0.0.12.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
-python_linkplay-0.0.12.dist-info/RECORD,,