vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-10 04:30:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow initialIndex on queue add (#67)

Browse Source 
- Clean up play queue handler
- Split out functions to utils
This commit is contained in:
jeffvli
2023-05-20 18:40:45 -07:00
parent 02caf896ff
commit 3df2915f5f
4 changed files with 200 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/store/player.store.ts
+11 -10
View File
@@ -96,7 +96,7 @@ export const usePlayerStore = create<PlayerSlice>()(
immer((set, get) => ({
actions: {
addToQueue: (args) => {
const { playType, songs } = args;
const { initialIndex, playType, songs } = args;
const { shuffledIndex } = get().current;
const shuffledQueue = get().queue.shuffled;
const queueSongs = map(songs, (song) => ({
@@ -107,29 +107,30 @@ export const usePlayerStore = create<PlayerSlice>()(
if (playType === Play.NOW) {
if (get().shuffle === PlayerShuffle.TRACK) {
const shuffledSongs = shuffle(queueSongs);
const foundIndex = queueSongs.findIndex(
(song) => song.uniqueId === shuffledSongs[0].uniqueId,
const index = initialIndex || 0;
const initialSongUniqueId = queueSongs[index].uniqueId;
const initialSongIndex = shuffledSongs.findIndex(
(song) => song.uniqueId === initialSongUniqueId,
);
set((state) => {
state.queue.shuffled = shuffledSongs.map((song) => song.uniqueId);
});
set((state) => {
state.queue.shuffled = shuffledSongs.map((song) => song.uniqueId);
state.queue.default = queueSongs;
state.current.time = 0;
state.current.player = 1;
state.current.index = foundIndex;
state.current.index = initialSongIndex;
state.current.shuffledIndex = 0;
state.current.song = shuffledSongs[0];
state.current.song = shuffledSongs[initialSongIndex];
});
} else {
const index = initialIndex || 0;
set((state) => {
state.queue.default = queueSongs;
state.current.time = 0;
state.current.player = 1;
state.current.index = 0;
state.current.index = index;
state.current.shuffledIndex = 0;
state.current.song = queueSongs[0];
state.current.song = queueSongs[index];
});
}
} else if (playType === Play.LAST) {