python-linkplay 0.0.11__tar.gz → 0.0.14__tar.gz

{python_linkplay-0.0.11/src/python_linkplay.egg-info → python_linkplay-0.0.14}/PKG-INFO

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

python_linkplay-0.0.14/src/linkplay/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.0.14'

{python_linkplay-0.0.11 → python_linkplay-0.0.14}/src/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,
@@ -130,6 +131,11 @@ class LinkPlayPlayer:
         await self.bridge.request(LinkPlayCommand.PAUSE)
         self.properties[PlayerAttribute.PLAYING_STATUS] = PlayingStatus.PAUSED
 
+    async def stop(self) -> None:
+        """Stop the current playing track and remove the selected source."""
+        await self.bridge.request(LinkPlayCommand.STOP)
+        self.properties[PlayerAttribute.PLAYING_STATUS] = PlayingStatus.STOPPED
+
     async def toggle(self) -> None:
         """Start playing if the player is currently not playing. Stops playing if it is."""
         await self.bridge.request(LinkPlayCommand.TOGGLE)
@@ -230,9 +236,12 @@ class LinkPlayPlayer:
     @property
     def play_mode(self) -> PlayingMode:
         """Returns the current playing mode of the player."""
-        return PlayingMode(
-            self.properties.get(PlayerAttribute.PLAYBACK_MODE, PlayingMode.IDLE)
-        )
+        try:
+            return PlayingMode(
+                self.properties.get(PlayerAttribute.PLAYBACK_MODE, PlayingMode.IDLE)
+            )
+        except ValueError:
+            return PlayingMode(PlayingMode.IDLE)
 
     @property
     def loop_mode(self) -> LoopMode:
@@ -250,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 == "":
@@ -268,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)
 
 
@@ -290,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(

{python_linkplay-0.0.11 → python_linkplay-0.0.14}/src/linkplay/consts.py

@@ -1,5 +1,8 @@
+import logging
 from enum import IntFlag, StrEnum
 
+LOGGER = logging.getLogger("linkplay")
+
 API_ENDPOINT: str = "{}/httpapi.asp?command={}"
 API_TIMEOUT: int = 2
 UNKNOWN_TRACK_PLAYING: str = "Unknown"
@@ -79,6 +82,7 @@ class LinkPlayCommand(StrEnum):
     VOLUME = "setPlayerCmd:vol:{}"
     PLAYLIST = "setPlayerCmd:playlist:uri:{}"
     PAUSE = "setPlayerCmd:pause"
+    STOP = "setPlayerCmd:stop"
     TOGGLE = "setPlayerCmd:onepause"
     EQUALIZER_MODE = "setPlayerCmd:equalizer:{}"
     LOOP_MODE = "setPlayerCmd:loopmode:{}"

{python_linkplay-0.0.11 → python_linkplay-0.0.14}/src/linkplay/controller.py

@@ -40,31 +40,36 @@ 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]
+
+        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

{python_linkplay-0.0.11 → python_linkplay-0.0.14}/src/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.11 → python_linkplay-0.0.14/src/python_linkplay.egg-info}/PKG-INFO

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

python_linkplay-0.0.11/src/linkplay/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.0.11'