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

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

@@ -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

python_linkplay-0.1.1/src/linkplay/__version__.py

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

{python_linkplay-0.0.20 → python_linkplay-0.1.1}/src/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."""

{python_linkplay-0.0.20 → python_linkplay-0.1.1}/src/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(

{python_linkplay-0.0.20 → python_linkplay-0.1.1}/src/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 → python_linkplay-0.1.1/src/python_linkplay.egg-info}/PKG-INFO

@@ -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

python_linkplay-0.0.20/src/linkplay/__version__.py

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