CaZzzer/amqtrain
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix play now

Browse Source
This commit is contained in:
Yura
2026-02-10 01:48:02 -08:00
parent c8220eec02
commit 9f0234e00e
1 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/lib/player/store.svelte.ts
View File

@@ -109,11 +109,16 @@ class PlayerStore {
if (existingIdx !== -1) { if (existingIdx !== -1) {
if (playNow) { if (playNow) {
this.playNext(track);
this.playId(track.id); this.playId(track.id);
} }
return; return;
} }
if (playNow) {
this.playNext(track);
this.playId(track.id);
} else {
// Add to end // Add to end
this.queue.push(track); this.queue.push(track);
@@ -121,12 +126,11 @@ class PlayerStore {
this.shuffledIndices.push(this.queue.length - 1); this.shuffledIndices.push(this.queue.length - 1);
} }
if (playNow) { if (this.queue.length === 1 && !this.currentId) {
this.playId(track.id);
} else if (this.queue.length === 1 && !this.currentId) {
this.currentId = track.id; this.currentId = track.id;
} }
} }
}
playNext(track: Track) { playNext(track: Track) {
const existingIdx = this.queue.findIndex((t) => t.id === track.id); const existingIdx = this.queue.findIndex((t) => t.id === track.id);
@@ -248,23 +252,35 @@ class PlayerStore {
} }
prev() { prev() {
// If history has > 1 item, go back if (this.queue.length === 0) return;
if (this.history.length > 1) {
// Pop current let prevIdxInQueue: number | null = null;
this.history.pop(); const currentIdx = this.currentIndex;
const prevId = this.history[this.history.length - 1];
if (this.hasTrack(prevId)) { if (this.isShuffled) {
this.currentId = prevId; const currentShufflePos = this.shuffledIndices.indexOf(currentIdx);
} else { if (currentShufflePos > 0) {
// Track removed? fallback prevIdxInQueue = this.shuffledIndices[currentShufflePos - 1];
this.history.pop(); // Remove invalid } else if (this.repeatMode === "all" && this.shuffledIndices.length > 0) {
this.prev(); // Recurse // Wrap to end? Or just stop.
// For now let's stop at start if not wrapping.
// If repeat all, wrap to end?
prevIdxInQueue = this.shuffledIndices[this.shuffledIndices.length - 1];
} }
} else { } else {
// Restart current song? if (currentIdx > 0) {
// Handled by UI usually (calling audio.currentTime = 0), prevIdxInQueue = currentIdx - 1;
// but here we just seek to 0 if we could. } else if (this.repeatMode === "all" && this.queue.length > 0) {
// Store doesn't control audio element directly. prevIdxInQueue = this.queue.length - 1;
}
}
if (prevIdxInQueue !== null) {
this.playId(this.queue[prevIdxInQueue]?.id);
} else {
// At start of queue.
// Just seek to 0? Store doesn't control audio.
// If we can't go back, we do nothing (UI likely handles the seek-to-0 comparison).
} }
} }