Pass unavailable players (#375)
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Sun, 19 Jun 2022 18:52:19 +0000 (20:52 +0200)
committerGitHub <noreply@github.com>
Sun, 19 Jun 2022 18:52:19 +0000 (20:52 +0200)
pass unavailable players

let lib consumer handle unavailable players

music_assistant/controllers/players.py
music_assistant/models/player_queue.py

index a918f0515267138bd4b7278ccc605349edaa2249..f7052d1d7ca9d5f9b6d0b0e5604315e3936db419 100755 (executable)
@@ -40,29 +40,24 @@ class PlayerController:
 
     @property
     def players(self) -> Tuple[Player]:
-        """Return all available players."""
-        return tuple(x for x in self._players.values() if x.available)
+        """Return all registered players."""
+        return tuple(self._players.values())
 
     @property
     def player_queues(self) -> Tuple[PlayerQueue]:
         """Return all available PlayerQueue's."""
-        return tuple(x for x in self._player_queues.values() if x.available)
+        return tuple(self._player_queues.values())
 
     def __iter__(self):
         """Iterate over (available) players."""
-        return iter(x for x in self._players.values() if x.available)
+        return iter(self._players.values())
 
-    def get_player(
-        self, player_id: str, include_unavailable: bool = False
-    ) -> Player | None:
-        """Return Player by player_id or None if not found/unavailable."""
-        if player := self._players.get(player_id):
-            if player.available or include_unavailable:
-                return player
-        return None
+    def get_player(self, player_id: str) -> Player | None:
+        """Return Player by player_id or None if not found."""
+        return self._players.get(player_id)
 
     def get_player_queue(self, queue_id: str) -> PlayerQueue | None:
-        """Return PlayerQueue by id or None if not found/unavailable."""
+        """Return PlayerQueue by id or None if not found."""
         return self._player_queues.get(queue_id)
 
     def get_player_by_name(self, name: str) -> Player | None:
index 171563090d1745216c2e49bd23b409cf6f4d045b..7e63343a8a6e95d400a2c4f12b696c26a5bdfbfa 100644 (file)
@@ -88,7 +88,7 @@ class PlayerQueue:
     @property
     def player(self) -> Player:
         """Return the player attached to this queue."""
-        return self.mass.players.get_player(self.queue_id, include_unavailable=True)
+        return self.mass.players.get_player(self.queue_id)
 
     @property
     def available(self) -> bool: