Fix various queue behavior

- Fix add next behavior when shuffle is enabled
- Fix shuffled queue when songs are removed from queue
- Fix queue indices when currently playing song is removed
- Re-shuffle queue after queue is finished when shuffle is enabled

src/renderer/features/context-menu/context-menu-provider.tsx

@@ -44,7 +44,12 @@ import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { useDeletePlaylist } from '/@/renderer/features/playlists';
 import { useRemoveFromPlaylist } from '/@/renderer/features/playlists/mutations/remove-from-playlist-mutation';
 import { useCreateFavorite, useDeleteFavorite, useSetRating } from '/@/renderer/features/shared';
-import { useAuthStore, useCurrentServer, useQueueControls } from '/@/renderer/store';
+import {
+  useAuthStore,
+  useCurrentServer,
+  usePlayerStore,
+  useQueueControls,
+} from '/@/renderer/store';
 import { usePlayerType } from '/@/renderer/store/settings.store';
 import { Play, PlaybackType } from '/@/renderer/types';
 
@@ -558,10 +563,16 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
     const uniqueIds = ctx.dataNodes?.map((row) => row.data.uniqueId);
     if (!uniqueIds?.length) return;
 
+    const currentSong = usePlayerStore.getState().current.song;
     const playerData = removeFromQueue(uniqueIds);
+    const isCurrentSongRemoved = currentSong && uniqueIds.includes(currentSong?.uniqueId);
 
     if (playerType === PlaybackType.LOCAL) {
-      mpvPlayer.setQueueNext(playerData);
+      if (isCurrentSongRemoved) {
+        mpvPlayer.setQueue(playerData);
+      } else {
+        mpvPlayer.setQueueNext(playerData);
+      }
     }
   }, [ctx.dataNodes, playerType, removeFromQueue]);
 

src/renderer/features/now-playing/components/play-queue-list-controls.tsx

@@ -15,7 +15,7 @@ import { Song } from '/@/renderer/api/types';
 import { usePlayerControls, useQueueControls } from '/@/renderer/store';
 import { PlaybackType, TableType } from '/@/renderer/types';
 import { usePlayerType } from '/@/renderer/store/settings.store';
-import { useSetCurrentTime } from '../../../store/player.store';
+import { usePlayerStore, useSetCurrentTime } from '../../../store/player.store';
 import { TableConfigDropdown } from '/@/renderer/components/virtual-table';
 
 const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
@@ -63,10 +63,16 @@ export const PlayQueueListControls = ({ type, tableRef }: PlayQueueListOptionsPr
     const uniqueIds = selectedRows?.map((row) => row.uniqueId);
     if (!uniqueIds?.length) return;
 
+    const currentSong = usePlayerStore.getState().current.song;
     const playerData = removeFromQueue(uniqueIds);
+    const isCurrentSongRemoved = currentSong && uniqueIds.includes(currentSong.uniqueId);
 
     if (playerType === PlaybackType.LOCAL) {
-      mpvPlayer.setQueueNext(playerData);
+      if (isCurrentSongRemoved) {
+        mpvPlayer.setQueue(playerData);
+      } else {
+        mpvPlayer.setQueueNext(playerData);
+      }
     }
   };