pogmommy/feishin
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add playlist queue handler

Browse source
This commit is contained in:
jeffvli 2022-12-31 20:07:44 -08:00
parent aa1cd742ad
commit 5cef23944f
2 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/renderer/features/context-menu/context-menu-provider.tsx
View file

@ -93,10 +93,13 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
handlePlayQueueAdd?.({ byData: ctx.data, play });
break;
case LibraryItem.PLAYLIST:
handlePlayQueueAdd?.({
byItemType: { id: ctx.data.map((item) => item.id), type: ctx.type },
play,
});
for (const item of ctx.data) {
handlePlayQueueAdd?.({
byItemType: { id: [item.id], type: ctx.type },
play,
});
}
break;
}
};

52
src/renderer/features/player/hooks/use-handle-playqueue-add.ts
View file

@ -31,7 +31,20 @@ export const useHandlePlayQueueAdd = () => {
let songsList;
let queryFilter: any;
let queryKey: any;
if (options.byItemType.type === LibraryItem.ALBUM) {
if (options.byItemType.type === LibraryItem.PLAYLIST) {
queryFilter = {
id: options.byItemType?.id || [],
sortBy: 'id',
sortOrder: SortOrder.ASC,
startIndex: 0,
};
queryKey = queryKeys.playlists.songList(
server?.id,
options.byItemType?.id?.[0] || '',
queryFilter,
);
} else if (options.byItemType.type === LibraryItem.ALBUM) {
queryFilter = {
albumIds: options.byItemType?.id || [],
sortBy: SongListSort.ALBUM,
@ -48,26 +61,29 @@ export const useHandlePlayQueueAdd = () => {
startIndex: 0,
};
queryKey = queryKeys.songs.list(server?.id, queryFilter);
} else if (options.byItemType.type === LibraryItem.PLAYLIST) {
queryFilter = {
artistIds: options.byItemType?.id || [],
sortBy: SongListSort.ALBUM,
sortOrder: SortOrder.ASC,
startIndex: 0,
};
queryKey = queryKeys.songs.list(server?.id, queryFilter);
}
try {
songsList = await queryClient.fetchQuery(queryKey, async ({ signal }) =>
api.controller.getSongList({
query: queryFilter,
server,
signal,
}),
);
if (options.byItemType?.type === LibraryItem.PLAYLIST) {
songsList = await queryClient.fetchQuery(queryKey, async ({ signal }) =>
api.controller.getPlaylistSongList({
query: queryFilter,
server,
signal,
}),
);
console.log('songsList', songsList);
} else {
songsList = await queryClient.fetchQuery(queryKey, async ({ signal }) =>
api.controller.getSongList({
query: queryFilter,
server,
signal,
}),
);
}
} catch (err: any) {
return toast.error({
message: err.message,
@ -91,6 +107,8 @@ export const useHandlePlayQueueAdd = () => {
case 'subsonic':
break;
}
console.log('songs', songs);
} else if (options.byData) {
songs = options.byData.map((song) => ({ ...song, uniqueId: nanoid() }));
}