mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-21 23:05:46 +00:00
cucadmuh
45e0e1206f
* 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.
75 lines
2.7 KiB
TypeScript
75 lines
2.7 KiB
TypeScript
import type { AuthState } from './authStoreTypes';
|
|
import { generateId } from './authStoreHelpers';
|
|
import { usePlayerStore } from './playerStore';
|
|
import { clearQueueServerForPlayback } from '../utils/playback/playbackServer';
|
|
|
|
type SetState = (
|
|
partial: Partial<AuthState> | ((state: AuthState) => Partial<AuthState>),
|
|
) => void;
|
|
|
|
/**
|
|
* Server profile + connection lifecycle. `removeServer` is the
|
|
* non-trivial one: when the active server is the one being removed it
|
|
* also drops every per-server map entry tied to that id and switches
|
|
* the active id to the next available server (or null) so the rest of
|
|
* the app doesn't end up reading stale state.
|
|
*/
|
|
export function createServerProfileActions(set: SetState): Pick<
|
|
AuthState,
|
|
| 'addServer'
|
|
| 'updateServer'
|
|
| 'removeServer'
|
|
| 'setServers'
|
|
| 'setActiveServer'
|
|
| 'setLoggedIn'
|
|
| 'setConnecting'
|
|
| 'setConnectionError'
|
|
| 'logout'
|
|
> {
|
|
return {
|
|
addServer: (profile) => {
|
|
const id = generateId();
|
|
set(s => ({ servers: [...s.servers, { ...profile, id }] }));
|
|
return id;
|
|
},
|
|
|
|
updateServer: (id, data) => {
|
|
set(s => ({
|
|
servers: s.servers.map(srv => srv.id === id ? { ...srv, ...data } : srv),
|
|
}));
|
|
},
|
|
|
|
removeServer: (id) => {
|
|
if (usePlayerStore.getState().queueServerId === id) {
|
|
clearQueueServerForPlayback();
|
|
}
|
|
set(s => {
|
|
const newServers = s.servers.filter(srv => srv.id !== id);
|
|
const switchedAway = s.activeServerId === id;
|
|
const { [id]: _r, ...entityRatingRest } = s.entityRatingSupportByServer;
|
|
const { [id]: _a, ...audiomuseRest } = s.audiomuseNavidromeByServer;
|
|
const { [id]: _idn, ...identityRest } = s.subsonicServerIdentityByServer;
|
|
const { [id]: _iss, ...issueRest } = s.audiomuseNavidromeIssueByServer;
|
|
const { [id]: _pr, ...probeRest } = s.instantMixProbeByServer;
|
|
return {
|
|
servers: newServers,
|
|
activeServerId: switchedAway ? (newServers[0]?.id ?? null) : s.activeServerId,
|
|
isLoggedIn: switchedAway ? false : s.isLoggedIn,
|
|
entityRatingSupportByServer: entityRatingRest,
|
|
audiomuseNavidromeByServer: audiomuseRest,
|
|
subsonicServerIdentityByServer: identityRest,
|
|
audiomuseNavidromeIssueByServer: issueRest,
|
|
instantMixProbeByServer: probeRest,
|
|
};
|
|
});
|
|
},
|
|
|
|
setServers: (servers) => set({ servers }),
|
|
setActiveServer: (id) => set({ activeServerId: id, musicFolders: [] }),
|
|
setLoggedIn: (v) => set({ isLoggedIn: v }),
|
|
setConnecting: (v) => set({ isConnecting: v }),
|
|
setConnectionError: (e) => set({ connectionError: e }),
|
|
logout: () => set({ isLoggedIn: false, musicFolders: [] }),
|
|
};
|
|
}
|