vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-06 20:10:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: proper selection of next song when using shuffle and repeat-one (#1932)

Browse Source
This commit is contained in:
mathew4
2026-04-21 09:10:21 +02:00
committed by GitHub
parent ea9119431c
commit 42ded966e4
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/store/player.store.ts
+4 -6
View File
@@ -776,7 +776,7 @@ export const usePlayerStoreBase = createWithEqualityFn<PlayerState>()(
// For nextSong calculation, we need to consider the shuffled order // For nextSong calculation, we need to consider the shuffled order
let nextSong: QueueSong | undefined; let nextSong: QueueSong | undefined;
if (isShuffleEnabled(state)) { if (isShuffleEnabled(state) && repeat !== PlayerRepeat.ONE) {
// Calculate next in shuffled order // Calculate next in shuffled order
const nextShuffledIndex = index + 1; const nextShuffledIndex = index + 1;
if (nextShuffledIndex < state.queue.shuffled.length) { if (nextShuffledIndex < state.queue.shuffled.length) {
@@ -925,7 +925,7 @@ export const usePlayerStoreBase = createWithEqualityFn<PlayerState>()(
const currentSong = queue.items[currentQueueIndex]; const currentSong = queue.items[currentQueueIndex];
let nextSong: QueueSong | undefined; let nextSong: QueueSong | undefined;
if (isShuffle) { if (isShuffle && repeat !== PlayerRepeat.ONE) {
const nextShuffledIndex = nextPlaybackIndex + 1; const nextShuffledIndex = nextPlaybackIndex + 1;
if (nextShuffledIndex < stateSnapshot.queue.shuffled.length) { if (nextShuffledIndex < stateSnapshot.queue.shuffled.length) {
const nextQueueIndex = stateSnapshot.queue.shuffled[nextShuffledIndex]; const nextQueueIndex = stateSnapshot.queue.shuffled[nextShuffledIndex];
@@ -933,8 +933,6 @@ export const usePlayerStoreBase = createWithEqualityFn<PlayerState>()(
} else if (repeat === PlayerRepeat.ALL) { } else if (repeat === PlayerRepeat.ALL) {
const firstQueueIndex = stateSnapshot.queue.shuffled[0]; const firstQueueIndex = stateSnapshot.queue.shuffled[0];
nextSong = queue.items[firstQueueIndex]; nextSong = queue.items[firstQueueIndex];
} else if (repeat === PlayerRepeat.ONE) {
nextSong = currentSong;
} }
} else { } else {
nextSong = calculateNextSong(currentQueueIndex, queue.items, repeat); nextSong = calculateNextSong(currentQueueIndex, queue.items, repeat);
@@ -1733,7 +1731,7 @@ export const subscribeNextSongInsertion = (onChange: (song: QueueSong | undefine
// Calculate next song based on shuffle and repeat settings // Calculate next song based on shuffle and repeat settings
let nextSong: QueueSong | undefined; let nextSong: QueueSong | undefined;
if (isShuffleEnabled(state)) { if (isShuffleEnabled(state) && repeat !== PlayerRepeat.ONE) {
// Calculate next in shuffled order // Calculate next in shuffled order
const nextShuffledIndex = state.player.index + 1; const nextShuffledIndex = state.player.index + 1;
if (nextShuffledIndex < state.queue.shuffled.length) { if (nextShuffledIndex < state.queue.shuffled.length) {
@@ -1940,7 +1938,7 @@ export const usePlayerData = (): PlayerData => {
// For nextSong calculation, we need to consider the shuffled order // For nextSong calculation, we need to consider the shuffled order
let nextSong: QueueSong | undefined; let nextSong: QueueSong | undefined;
if (isShuffleEnabled(state)) { if (isShuffleEnabled(state) && repeat !== PlayerRepeat.ONE) {
// Calculate next in shuffled order // Calculate next in shuffled order
const nextShuffledIndex = index + 1; const nextShuffledIndex = index + 1;
if (nextShuffledIndex < state.queue.shuffled.length) { if (nextShuffledIndex < state.queue.shuffled.length) {