python-linkplay 0.0.5__tar.gz → 0.0.6__tar.gz

{python_linkplay-0.0.5/src/python_linkplay.egg-info → python_linkplay-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python_linkplay
-Version: 0.0.5
+Version: 0.0.6
 Summary: A Python Library for Seamless LinkPlay Device Control
 Author: Velleman Group nv
 License: MIT
@@ -17,7 +17,7 @@ Requires-Dist: pytest-cov>=4.1.0; extra == "testing"
 Requires-Dist: pytest-mock>=3.10.0; extra == "testing"
 Requires-Dist: pytest-asyncio>=0.23.3; extra == "testing"
 Requires-Dist: mypy>=1.3.0; extra == "testing"
-Requires-Dist: flake8>=6.0.0; extra == "testing"
+Requires-Dist: ruff>=0.5.4; extra == "testing"
 Requires-Dist: tox>=4.6.0; extra == "testing"
 Requires-Dist: typing-extensions>=4.6.3; extra == "testing"
 

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/pyproject.toml

@@ -25,4 +25,7 @@ warn_redundant_casts = true
 warn_return_any = true
 warn_unreachable = true
 warn_unused_configs = true
-no_implicit_reexport = true
+no_implicit_reexport = true
+
+[tool.ruff.lint.extend-per-file-ignores]
+"__init__.py" = ["F401"]

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/setup.cfg

@@ -33,15 +33,10 @@ testing =
 	pytest-mock>=3.10.0
 	pytest-asyncio>=0.23.3
 	mypy>=1.3.0
-	flake8>=6.0.0
+	ruff>=0.5.4
 	tox>=4.6.0
 	typing-extensions>=4.6.3
 
-[flake8]
-max-line-length = 160
-per-file-ignores = 
-	*/__init__.py: F401
-
 [egg_info]
 tag_build = 
 tag_date = 0

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/src/linkplay/__main__.py

@@ -16,5 +16,6 @@ async def main():
         for multiroom in controller.multirooms:
             print(multiroom.followers)
 
+
 if __name__ == "__main__":
     asyncio.run(main())

python_linkplay-0.0.6/src/linkplay/__version__.py

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

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/src/linkplay/bridge.py

@@ -16,17 +16,19 @@ from linkplay.consts import (
     SpeakerType,
     PlayingMode,
     INPUT_MODE_MAP,
-    MultiroomAttribute
+    MultiroomAttribute,
 )
 
 from linkplay.utils import session_call_api_json, session_call_api_ok, decode_hexstr
 
 
-class LinkPlayDevice():
+class LinkPlayDevice:
     """Represents a LinkPlay device."""
 
     bridge: LinkPlayBridge
-    properties: dict[DeviceAttribute, str] = dict.fromkeys(DeviceAttribute.__members__.values(), "")
+    properties: dict[DeviceAttribute, str] = dict.fromkeys(
+        DeviceAttribute.__members__.values(), ""
+    )
 
     def __init__(self, bridge: LinkPlayBridge):
         self.bridge = bridge
@@ -53,7 +55,9 @@ class LinkPlayDevice():
     def playmode_support(self) -> list[PlayingMode]:
         """Returns the player playmode support."""
 
-        flags = InputMode(int(self.properties[DeviceAttribute.PLAYMODE_SUPPORT], base=16))
+        flags = InputMode(
+            int(self.properties[DeviceAttribute.PLAYMODE_SUPPORT], base=16)
+        )
         return [INPUT_MODE_MAP[flag] for flag in flags]
 
     @property
@@ -62,11 +66,13 @@ class LinkPlayDevice():
         return self.properties[DeviceAttribute.ETH_DHCP]
 
 
-class LinkPlayPlayer():
+class LinkPlayPlayer:
     """Represents a LinkPlay player."""
 
     bridge: LinkPlayBridge
-    properties: dict[PlayerAttribute, str] = dict.fromkeys(PlayerAttribute.__members__.values(), "")
+    properties: dict[PlayerAttribute, str] = dict.fromkeys(
+        PlayerAttribute.__members__.values(), ""
+    )
 
     def __init__(self, bridge: LinkPlayBridge):
         self.bridge = bridge
@@ -134,7 +140,9 @@ class LinkPlayPlayer():
 
     async def set_play_mode(self, mode: PlayingMode) -> None:
         """Set the play mode."""
-        await self.bridge.request(LinkPlayCommand.SWITCH_MODE.format(PLAY_MODE_SEND_MAP[mode]))  # type: ignore[str-format]
+        await self.bridge.request(
+            LinkPlayCommand.SWITCH_MODE.format(PLAY_MODE_SEND_MAP[mode])
+        )  # type: ignore[str-format]
 
     @property
     def muted(self) -> bool:
@@ -202,7 +210,7 @@ class LinkPlayPlayer():
         return LoopMode(self.properties[PlayerAttribute.PLAYLIST_MODE])
 
 
-class LinkPlayBridge():
+class LinkPlayBridge:
     """Represents a LinkPlay bridge to control the device and player attached to it."""
 
     protocol: str
@@ -238,7 +246,7 @@ class LinkPlayBridge():
         await session_call_api_ok(self.endpoint, self.session, command)
 
 
-class LinkPlayMultiroom():
+class LinkPlayMultiroom:
     """Represents a LinkPlay multiroom group. Contains a leader and a list of followers.
     The leader is the device that controls the group."""
 
@@ -251,14 +259,21 @@ 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)
+        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]
+        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)
 
     async def ungroup(self) -> None:
@@ -268,12 +283,16 @@ class LinkPlayMultiroom():
 
     async def add_follower(self, follower: LinkPlayBridge) -> None:
         """Adds a follower to the multiroom group."""
-        await follower.request(LinkPlayCommand.MULTIROOM_JOIN.format(self.leader.device.eth))  # type: ignore[str-format]
+        await follower.request(
+            LinkPlayCommand.MULTIROOM_JOIN.format(self.leader.device.eth)
+        )  # type: ignore[str-format]
         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]
+        await self.leader.request(
+            LinkPlayCommand.MULTIROOM_KICK.format(follower.device.eth)
+        )  # type: ignore[str-format]
         self.followers.remove(follower)
 
     async def set_volume(self, value: int) -> None:

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/src/linkplay/consts.py

@@ -3,11 +3,12 @@ from enum import StrEnum, IntFlag
 API_ENDPOINT: str = "{}/httpapi.asp?command={}"
 API_TIMEOUT: int = 2
 UNKNOWN_TRACK_PLAYING: str = "Unknown"
-UPNP_DEVICE_TYPE = 'urn:schemas-upnp-org:device:MediaRenderer:1'
+UPNP_DEVICE_TYPE = "urn:schemas-upnp-org:device:MediaRenderer:1"
 
 
 class LinkPlayCommand(StrEnum):
     """Defines the LinkPlay commands."""
+
     DEVICE_STATUS = "getStatus"
     SYSLOG = "getsyslog"
     UPDATE_SERVER = "GetUpdateServer"
@@ -39,12 +40,14 @@ class LinkPlayCommand(StrEnum):
 
 class SpeakerType(StrEnum):
     """Defines the speaker type."""
+
     MAIN_SPEAKER = "0"
     SUB_SPEAKER = "1"
 
 
 class ChannelType(StrEnum):
     """Defines the channel type."""
+
     STEREO = "0"
     LEFT_CHANNEL = "1"
     RIGHT_CHANNEL = "2"
@@ -52,6 +55,7 @@ class ChannelType(StrEnum):
 
 class PlayingMode(StrEnum):
     """Defines a possible playing mode."""
+
     IDLE = "-1"
     NONE = "0"
     AIRPLAY = "1"
@@ -88,48 +92,51 @@ class PlayingMode(StrEnum):
 
 
 # Map between a play mode and how to activate the play mode
-PLAY_MODE_SEND_MAP: dict[PlayingMode, str] = {     # case sensitive!
-    PlayingMode.NONE: 'Idle',
-    PlayingMode.AIRPLAY: 'Airplay',
-    PlayingMode.DLNA: 'DLNA',
-    PlayingMode.QPLAY: 'QPlay',
-    PlayingMode.NETWORK: 'wifi',
-    PlayingMode.WIIMU_LOCAL: 'udisk',
-    PlayingMode.TF_CARD_1: 'TFcard',
-    PlayingMode.API: 'API',
-    PlayingMode.UDISK: 'udisk',
-    PlayingMode.ALARM: 'Alarm',
-    PlayingMode.SPOTIFY: 'Spotify',
-    PlayingMode.LINE_IN: 'line-in',
-    PlayingMode.BLUETOOTH: 'bluetooth',
-    PlayingMode.OPTICAL: 'optical',
-    PlayingMode.RCA: 'RCA',
-    PlayingMode.COAXIAL: 'co-axial',
-    PlayingMode.FM: 'FM',
-    PlayingMode.LINE_IN_2: 'line-in2',
-    PlayingMode.XLR: 'XLR',
-    PlayingMode.HDMI: 'HDMI',
-    PlayingMode.MIRROR: 'cd',
-    PlayingMode.USB_DAC: 'USB DAC',
-    PlayingMode.TF_CARD_2: 'TFcard',
-    PlayingMode.TALK: 'Talk',
-    PlayingMode.SLAVE: 'Idle',
-    PlayingMode.OPTICAL_2: 'optical2'
+PLAY_MODE_SEND_MAP: dict[PlayingMode, str] = {  # case sensitive!
+    PlayingMode.NONE: "Idle",
+    PlayingMode.AIRPLAY: "Airplay",
+    PlayingMode.DLNA: "DLNA",
+    PlayingMode.QPLAY: "QPlay",
+    PlayingMode.NETWORK: "wifi",
+    PlayingMode.WIIMU_LOCAL: "udisk",
+    PlayingMode.TF_CARD_1: "TFcard",
+    PlayingMode.API: "API",
+    PlayingMode.UDISK: "udisk",
+    PlayingMode.ALARM: "Alarm",
+    PlayingMode.SPOTIFY: "Spotify",
+    PlayingMode.LINE_IN: "line-in",
+    PlayingMode.BLUETOOTH: "bluetooth",
+    PlayingMode.OPTICAL: "optical",
+    PlayingMode.RCA: "RCA",
+    PlayingMode.COAXIAL: "co-axial",
+    PlayingMode.FM: "FM",
+    PlayingMode.LINE_IN_2: "line-in2",
+    PlayingMode.XLR: "XLR",
+    PlayingMode.HDMI: "HDMI",
+    PlayingMode.MIRROR: "cd",
+    PlayingMode.USB_DAC: "USB DAC",
+    PlayingMode.TF_CARD_2: "TFcard",
+    PlayingMode.TALK: "Talk",
+    PlayingMode.SLAVE: "Idle",
+    PlayingMode.OPTICAL_2: "optical2",
 }
 
 
 class LoopMode(StrEnum):
     """Defines the loop mode."""
+
     CONTINOUS_PLAY_ONE_SONG = "-1"
     PLAY_IN_ORDER = "0"
     CONTINUOUS_PLAYBACK = "1"
     RANDOM_PLAYBACK = "2"
     LIST_CYCLE = "3"
-    FOUR = "4"
+    SHUFF_DISABLED_REPEAT_DISABLED = "4"
+    SHUFF_ENABLED_REPEAT_ENABLED_LOOP_ONCE = "5"
 
 
 class EqualizerMode(StrEnum):
     """Defines the equalizer mode."""
+
     NONE = "0"
     CLASSIC = "1"
     POP = "2"
@@ -139,6 +146,7 @@ class EqualizerMode(StrEnum):
 
 class PlayingStatus(StrEnum):
     """Defines the playing status."""
+
     PLAYING = "play"
     LOADING = "load"
     STOPPED = "stop"
@@ -147,12 +155,14 @@ class PlayingStatus(StrEnum):
 
 class MuteMode(StrEnum):
     """Defines the mute mode."""
+
     UNMUTED = "0"
     MUTED = "1"
 
 
 class InputMode(IntFlag):
     """Defines which inputs the player supports."""
+
     LINE_IN = 2
     BLUETOOTH = 4
     USB = 8
@@ -172,12 +182,13 @@ INPUT_MODE_MAP: dict[InputMode, PlayingMode] = {
     InputMode.COAXIAL: PlayingMode.COAXIAL,
     InputMode.LINE_IN_2: PlayingMode.LINE_IN_2,
     InputMode.USB_DAC: PlayingMode.USB_DAC,
-    InputMode.OPTICAL_2: PlayingMode.OPTICAL_2
+    InputMode.OPTICAL_2: PlayingMode.OPTICAL_2,
 }
 
 
 class PlayerAttribute(StrEnum):
     """Defines the player attributes."""
+
     SPEAKER_TYPE = "type"
     CHANNEL_TYPE = "ch"
     PLAYBACK_MODE = "mode"
@@ -199,6 +210,7 @@ class PlayerAttribute(StrEnum):
 
 class DeviceAttribute(StrEnum):
     """Defines the device attributes."""
+
     UUID = "uuid"
     DEVICE_NAME = "DeviceName"
     GROUP_NAME = "GroupName"
@@ -282,6 +294,7 @@ class DeviceAttribute(StrEnum):
 
 class MultiroomAttribute(StrEnum):
     """Defines the player attributes."""
+
     NUM_FOLLOWERS = "slaves"
     FOLLOWER_LIST = "slave_list"
     UUID = "uuid"

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/src/linkplay/controller.py

@@ -4,7 +4,7 @@ from linkplay.bridge import LinkPlayBridge, LinkPlayMultiroom
 from linkplay.discovery import discover_linkplay_bridges
 
 
-class LinkPlayController():
+class LinkPlayController:
     """Represents a LinkPlay controller to manage the devices and multirooms."""
 
     session: ClientSession
@@ -22,7 +22,11 @@ class LinkPlayController():
         # Discover new bridges
         discovered_bridges = await discover_linkplay_bridges(self.session)
         current_bridges = [bridge.device.uuid for bridge in self.bridges]
-        new_bridges = [discovered_bridge for discovered_bridge in discovered_bridges if discovered_bridge.device.uuid not in current_bridges]
+        new_bridges = [
+            discovered_bridge
+            for discovered_bridge in discovered_bridges
+            if discovered_bridge.device.uuid not in current_bridges
+        ]
         self.bridges.extend(new_bridges)
 
     async def discover_multirooms(self) -> None:
@@ -31,7 +35,9 @@ class LinkPlayController():
         # Create new multirooms from new bridges
         new_multirooms = []
         for bridge in self.bridges:
-            has_multiroom = any(multiroom for multiroom in self.multirooms if multiroom.leader == bridge)
+            has_multiroom = any(
+                multiroom for multiroom in self.multirooms if multiroom.leader == bridge
+            )
 
             if has_multiroom:
                 continue
@@ -46,7 +52,9 @@ class LinkPlayController():
             await multiroom.update_status(self.bridges)
 
         # Remove multirooms if they have no followers
-        empty_multirooms = [multiroom for multiroom in self.multirooms if not multiroom.followers]
+        empty_multirooms = [
+            multiroom for multiroom in self.multirooms if not multiroom.followers
+        ]
         for empty_multiroom in empty_multirooms:
             self.multirooms.remove(empty_multiroom)
 

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/src/linkplay/discovery.py

@@ -9,7 +9,9 @@ from linkplay.bridge import LinkPlayBridge
 from linkplay.exceptions import LinkPlayRequestException
 
 
-async def linkplay_factory_bridge(ip_address: str, session: ClientSession) -> LinkPlayBridge | None:
+async def linkplay_factory_bridge(
+    ip_address: str, session: ClientSession
+) -> LinkPlayBridge | None:
     """Attempts to create a LinkPlayBridge from the given IP address.
     Returns None if the device is not an expected LinkPlay device."""
     bridge = LinkPlayBridge("http", ip_address, session)
@@ -21,12 +23,14 @@ async def linkplay_factory_bridge(ip_address: str, session: ClientSession) -> Li
     return bridge
 
 
-async def discover_linkplay_bridges(session: ClientSession, discovery_through_multiroom: bool = True) -> list[LinkPlayBridge]:
+async def discover_linkplay_bridges(
+    session: ClientSession, discovery_through_multiroom: bool = True
+) -> list[LinkPlayBridge]:
     """Attempts to discover LinkPlay devices on the local network."""
     bridges: dict[str, LinkPlayBridge] = {}
 
     async def add_linkplay_device_to_list(upnp_device: CaseInsensitiveDict):
-        ip_address: str | None = upnp_device.get('_host')
+        ip_address: str | None = upnp_device.get("_host")
 
         if not ip_address:
             return
@@ -35,8 +39,7 @@ async def discover_linkplay_bridges(session: ClientSession, discovery_through_mu
             bridges[bridge.device.uuid] = bridge
 
     await async_search(
-        search_target=UPNP_DEVICE_TYPE,
-        async_callback=add_linkplay_device_to_list
+        search_target=UPNP_DEVICE_TYPE, async_callback=add_linkplay_device_to_list
     )
 
     # Discover additional bridges through grouped multirooms
@@ -51,17 +54,22 @@ async def discover_linkplay_bridges(session: ClientSession, discovery_through_mu
     return list(bridges.values())
 
 
-async def discover_bridges_through_multiroom(bridge: LinkPlayBridge,
-                                             session: ClientSession) -> list[LinkPlayBridge]:
+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)
+    properties: dict[Any, Any] = await bridge.json_request(
+        LinkPlayCommand.MULTIROOM_LIST
+    )
 
     if int(properties[MultiroomAttribute.NUM_FOLLOWERS]) == 0:
         return []
 
     followers: list[LinkPlayBridge] = []
     for follower in properties[MultiroomAttribute.FOLLOWER_LIST]:
-        if new_bridge := await linkplay_factory_bridge(follower[MultiroomAttribute.IP], session):
+        if new_bridge := await linkplay_factory_bridge(
+            follower[MultiroomAttribute.IP], session
+        ):
             followers.append(new_bridge)
 
     return followers

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/src/linkplay/utils.py

@@ -34,19 +34,24 @@ async def session_call_api(endpoint: str, session: ClientSession, command: str)
         raise LinkPlayRequestException(f"Error requesting data from '{url}'") from error
 
     if response.status != HTTPStatus.OK:
-        raise LinkPlayRequestException(f"Unexpected HTTPStatus {response.status} received from '{url}'")
+        raise LinkPlayRequestException(
+            f"Unexpected HTTPStatus {response.status} received from '{url}'"
+        )
 
     return await response.text()
 
 
-async def session_call_api_json(endpoint: str, session: ClientSession,
-                                command: str) -> Dict[str, 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
 
 
-async def session_call_api_ok(endpoint: str, session: ClientSession, command: str) -> None:
+async def session_call_api_ok(
+    endpoint: str, session: ClientSession, command: str
+) -> None:
     """Calls the LinkPlay API and checks if the response is OK. Throws exception if not."""
     result = await session_call_api(endpoint, session, command)
 

{python_linkplay-0.0.5 → python_linkplay-0.0.6/src/python_linkplay.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python_linkplay
-Version: 0.0.5
+Version: 0.0.6
 Summary: A Python Library for Seamless LinkPlay Device Control
 Author: Velleman Group nv
 License: MIT
@@ -17,7 +17,7 @@ Requires-Dist: pytest-cov>=4.1.0; extra == "testing"
 Requires-Dist: pytest-mock>=3.10.0; extra == "testing"
 Requires-Dist: pytest-asyncio>=0.23.3; extra == "testing"
 Requires-Dist: mypy>=1.3.0; extra == "testing"
-Requires-Dist: flake8>=6.0.0; extra == "testing"
+Requires-Dist: ruff>=0.5.4; extra == "testing"
 Requires-Dist: tox>=4.6.0; extra == "testing"
 Requires-Dist: typing-extensions>=4.6.3; extra == "testing"
 

{python_linkplay-0.0.5 → python_linkplay-0.0.6}/src/python_linkplay.egg-info/requires.txt

@@ -8,6 +8,6 @@ pytest-cov>=4.1.0
 pytest-mock>=3.10.0
 pytest-asyncio>=0.23.3
 mypy>=1.3.0
-flake8>=6.0.0
+ruff>=0.5.4
 tox>=4.6.0
 typing-extensions>=4.6.3

python_linkplay-0.0.5/src/linkplay/__version__.py

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