python-linkplay 0.0.20__py3-none-any.whl → 0.1.1__py3-none-any.whl

linkplay/__version__.py

@@ -1 +1 @@
-__version__ = '0.0.20'
+__version__ = '0.1.1'

linkplay/bridge.py

@@ -72,18 +72,12 @@ class LinkPlayDevice:
     @property
     def eth(self) -> str | None:
         """Returns the ethernet address."""
-        eth2 = self.properties.get(DeviceAttribute.ETH2)
-        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)
-        )
+        eth = self.properties.get(DeviceAttribute.ETH2)
+        if eth == "0.0.0.0" or eth is None:
+            eth = self.properties.get(DeviceAttribute.ETH0)
+        if eth == "0.0.0.0" or eth is None:
+            eth = self.properties.get(DeviceAttribute.APCLI0)
+        return eth
 
     async def timesync(self) -> None:
         """Sync the time."""

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,19 @@ 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}"
+        include_port = (protocol == "http" and port != 80) or (
+            protocol == "https" and port != 443
+        )
+        port_suffix = f":{port}" if include_port else ""
+        self._endpoint: str = f"{protocol}://{endpoint}{port_suffix}"
+
         self._session: ClientSession = session
 
     def to_dict(self):

{python_linkplay-0.0.20.dist-info → python_linkplay-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python_linkplay
-Version: 0.0.20
+Version: 0.1.1
 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.1.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=ls1camlIoMxEZz9gSkZ1OJo-MXqHWwKPtdPbZJmwp7E,22
+linkplay/bridge.py,sha256=YyqucmFzqAtmc3ttrQEM4nvMhs6ijxHrAhcDIzH6EE0,14970
+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=_gelW0cDWt0SC8EApwaKIVh_YJIMNiOkfrLR_RYW7aM,2677
+linkplay/exceptions.py,sha256=Kow13uJPSL4y6rXMnkcl_Yp9wH1weOyKw_knd0p-Exc,173
+linkplay/utils.py,sha256=Kmbzw8zC9mV89ZOC5-GNtbiLkgUkuvAEUcsJdRkSY-w,8485
+python_linkplay-0.1.1.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
+python_linkplay-0.1.1.dist-info/METADATA,sha256=IXlP2wGtwhyhIRYpn8i5rvQEVYRHOk-Z0MMA_3mRNYA,2987
+python_linkplay-0.1.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+python_linkplay-0.1.1.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
+python_linkplay-0.1.1.dist-info/RECORD,,

{python_linkplay-0.0.20.dist-info → python_linkplay-0.1.1.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.20.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=OWJaWY0JFPzGIxOCNzOeu5pU5449ij8d2xsJ2vFyXeA,23
-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=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.20.dist-info/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
-python_linkplay-0.0.20.dist-info/METADATA,sha256=Hg0whBUuHM-m4yP5JVi7n19xcsceooEzxoWJGIMsusY,2988
-python_linkplay-0.0.20.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-python_linkplay-0.0.20.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
-python_linkplay-0.0.20.dist-info/RECORD,,