Handle album artist play
This commit is contained in:
parent
38a4e1b749
commit
185175aa89
1 changed files with 45 additions and 47 deletions
|
@ -26,63 +26,61 @@ export const useHandlePlayQueueAdd = () => {
|
||||||
let songs = null;
|
let songs = null;
|
||||||
|
|
||||||
if (options.byItemType) {
|
if (options.byItemType) {
|
||||||
|
let songsList;
|
||||||
|
let queryFilter: any;
|
||||||
|
let queryKey: any;
|
||||||
if (options.byItemType.type === LibraryItem.ALBUM) {
|
if (options.byItemType.type === LibraryItem.ALBUM) {
|
||||||
// const albumDetail = await queryClient.fetchQuery(
|
queryFilter = {
|
||||||
// queryKeys.albums.detail(server?.id, { id: options.byItemType.id }),
|
|
||||||
// async ({ signal }) =>
|
|
||||||
// api.controller.getAlbumDetail({
|
|
||||||
// query: { id: options.byItemType!.id },
|
|
||||||
// server,
|
|
||||||
// signal,
|
|
||||||
// }),
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (!albumDetail) return null;
|
|
||||||
|
|
||||||
const queryFilter = {
|
|
||||||
albumIds: options.byItemType?.id || [],
|
albumIds: options.byItemType?.id || [],
|
||||||
sortBy: SongListSort.ALBUM,
|
sortBy: SongListSort.ALBUM,
|
||||||
sortOrder: SortOrder.ASC,
|
sortOrder: SortOrder.ASC,
|
||||||
startIndex: 0,
|
startIndex: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
const queryKey = queryKeys.songs.list(server?.id, queryFilter);
|
queryKey = queryKeys.songs.list(server?.id, queryFilter);
|
||||||
let songsList;
|
} else if (options.byItemType.type === LibraryItem.ALBUM_ARTIST) {
|
||||||
try {
|
queryFilter = {
|
||||||
songsList = await queryClient.fetchQuery(queryKey, async ({ signal }) =>
|
artistIds: options.byItemType?.id || [],
|
||||||
api.controller.getSongList({
|
sortBy: SongListSort.ALBUM,
|
||||||
query: queryFilter,
|
sortOrder: SortOrder.ASC,
|
||||||
server,
|
startIndex: 0,
|
||||||
signal,
|
};
|
||||||
}),
|
|
||||||
);
|
|
||||||
} catch (err: any) {
|
|
||||||
return toast.error({
|
|
||||||
message: err.message,
|
|
||||||
title: 'Play queue add failed',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!songsList) return toast.warn({ message: 'No songs found' });
|
queryKey = queryKeys.songs.list(server?.id, queryFilter);
|
||||||
|
|
||||||
switch (server?.type) {
|
|
||||||
case 'jellyfin':
|
|
||||||
songs = songsList.items?.map((song) =>
|
|
||||||
jfNormalize.song(song as JFSong, server, deviceId),
|
|
||||||
);
|
|
||||||
break;
|
|
||||||
case 'navidrome':
|
|
||||||
songs = songsList.items?.map((song) =>
|
|
||||||
ndNormalize.song(song as NDSong, server, deviceId),
|
|
||||||
);
|
|
||||||
break;
|
|
||||||
case 'subsonic':
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (options.byData) {
|
try {
|
||||||
|
songsList = await queryClient.fetchQuery(queryKey, async ({ signal }) =>
|
||||||
|
api.controller.getSongList({
|
||||||
|
query: queryFilter,
|
||||||
|
server,
|
||||||
|
signal,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
} catch (err: any) {
|
||||||
|
return toast.error({
|
||||||
|
message: err.message,
|
||||||
|
title: 'Play queue add failed',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!songsList) return toast.warn({ message: 'No songs found' });
|
||||||
|
|
||||||
|
switch (server?.type) {
|
||||||
|
case 'jellyfin':
|
||||||
|
songs = songsList.items?.map((song) =>
|
||||||
|
jfNormalize.song(song as JFSong, server, deviceId),
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
case 'navidrome':
|
||||||
|
songs = songsList.items?.map((song) =>
|
||||||
|
ndNormalize.song(song as NDSong, server, deviceId),
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
case 'subsonic':
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else if (options.byData) {
|
||||||
songs = options.byData.map((song) => ({ ...song, uniqueId: nanoid() }));
|
songs = options.byData.map((song) => ({ ...song, uniqueId: nanoid() }));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in a new issue