mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 07:15:47 +00:00
fix(playback): pin queue playback to source server when browsing another library (#717)
* fix(playback): pin queue streams, cover art, and library links to queue server When the active server changes while a queue from another server is playing, keep streams and UI on queueServerId; switch back for artist/album links and queue or player-bar context menus. * fix(playback): switch to queue server when opening Now Playing Ensure active server matches queueServerId before Subsonic fetches on the Now Playing page, mobile player route, and queue info panel; scope caches by server id. * docs(credits): mention Now Playing in PR #717 contribution line * fix(playback): route scrobble and queue sync to queue server Address PR review: apiForServer for scrobble/now-playing/savePlayQueue, clear queueServerId on server removal, mini-player queueServerId sync, block cross-server enqueue with toast, and regression tests.
This commit is contained in:
@@ -2,6 +2,10 @@ import {
|
||||
persistQueueVisibility,
|
||||
} from './queueVisibilityStorage';
|
||||
import type { PlayerState } from './playerStoreTypes';
|
||||
import {
|
||||
ensurePlaybackServerActive,
|
||||
playbackServerDiffersFromActive,
|
||||
} from '../utils/playback/playbackServer';
|
||||
|
||||
type SetState = (
|
||||
partial: Partial<PlayerState> | ((state: PlayerState) => Partial<PlayerState>),
|
||||
@@ -41,10 +45,31 @@ export function createUiStateActions(set: SetState): Pick<
|
||||
};
|
||||
}),
|
||||
|
||||
openContextMenu: (x, y, item, type, queueIndex, playlistId, playlistSongIndex, shareKindOverride) =>
|
||||
set({
|
||||
contextMenu: { isOpen: true, x, y, item, type, queueIndex, playlistId, playlistSongIndex, shareKindOverride },
|
||||
}),
|
||||
openContextMenu: (x, y, item, type, queueIndex, playlistId, playlistSongIndex, shareKindOverride, pinToPlaybackServer) => {
|
||||
const pin = pinToPlaybackServer ?? type === 'queue-item';
|
||||
const open = () =>
|
||||
set({
|
||||
contextMenu: {
|
||||
isOpen: true,
|
||||
x,
|
||||
y,
|
||||
item,
|
||||
type,
|
||||
queueIndex,
|
||||
playlistId,
|
||||
playlistSongIndex,
|
||||
shareKindOverride,
|
||||
pinToPlaybackServer: pin,
|
||||
},
|
||||
});
|
||||
if (pin && playbackServerDiffersFromActive()) {
|
||||
void ensurePlaybackServerActive().then(ok => {
|
||||
if (ok) open();
|
||||
});
|
||||
return;
|
||||
}
|
||||
open();
|
||||
},
|
||||
|
||||
closeContextMenu: () =>
|
||||
set(state => ({
|
||||
|
||||
Reference in New Issue
Block a user