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

Add initialSongId prop as alternative to initialIndex

Browse source
This commit is contained in:
jeffvli 2023-05-20 20:47:07 -07:00
parent 06d253228a
commit 6747fbb701
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,8 +29,9 @@ export const useHandlePlayQueueAdd = () => {
const handlePlayQueueAdd = useCallback( const handlePlayQueueAdd = useCallback(
async (options: PlayQueueAddOptions) => { async (options: PlayQueueAddOptions) => {
if (!server) return toast.error({ message: 'No server selected', type: 'error' }); if (!server) return toast.error({ message: 'No server selected', type: 'error' });
const { initialIndex, playType, byData, byItemType } = options; const { initialIndex, initialSongId, playType, byData, byItemType } = options;
let songs: QueueSong[] | null = null; let songs: QueueSong[] | null = null;
let initialSongIndex = 0;
if (byItemType) { if (byItemType) {
let songList: SongListResponse | undefined; let songList: SongListResponse | undefined;
@ -38,13 +39,13 @@ export const useHandlePlayQueueAdd = () => {
try { try {
if (itemType === LibraryItem.PLAYLIST) { if (itemType === LibraryItem.PLAYLIST) {
songList = await getPlaylistSongsById({ id, queryClient, server }); songList = await getPlaylistSongsById({ id: id?.[0], queryClient, server });
} else if (itemType === LibraryItem.ALBUM) { } else if (itemType === LibraryItem.ALBUM) {
songList = await getAlbumSongsById({ id, queryClient, server }); songList = await getAlbumSongsById({ id, queryClient, server });
} else if (itemType === LibraryItem.ALBUM_ARTIST) { } else if (itemType === LibraryItem.ALBUM_ARTIST) {
songList = await getAlbumArtistSongsById({ id, queryClient, server }); songList = await getAlbumArtistSongsById({ id, queryClient, server });
} else { } else {
songList = await getSongById({ id, queryClient, server }); songList = await getSongById({ id: id?.[0], queryClient, server });
} }
} catch (err: any) { } catch (err: any) {
return toast.error({ return toast.error({
@ -60,7 +61,15 @@ export const useHandlePlayQueueAdd = () => {
if (!songs) return toast.warn({ message: 'No songs found' }); if (!songs) return toast.warn({ message: 'No songs found' });
const playerData = addToQueue({ initialIndex: initialIndex || 0, playType, songs }); // const index = initialIndex || initial songs.findIndex((song) => song.id === initialSongId);
if (initialIndex) {
initialSongIndex = initialIndex;
} else if (initialSongId) {
initialSongIndex = songs.findIndex((song) => song.id === initialSongId);
}
const playerData = addToQueue({ initialIndex: initialSongIndex, playType, songs });
if (playerType === PlaybackType.LOCAL) { if (playerType === PlaybackType.LOCAL) {
mpvPlayer?.volume(usePlayerStore.getState().volume); mpvPlayer?.volume(usePlayerStore.getState().volume);

3
src/renderer/types.ts
View file

@ -151,10 +151,11 @@ export enum TableColumn {
export type PlayQueueAddOptions = { export type PlayQueueAddOptions = {
byData?: QueueSong[]; byData?: QueueSong[];
byItemType?: { byItemType?: {
id: string[] | any; id: string[];
type: LibraryItem; type: LibraryItem;
}; };
initialIndex?: number; initialIndex?: number;
initialSongId?: string;
playType: Play; playType: Play;
}; };