fix(playback): harden auto-advance for long-track edge cases

cx
This commit is contained in:
vicrodh committed 2026-02-16 20:08:34 -06:00
1 parent 99877fa740
commit c3696f02d4
3 files changed
+51 -4

No files matched your search

+11
View File
@@ -4208,6 +4208,17 @@ pub async fn v2_play_next_gapless(
let bridge_guard = bridge.get().await;
let player = bridge_guard.player();
let current_track_id = player.state.current_track_id();
// Defensive guard: never queue the currently playing track as "next".
// This avoids infinite one-track loops when frontend queue state is stale.
if current_track_id != 0 && current_track_id == track_id {
log::warn!(
"[V2/GAPLESS] Ignoring play_next_gapless for current track {}",
track_id
);
return Ok(false);
}
// Check offline cache (persistent disk cache)
{
+8 -3
View File
@@ -471,12 +471,17 @@ pub fn run() {
};
tokio::time::sleep(sleep_duration).await;
// Only emit if state changed or position advanced
let should_emit = track_id != 0 && (
// Emit when:
// 1) normal in-track state changes/position updates, or
// 2) terminal transition to no-track (track_id becomes 0).
// Case (2) is required so frontend can run end-of-track fallback
// auto-advance paths reliably.
let track_cleared = track_id == 0 && last_track_id != 0;
let should_emit = (track_id != 0 && (
is_playing != last_is_playing
|| track_id != last_track_id
|| (is_playing && position != last_position)
);
)) || track_cleared;
let should_update_mpris = should_emit || (track_id == 0 && last_track_id != 0);
+32 -1
View File
@@ -2892,8 +2892,27 @@
setIsPlaying(false);
return;
}
const previousTrackId = currentTrack?.id ?? null;
const nextTrackResult = await nextTrack();
if (nextTrackResult) {
// Defensive fallback for issue #80:
// if backend returns same track on auto-advance while repeat-one is off,
// force one additional advance attempt to break one-track loops.
if (
previousTrackId !== null &&
nextTrackResult.id === previousTrackId &&
repeatMode !== 'one'
) {
console.warn(
'[Player] Auto-advance returned same track id, forcing one extra nextTrack()',
previousTrackId
);
const forcedNext = await nextTrack();
if (forcedNext && forcedNext.id !== previousTrackId) {
await playQueueTrack(forcedNext);
return;
}
}
await playQueueTrack(nextTrackResult);
} else {
// Queue ended - stop playback and clear player
@@ -2971,7 +2990,19 @@
try {
const queueState = getQueueState();
if (queueState.queue.length > 0) {
return Number(queueState.queue[0].id);
const firstId = Number(queueState.queue[0].id);
const currentId = currentTrack?.id ?? null;
if (!Number.isNaN(firstId) && firstId > 0 && firstId !== currentId) {
return firstId;
}
// Defensive fallback: skip stale first slot if it matches current track.
if (queueState.queue.length > 1) {
const secondId = Number(queueState.queue[1].id);
if (!Number.isNaN(secondId) && secondId > 0 && secondId !== currentId) {
return secondId;
}
}
}
} catch {
// Ignore