From: Marcel van der Veldt Date: Thu, 15 Jun 2023 23:36:02 +0000 (+0200) Subject: Fix a few small issues with enqueuing of items (#720) X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=f01dfd17117bb814ca58d5b335425ed68b0b284e;p=music-assistant-server.git Fix a few small issues with enqueuing of items (#720) * Fix: queue items lost when enabling shuffle mode * update queue items in queue object --- diff --git a/music_assistant/server/controllers/player_queues.py b/music_assistant/server/controllers/player_queues.py index e4347b97..20377c41 100755 --- a/music_assistant/server/controllers/player_queues.py +++ b/music_assistant/server/controllers/player_queues.py @@ -98,7 +98,7 @@ class PlayerQueuesController: queue.shuffle_enabled = shuffle_enabled queue_items = self._queue_items[queue_id] - cur_index = queue.index_in_buffer + cur_index = queue.index_in_buffer or queue.current_index if cur_index is not None: next_index = cur_index + 1 next_items = queue_items[next_index:] @@ -262,6 +262,7 @@ class PlayerQueuesController: if queue.current_index is None: queue.current_index = 0 queue.current_item = self.get_item(queue_id, 0) + queue.items = len(queue_items) self.signal_update(queue_id) @api_command("players/queue/move_item") @@ -705,6 +706,7 @@ class PlayerQueuesController: def update_items(self, queue_id: str, queue_items: list[QueueItem]) -> None: """Update the existing queue items, mostly caused by reordering.""" self._queue_items[queue_id] = queue_items + self._queues[queue_id].items = len(self._queue_items[queue_id]) self.signal_update(queue_id, True) # Helper methods