python-linkplay 0.0.19__py3-none-any.whl → 0.1.0__py3-none-any.whl

linkplay/__version__.py

@@ -1 +1 @@
-__version__ = '0.0.19'
+__version__ = '0.1.0'

linkplay/bridge.py

@@ -73,7 +73,17 @@ 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."""
@@ -370,6 +380,8 @@ class LinkPlayMultiroom:
     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:
@@ -377,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."""

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",

linkplay/discovery.py

@@ -21,7 +21,7 @@ async def linkplay_factory_bridge(
     """Attempts to create a LinkPlayBridge from the given IP address.
     Returns None if the device is not an expected LinkPlay device."""
     endpoint: LinkPlayApiEndpoint = LinkPlayApiEndpoint(
-        protocol="http", endpoint=ip_address, session=session
+        protocol="http", port=80, endpoint=ip_address, session=session
     )
     try:
         return await linkplay_factory_bridge_endpoint(endpoint)
@@ -48,16 +48,22 @@ async def linkplay_factory_httpapi_bridge(
     Attempts to use HTTPS first, then falls back to HTTP.
     Raises LinkPlayRequestException if the device is not an expected LinkPlay device."""
 
-    https_endpoint: LinkPlayApiEndpoint = LinkPlayApiEndpoint(
-        protocol="https", endpoint=ip_address, session=session
-    )
-    try:
-        return await linkplay_factory_bridge_endpoint(https_endpoint)
-    except LinkPlayRequestException:
-        http_endpoint: LinkPlayApiEndpoint = LinkPlayApiEndpoint(
-            protocol="http", endpoint=ip_address, session=session
+    protocol_port_pairs = [("https", 443), ("https", 4443)]
+
+    for protocol, port in protocol_port_pairs:
+        endpoint: LinkPlayApiEndpoint = LinkPlayApiEndpoint(
+            protocol=protocol, port=port, endpoint=ip_address, session=session
         )
-        return await linkplay_factory_bridge_endpoint(http_endpoint)
+
+        try:
+            return await linkplay_factory_bridge_endpoint(endpoint)
+        except LinkPlayRequestException:
+            pass
+
+    http_endpoint: LinkPlayApiEndpoint = LinkPlayApiEndpoint(
+        protocol="http", port=80, endpoint=ip_address, session=session
+    )
+    return await linkplay_factory_bridge_endpoint(http_endpoint)
 
 
 async def discover_linkplay_bridges(

linkplay/endpoint.py

@@ -30,12 +30,14 @@ class LinkPlayEndpoint(ABC):
 class LinkPlayApiEndpoint(LinkPlayEndpoint):
     """Represents a LinkPlay HTTP API endpoint."""
 
-    def __init__(self, *, protocol: str, endpoint: str, session: ClientSession):
+    def __init__(
+        self, *, protocol: str, port: int, endpoint: str, session: ClientSession
+    ):
         assert protocol in [
             "http",
             "https",
         ], "Protocol must be either 'http' or 'https'"
-        self._endpoint: str = f"{protocol}://{endpoint}"
+        self._endpoint: str = f"{protocol}://{endpoint}:{port}"
         self._session: ClientSession = session
 
     def to_dict(self):

{python_linkplay-0.0.19.dist-info → python_linkplay-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python_linkplay
-Version: 0.0.19
+Version: 0.1.0
 Summary: A Python Library for Seamless LinkPlay Device Control
 Author: Velleman Group nv
 License: MIT
@@ -11,7 +11,7 @@ License-File: LICENSE
 Requires-Dist: async-timeout>=4.0.3
 Requires-Dist: aiohttp>=3.8.5
 Requires-Dist: appdirs>=1.4.4
-Requires-Dist: async-upnp-client>=0.36.2
+Requires-Dist: async_upnp_client>=0.36.2
 Requires-Dist: deprecated>=1.2.14
 Requires-Dist: aiofiles>=23.1.0
 Provides-Extra: testing

python_linkplay-0.1.0.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=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
+linkplay/bridge.py,sha256=Xj1YRz0oJJ41Bvjwfa-tMKQNVWgluADryFPTgD18qJM,15059
+linkplay/consts.py,sha256=98VtgV4xOfXWr00yl1DwfmNxDI6Ul5fNPCyLp8ixggE,13535
+linkplay/controller.py,sha256=IBFhnt-VhdIZnI_3OLU6hA8oQa9IZWY7-8cN0uCh3-w,3277
+linkplay/discovery.py,sha256=NnkO9gknp3Cyff7830zBu1LwyhkkWCdhDbEDbAwF8D8,4610
+linkplay/endpoint.py,sha256=PRf00v6sQI8hdTrMdg0qG0JUtsZFe-uCN0Lw1zqI1Lc,2491
+linkplay/exceptions.py,sha256=Kow13uJPSL4y6rXMnkcl_Yp9wH1weOyKw_knd0p-Exc,173
+linkplay/utils.py,sha256=Kmbzw8zC9mV89ZOC5-GNtbiLkgUkuvAEUcsJdRkSY-w,8485
+python_linkplay-0.1.0.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
+python_linkplay-0.1.0.dist-info/METADATA,sha256=ZQ_QkjCcmkmTcBw80ZOVN2tNZi2lEWKZH4z3nFtYSq8,2987
+python_linkplay-0.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+python_linkplay-0.1.0.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
+python_linkplay-0.1.0.dist-info/RECORD,,

{python_linkplay-0.0.19.dist-info → python_linkplay-0.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

python_linkplay-0.0.19.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=Wg0q75xR03Wgtr26_qt1wcsGMmTO6dHkia7eXfDFFKY,23
-linkplay/bridge.py,sha256=e9ObGLhBw7BJp2hUdSXj3qvHh15rC5sSC-Q7vBnEvrQ,14575
-linkplay/consts.py,sha256=5JQ-5CgmbPMBhrxhTb_0APnt1EnYhiNwsHn-68yDiTI,13486
-linkplay/controller.py,sha256=IBFhnt-VhdIZnI_3OLU6hA8oQa9IZWY7-8cN0uCh3-w,3277
-linkplay/discovery.py,sha256=XgzzsOkxtUPu5f7V1KTIqQWP6_UCQncpbWGaVN1lULU,4457
-linkplay/endpoint.py,sha256=5Ybr54aroFVEZ6fnFYP41QAuSP7-J9qHYAzLod4S3KY,2459
-linkplay/exceptions.py,sha256=Kow13uJPSL4y6rXMnkcl_Yp9wH1weOyKw_knd0p-Exc,173
-linkplay/utils.py,sha256=Kmbzw8zC9mV89ZOC5-GNtbiLkgUkuvAEUcsJdRkSY-w,8485
-python_linkplay-0.0.19.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
-python_linkplay-0.0.19.dist-info/METADATA,sha256=P00mdBXZWR0fccBk_aVAHGDuv2pQfyMDeCeTIJLo5p4,2988
-python_linkplay-0.0.19.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-python_linkplay-0.0.19.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
-python_linkplay-0.0.19.dist-info/RECORD,,