python-linkplay 0.0.18__tar.gz → 0.0.20__tar.gz

{python_linkplay-0.0.18/src/python_linkplay.egg-info → python_linkplay-0.0.20}/PKG-INFO

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

python_linkplay-0.0.20/src/linkplay/__version__.py

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

{python_linkplay-0.0.18 → python_linkplay-0.0.20}/src/linkplay/bridge.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import time
 from typing import Any
 
 from linkplay.consts import (
@@ -20,6 +21,7 @@ from linkplay.consts import (
     SpeakerType,
 )
 from linkplay.endpoint import LinkPlayEndpoint
+from linkplay.exceptions import LinkPlayInvalidDataException
 from linkplay.utils import fixup_player_properties
 
 
@@ -71,7 +73,22 @@ class LinkPlayDevice:
     def eth(self) -> str | None:
         """Returns the ethernet address."""
         eth2 = self.properties.get(DeviceAttribute.ETH2)
-        return eth2 if eth2 else self.properties.get(DeviceAttribute.APCLI0)
+        eth0 = self.properties.get(DeviceAttribute.ETH0)
+        for eth in [eth2, eth0]:
+            if eth == "0.0.0.0":
+                eth = None
+        return (
+            eth2
+            if eth2
+            else eth0
+            if eth0
+            else self.properties.get(DeviceAttribute.APCLI0)
+        )
+
+    async def timesync(self) -> None:
+        """Sync the time."""
+        timestamp = time.strftime("%Y%m%d%H%M%S")
+        await self.bridge.request(LinkPlayCommand.TIMESYNC.format(timestamp))
 
 
 class LinkPlayPlayer:
@@ -172,12 +189,14 @@ class LinkPlayPlayer:
             )
         await self.bridge.request(LinkPlayCommand.PLAY_PRESET.format(preset_number))
 
-    async def timesync(self) -> None:
-        """Sync the time."""
-        import time
-
-        timestamp = time.strftime("%Y%m%d%H%M%S")
-        await self.bridge.request(LinkPlayCommand.TIMESYNC.format(timestamp))
+    async def seek(self, position: int) -> None:
+        """Seek to a position."""
+        if (
+            self.total_length_in_seconds > 0
+            and position >= 0
+            and position <= self.total_length_in_seconds
+        ):
+            await self.bridge.request(LinkPlayCommand.SEEK.format(position))
 
     @property
     def muted(self) -> bool:
@@ -217,6 +236,16 @@ class LinkPlayPlayer:
         """Returns the total length of the track in milliseconds."""
         return int(self.properties.get(PlayerAttribute.TOTAL_LENGTH, 0))
 
+    @property
+    def current_position_in_seconds(self) -> int:
+        """Returns the current position of the track in seconds."""
+        return int(int(self.properties.get(PlayerAttribute.CURRENT_POSITION, 0)) / 1000)
+
+    @property
+    def total_length_in_seconds(self) -> int:
+        """Returns the total length of the track in seconds."""
+        return int(int(self.properties.get(PlayerAttribute.TOTAL_LENGTH, 0)) / 1000)
+
     @property
     def status(self) -> PlayingStatus:
         """Returns the current playing status."""
@@ -328,26 +357,31 @@ class LinkPlayMultiroom:
 
     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
-        )
+        try:
+            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)
+            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)
+        except LinkPlayInvalidDataException as exc:
+            LOGGER.exception(exc)
 
     async def ungroup(self) -> None:
         """Ungroups the multiroom group."""
         await self.leader.request(LinkPlayCommand.MULTIROOM_UNGROUP)
+        for follewer in self.followers:
+            follewer.multiroom = None
         self.followers = []
 
     async def add_follower(self, follower: LinkPlayBridge) -> None:
@@ -355,14 +389,18 @@ class LinkPlayMultiroom:
         await follower.request(
             LinkPlayCommand.MULTIROOM_JOIN.format(self.leader.device.eth)
         )  # type: ignore[str-format]
-        self.followers.append(follower)
+        if follower not in self.followers:
+            follower.multiroom = self
+            self.followers.append(follower)
 
     async def remove_follower(self, follower: LinkPlayBridge) -> None:
         """Removes a follower from the multiroom group."""
         await self.leader.request(
             LinkPlayCommand.MULTIROOM_KICK.format(follower.device.eth)
         )  # type: ignore[str-format]
-        self.followers.remove(follower)
+        if follower in self.followers:
+            follower.multiroom = None
+            self.followers.remove(follower)
 
     async def set_volume(self, value: int) -> None:
         """Sets the volume for the multiroom group."""

{python_linkplay-0.0.18 → python_linkplay-0.0.20}/src/linkplay/consts.py

@@ -145,6 +145,7 @@ class PlayingMode(StrEnum):
     HTTP_MAX = "29"
     ALARM = "30"
     SPOTIFY = "31"
+    TIDAL = "32"
     LINE_IN = "40"
     BLUETOOTH = "41"
     OPTICAL = "43"
@@ -179,6 +180,7 @@ PLAY_MODE_SEND_MAP: dict[PlayingMode, str] = {  # case sensitive!
     PlayingMode.UDISK: "udisk",
     PlayingMode.ALARM: "Alarm",
     PlayingMode.SPOTIFY: "Spotify",
+    PlayingMode.TIDAL: "Tidal",
     PlayingMode.LINE_IN: "line-in",
     PlayingMode.BLUETOOTH: "bluetooth",
     PlayingMode.OPTICAL: "optical",

{python_linkplay-0.0.18 → python_linkplay-0.0.20}/src/linkplay/controller.py

@@ -1,7 +1,9 @@
 from aiohttp import ClientSession
 
 from linkplay.bridge import LinkPlayBridge, LinkPlayMultiroom
+from linkplay.consts import LOGGER
 from linkplay.discovery import discover_linkplay_bridges
+from linkplay.exceptions import LinkPlayInvalidDataException
 
 
 class LinkPlayController:
@@ -49,28 +51,35 @@ class LinkPlayController:
 
         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:
+            try:
                 for follower in multiroom.followers:
-                    follower.multiroom = multiroom
-            else:
-                multiroom.leader.multiroom = None
-                removed_multirooms.append(multiroom)
+                    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)
+            except LinkPlayInvalidDataException as exc:
+                LOGGER.exception(exc)
 
         # Create new multirooms from new bridges
         for bridge in self.bridges:
             if bridge.multiroom:
                 continue
 
-            multiroom = LinkPlayMultiroom(bridge)
-            await multiroom.update_status(self.bridges)
-            if len(multiroom.followers) > 0:
-                multirooms.append(multiroom)
-                bridge.multiroom = multiroom
-                for follower in multiroom.followers:
-                    follower.multiroom = multiroom
+            try:
+                multiroom = LinkPlayMultiroom(bridge)
+                await multiroom.update_status(self.bridges)
+                if len(multiroom.followers) > 0:
+                    multirooms.append(multiroom)
+                    bridge.multiroom = multiroom
+                    for follower in multiroom.followers:
+                        follower.multiroom = multiroom
+            except LinkPlayInvalidDataException as exc:
+                LOGGER.exception(exc)
 
         # Remove multirooms with no followers
         multirooms = [item for item in multirooms if item not in removed_multirooms]

{python_linkplay-0.0.18 → python_linkplay-0.0.20}/src/linkplay/discovery.py

@@ -8,7 +8,7 @@ from deprecated import deprecated
 from linkplay.bridge import LinkPlayBridge
 from linkplay.consts import UPNP_DEVICE_TYPE, LinkPlayCommand, MultiroomAttribute
 from linkplay.endpoint import LinkPlayApiEndpoint, LinkPlayEndpoint
-from linkplay.exceptions import LinkPlayRequestException
+from linkplay.exceptions import LinkPlayInvalidDataException, LinkPlayRequestException
 
 
 @deprecated(
@@ -98,21 +98,24 @@ 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
-    )
+    try:
+        properties: dict[Any, Any] = await bridge.json_request(
+            LinkPlayCommand.MULTIROOM_LIST
+        )
 
-    if int(properties[MultiroomAttribute.NUM_FOLLOWERS]) == 0:
+        if int(properties[MultiroomAttribute.NUM_FOLLOWERS]) == 0:
+            return []
+
+        followers: list[LinkPlayBridge] = []
+        for follower in properties[MultiroomAttribute.FOLLOWER_LIST]:
+            try:
+                new_bridge = await linkplay_factory_httpapi_bridge(
+                    follower[MultiroomAttribute.IP], session
+                )
+                followers.append(new_bridge)
+            except LinkPlayRequestException:
+                pass
+
+        return followers
+    except LinkPlayInvalidDataException:
         return []
-
-    followers: list[LinkPlayBridge] = []
-    for follower in properties[MultiroomAttribute.FOLLOWER_LIST]:
-        try:
-            new_bridge = await linkplay_factory_httpapi_bridge(
-                follower[MultiroomAttribute.IP], session
-            )
-            followers.append(new_bridge)
-        except LinkPlayRequestException:
-            pass
-
-    return followers

{python_linkplay-0.0.18 → python_linkplay-0.0.20}/src/linkplay/exceptions.py

@@ -4,3 +4,7 @@ class LinkPlayException(Exception):
 
 class LinkPlayRequestException(LinkPlayException):
     pass
+
+
+class LinkPlayInvalidDataException(LinkPlayException):
+    pass

{python_linkplay-0.0.18 → python_linkplay-0.0.20}/src/linkplay/utils.py

@@ -22,7 +22,7 @@ from linkplay.consts import (
     PlayerAttribute,
     PlayingStatus,
 )
-from linkplay.exceptions import LinkPlayRequestException
+from linkplay.exceptions import LinkPlayInvalidDataException, LinkPlayRequestException
 
 
 async def session_call_api(endpoint: str, session: ClientSession, command: str) -> str:
@@ -61,9 +61,28 @@ async def session_call_api(endpoint: str, session: ClientSession, command: str)
 async def session_call_api_json(
     endpoint: str, session: ClientSession, command: str
 ) -> dict[str, str]:
-    """Calls the LinkPlay API and returns the result as a JSON object."""
-    result = await session_call_api(endpoint, session, command)
-    return json.loads(result)  # type: ignore
+    """Calls the LinkPlay API and returns the result as a JSON object
+
+    Args:
+        endpoint (str): The endpoint to use.
+        session (ClientSession): The client session to use.
+        command (str): The command to use.
+
+    Raises:
+        LinkPlayRequestException: Thrown when the request fails (timeout, error http status).
+        LinkPlayInvalidDataException: Thrown when the request has succeeded with invalid json.
+
+    Returns:
+        str: The response of the API call.
+    """
+    try:
+        result = await session_call_api(endpoint, session, command)
+        return json.loads(result)  # type: ignore
+    except json.JSONDecodeError as jsonexc:
+        url = API_ENDPOINT.format(endpoint, command)
+        raise LinkPlayInvalidDataException(
+            f"Unexpected JSON ({result}) received from '{url}'"
+        ) from jsonexc
 
 
 async def session_call_api_ok(

{python_linkplay-0.0.18 → python_linkplay-0.0.20/src/python_linkplay.egg-info}/PKG-INFO

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

python_linkplay-0.0.18/src/linkplay/__version__.py

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