python-linkplay 0.2.0__tar.gz → 0.2.1__tar.gz

{python_linkplay-0.2.0/src/python_linkplay.egg-info → python_linkplay-0.2.1}/PKG-INFO

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

python_linkplay-0.2.1/src/linkplay/__version__.py

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

{python_linkplay-0.2.0 → python_linkplay-0.2.1}/src/linkplay/bridge.py

@@ -23,7 +23,11 @@ from linkplay.consts import (
 from linkplay.endpoint import LinkPlayEndpoint
 from linkplay.exceptions import LinkPlayInvalidDataException
 from linkplay.manufacturers import MANUFACTURER_WIIM, get_info_from_project
-from linkplay.utils import fixup_player_properties
+from linkplay.utils import (
+    equalizer_mode_from_number_mapping,
+    equalizer_mode_to_number_mapping,
+    fixup_player_properties,
+)
 
 
 class LinkPlayDevice:
@@ -117,10 +121,12 @@ class LinkPlayPlayer:
 
     bridge: LinkPlayBridge
     properties: dict[PlayerAttribute, str]
+    custom_properties: dict[PlayerAttribute, str]
 
     def __init__(self, bridge: LinkPlayBridge):
         self.bridge = bridge
         self.properties = dict.fromkeys(PlayerAttribute.__members__.values(), "")
+        self.custom_properties = dict.fromkeys(PlayerAttribute.__members__.values(), "")
 
     def to_dict(self):
         """Return the state of the LinkPlayPlayer."""
@@ -188,38 +194,28 @@ class LinkPlayPlayer:
     async def set_equalizer_mode(self, mode: EqualizerMode) -> None:
         """Set the equalizer mode."""
         if self.bridge.device.manufacturer == MANUFACTURER_WIIM:
-            # WiiM devices have a different equalizer mode handling
-            # and don't support the general equalizer mode command
-            if mode not in self.available_equalizer_modes:
-                raise ValueError(
-                    f"Invalid equalizer mode {mode}. Allowed equalizer modes are {self.available_equalizer_modes}."
-                )
-
-            if mode == EqualizerMode.NONE:
-                await self.bridge.json_request(LinkPlayCommand.WIIM_EQUALIZER_OFF)
-            else:
-                await self.bridge.json_request(
-                    LinkPlayCommand.WIIM_EQ_LOAD.format(mode)
-                )
-            # WiiM doesn't update the property after setting it
-            self.properties[PlayerAttribute.EQUALIZER_MODE] = mode
+            await self._set_wiim_equalizer_mode(mode)
         else:
             await self._set_normal_equalizer_mode(mode)
 
+    async def _set_wiim_equalizer_mode(self, mode: EqualizerMode) -> None:
+        # WiiM devices have a different equalizer mode handling
+        # and don't support the general equalizer mode command
+        if mode not in self.available_equalizer_modes:
+            raise ValueError(
+                f"Invalid equalizer mode {mode}. Allowed equalizer modes are {self.available_equalizer_modes}."
+            )
+
+        if mode == EqualizerMode.NONE:
+            await self.bridge.json_request(LinkPlayCommand.WIIM_EQUALIZER_OFF)
+        else:
+            await self.bridge.json_request(LinkPlayCommand.WIIM_EQ_LOAD.format(mode))
+        # WiiM doesn't update the property after setting it
+        self.custom_properties[PlayerAttribute.EQUALIZER_MODE] = mode
+
     async def _set_normal_equalizer_mode(self, mode: EqualizerMode) -> None:
         """Set the equalizer mode."""
-        equalizer_mode_as_number = None
-        match mode:
-            case EqualizerMode.NONE:
-                equalizer_mode_as_number = "0"
-            case EqualizerMode.CLASSIC:
-                equalizer_mode_as_number = "1"
-            case EqualizerMode.POP:
-                equalizer_mode_as_number = "2"
-            case EqualizerMode.JAZZ:
-                equalizer_mode_as_number = "3"
-            case EqualizerMode.VOCAL:
-                equalizer_mode_as_number = "4"
+        equalizer_mode_as_number = equalizer_mode_to_number_mapping(mode)
         if equalizer_mode_as_number is None:
             raise ValueError(
                 f"Invalid equalizer mode {mode}. Allowed equalizer modes are {self.available_equalizer_modes}."
@@ -317,14 +313,24 @@ class LinkPlayPlayer:
     @property
     def equalizer_mode(self) -> EqualizerMode:
         """Returns the current equalizer mode."""
-        if self.bridge.device.manufacturer == MANUFACTURER_WIIM:
+        try:
+            if self.bridge.device.manufacturer == MANUFACTURER_WIIM:
+                # WiiM devices have a different equalizer mode handling
+                # and will never ever return what equalizer mode they are in
+                return EqualizerMode(
+                    self.custom_properties.get(
+                        PlayerAttribute.EQUALIZER_MODE, EqualizerMode.NONE
+                    )
+                )
+
             return EqualizerMode(
-                self.properties.get(PlayerAttribute.EQUALIZER_MODE, EqualizerMode.NONE)
+                equalizer_mode_from_number_mapping(
+                    self.properties.get(PlayerAttribute.EQUALIZER_MODE)
+                )
+                or EqualizerMode.NONE
             )
-
-        return EqualizerMode(
-            self.properties.get(PlayerAttribute.EQUALIZER_MODE, EqualizerMode.CLASSIC)
-        )
+        except ValueError:
+            return EqualizerMode.NONE
 
     @property
     def available_equalizer_modes(self) -> list[EqualizerMode]:

{python_linkplay-0.2.0 → python_linkplay-0.2.1}/src/linkplay/utils.py

@@ -19,6 +19,7 @@ from linkplay.consts import (
     API_TIMEOUT,
     MTLS_CERTIFICATE_CONTENTS,
     TCP_MESSAGE_LENGTH,
+    EqualizerMode,
     PlayerAttribute,
     PlayingStatus,
 )
@@ -241,3 +242,35 @@ def fixup_player_properties(
         properties[PlayerAttribute.PLAYING_STATUS] = PlayingStatus.STOPPED
 
     return properties
+
+
+def equalizer_mode_to_number_mapping(equalizer_mode: EqualizerMode) -> str | None:
+    """Converts EqualizerMode to a number mapping."""
+    match equalizer_mode:
+        case EqualizerMode.NONE:
+            return "0"
+        case EqualizerMode.CLASSIC:
+            return "1"
+        case EqualizerMode.POP:
+            return "2"
+        case EqualizerMode.JAZZ:
+            return "3"
+        case EqualizerMode.VOCAL:
+            return "4"
+    return None
+
+
+def equalizer_mode_from_number_mapping(value: str | None) -> EqualizerMode | None:
+    """Converts a number mapping to EqualizerMode."""
+    match value:
+        case "0":
+            return EqualizerMode.NONE
+        case "1":
+            return EqualizerMode.CLASSIC
+        case "2":
+            return EqualizerMode.POP
+        case "3":
+            return EqualizerMode.JAZZ
+        case "4":
+            return EqualizerMode.VOCAL
+    return None

{python_linkplay-0.2.0 → python_linkplay-0.2.1/src/python_linkplay.egg-info}/PKG-INFO

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

python_linkplay-0.2.0/src/linkplay/__version__.py

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