From: Marcel van der Veldt Date: Sun, 19 Jun 2022 18:52:19 +0000 (+0200) Subject: Pass unavailable players (#375) X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=f0644670fbeb3d049b548764e4f98871118681b1;p=music-assistant-server.git Pass unavailable players (#375) pass unavailable players let lib consumer handle unavailable players --- diff --git a/music_assistant/controllers/players.py b/music_assistant/controllers/players.py index a918f051..f7052d1d 100755 --- a/music_assistant/controllers/players.py +++ b/music_assistant/controllers/players.py @@ -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: diff --git a/music_assistant/models/player_queue.py b/music_assistant/models/player_queue.py index 17156309..7e63343a 100644 --- a/music_assistant/models/player_queue.py +++ b/music_assistant/models/player_queue.py @@ -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: