Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/linkplay/bridge.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

import time
from typing import Any, Callable
from typing import Any, Awaitable, Callable

from linkplay.consts import (
INPUT_MODE_MAP,
Expand Down Expand Up @@ -40,7 +40,7 @@ class LinkPlayDevice:
bridge: LinkPlayBridge
properties: dict[DeviceAttribute, str]

controller: Callable[[], None] | None = None
controller: Callable[[], Awaitable[None]] | None = None

def __init__(self, bridge: LinkPlayBridge):
self.bridge = bridge
Expand All @@ -50,7 +50,7 @@ def to_dict(self):
"""Return the state of the LinkPlayDevice."""
return {"properties": self.properties}

def set_callback(self, controller: Callable[[], None]) -> None:
def set_callback(self, controller: Callable[[], Awaitable[None]]) -> None:
"""Sets a callback function to notify events."""
self.controller = controller

Expand Down Expand Up @@ -177,7 +177,7 @@ async def update_status(self) -> None:
and self.play_mode != PlayingMode.FOLLOWER
)
):
self.bridge.device.controller()
await self.bridge.device.controller()
self.previous_playing_mode = self.play_mode

async def next(self) -> None:
Expand Down
18 changes: 9 additions & 9 deletions tests/linkplay/test_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,18 +505,18 @@ async def test_update_status_triggers_controller_on_mode_change_to_follower(
):
"""Test that update_status triggers the controller when playing mode changes to FOLLOWER."""
player = LinkPlayPlayer(mock_bridge)
mock_bridge.device.controller = Mock()
mock_bridge.device.controller = AsyncMock()

# Simulate initial state
player.previous_playing_mode = PlayingMode.IDLE
mock_bridge.json_request = AsyncMock(
return_value={PlayerAttribute.PLAYBACK_MODE: PlayingMode.FOLLOWER}
)

# Call update_status and verify controller is called
# Call update_status and verify controller is awaited
await player.update_status()

mock_bridge.device.controller.assert_called_once()
mock_bridge.device.controller.assert_awaited_once()


@pytest.mark.asyncio
Expand All @@ -525,25 +525,25 @@ async def test_update_status_triggers_controller_on_mode_change_from_follower(
):
"""Test that update_status triggers the controller when playing mode changes from FOLLOWER."""
player = LinkPlayPlayer(mock_bridge)
mock_bridge.device.controller = Mock()
mock_bridge.device.controller = AsyncMock()

# Simulate initial state
player.previous_playing_mode = PlayingMode.FOLLOWER
mock_bridge.json_request = AsyncMock(
return_value={PlayerAttribute.PLAYBACK_MODE: PlayingMode.IDLE}
)

# Call update_status and verify controller is called
# Call update_status and verify controller is awaited
await player.update_status()

mock_bridge.device.controller.assert_called_once()
mock_bridge.device.controller.assert_awaited_once()


@pytest.mark.asyncio
async def test_update_status_does_not_trigger_controller_on_no_mode_change(mock_bridge):
"""Test that update_status does not trigger the controller when playing mode remains FOLLOWER."""
player = LinkPlayPlayer(mock_bridge)
mock_bridge.device.controller = Mock()
mock_bridge.device.controller = AsyncMock()

# Simulate no change in playing mode
player.previous_playing_mode = PlayingMode.FOLLOWER
Expand All @@ -553,7 +553,7 @@ async def test_update_status_does_not_trigger_controller_on_no_mode_change(mock_

await player.update_status()

mock_bridge.device.controller.assert_not_called()
mock_bridge.device.controller.assert_not_awaited()

player.previous_playing_mode = PlayingMode.IDLE
mock_bridge.json_request = AsyncMock(
Expand All @@ -562,7 +562,7 @@ async def test_update_status_does_not_trigger_controller_on_no_mode_change(mock_

await player.update_status()

mock_bridge.device.controller.assert_not_called()
mock_bridge.device.controller.assert_not_awaited()


async def test_meta_info_failed_handling():
Expand Down