itlxrd/Psychotoxical-psysonic
1
0
Fork 0
mirror of https://github.com/Psychotoxical/psysonic.git synced 2026-07-22 07:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(queue): Lucky Mix uses one undo snapshot for Ctrl+Z (#728)

Browse Source 
Many prune/play/enqueue steps exhausted QUEUE_UNDO_MAX and dropped the
pre-mix snapshot. Push undo once before the macro rebuild; add skipQueueUndo
for enqueue and pruneUpcomingToCurrent; Lucky Mix playTrack uses manual=false.

CHANGELOG: document fix under 1.46.0 Fixed (PR #728).
This commit is contained in:
cucadmuh
2026-05-15 21:32:04 +03:00
committed by GitHub
parent c16134dab5
commit 603660d407
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/store/playerStoreTypes.ts
+5 -3
View File
@@ -107,7 +107,8 @@ export interface PlayerState {
updateReplayGainForCurrentTrack: () => void;
reanalyzeLoudnessForTrack: (trackId: string) => Promise<void>;
setProgress: (t: number, duration: number) => void;
enqueue: (tracks: Track[], _orbitConfirmed?: boolean) => void;
/** `_orbitConfirmed` bypasses the bulk-append gate. `skipQueueUndo` skips the undo snapshot (macro builders such as Lucky Mix push once up-front). */
enqueue: (tracks: Track[], _orbitConfirmed?: boolean, skipQueueUndo?: boolean) => void;
enqueueAt: (tracks: Track[], insertIndex: number, _orbitConfirmed?: boolean) => void;
/** "Play Next" — inserts after the current track. When
* `preservePlayNextOrder` is on, appends to the existing Play-Next streak
@@ -117,8 +118,9 @@ export interface PlayerState {
playNext: (tracks: Track[]) => void;
enqueueRadio: (tracks: Track[], artistId?: string) => void;
setRadioArtistId: (artistId: string) => void;
/** For Lucky Mix: drop upcoming tail; keep the currently playing item only. */
pruneUpcomingToCurrent: () => void;
/** For Lucky Mix: drop upcoming tail; keep the currently playing item only.
* When `skipQueueUndo` is true, callers must push undo separately (macro rebuild). */
pruneUpcomingToCurrent: (skipQueueUndo?: boolean) => void;
clearQueue: () => void;
isQueueVisible: boolean;
src/store/queueMutationActions.ts
+8 -6
View File
@@ -36,6 +36,8 @@ function blockCrossServerEnqueue(): boolean {
* Eleven queue-mutation actions. Shared invariant: every action except
* `setRadioArtistId` pushes a queue-undo snapshot and calls
* `syncQueueToServer` so the Navidrome `savePlayQueue` stays in sync.
* Exceptions: `enqueue`'s optional third argument **`skipQueueUndo`** and
* **`pruneUpcomingToCurrent(true)`** — Lucky Mix pushes one snapshot up-front.
*/
export function createQueueMutationActions(set: SetState, get: GetState): Pick<
PlayerState,
@@ -52,15 +54,15 @@ export function createQueueMutationActions(set: SetState, get: GetState): Pick<
| 'removeTrack'
> {
return {
enqueue: (tracks, _orbitConfirmed = false) => {
enqueue: (tracks, _orbitConfirmed = false, skipQueueUndo = false) => {
if (blockCrossServerEnqueue()) return;
if (!_orbitConfirmed && tracks.length > 1) {
void orbitBulkGuard(tracks.length).then(ok => {
if (ok) get().enqueue(tracks, true);
if (ok) get().enqueue(tracks, true, skipQueueUndo);
});
return;
}
pushQueueUndoFromGetter(get);
if (!skipQueueUndo) pushQueueUndoFromGetter(get);
set(state => {
// Insert before the first upcoming auto-added track so the
// "Added automatically" separator always stays at the boundary.
@@ -181,17 +183,17 @@ export function createQueueMutationActions(set: SetState, get: GetState): Pick<
get().enqueueAt(tagged, insertIdx);
},
pruneUpcomingToCurrent: () => {
pruneUpcomingToCurrent: (skipQueueUndo = false) => {
const s = get();
if (s.currentRadio) return;
if (!s.currentTrack) {
if (s.queue.length === 0) return;
pushQueueUndoFromGetter(get);
if (!skipQueueUndo) pushQueueUndoFromGetter(get);
set({ queue: [], queueIndex: 0 });
syncQueueToServer([], null, 0);
return;
}
pushQueueUndoFromGetter(get);
if (!skipQueueUndo) pushQueueUndoFromGetter(get);
const at = s.queue.findIndex(t => t.id === s.currentTrack!.id);
const newQueue: Track[] =
at >= 0