renderer: store: remember random play order

src/renderer/components/PlayerBar/VirtualCurrentPlaylist.vue

@@ -84,7 +84,6 @@ import { mapActions } from 'vuex';
 
 import { workerExecute } from '@/worker/message';
 import CenteredTip from '@/components/CenteredTip.vue';
-import { LOOP_MODE } from '@/store/modules/playlist';
 
 const SourceName = {
     list: '歌单',
@@ -137,9 +136,7 @@ export default {
             if (this.ui.radioMode) return '私人 FM';
             if (this.showFindInput && this.findInput) return `找到 ${this.filteredList.length} 首`;
             return `共 ${this.queue.list.length} 首`;
-        },
-        /** @returns {import('@/store/modules/playlist').State} */
-        playlist() { return this.$store.state.playlist; },
+        }
     },
     methods: {
         ...mapActions([
@@ -148,8 +145,7 @@ export default {
             'clearPlaylist',
             'playTrackIndex',
             'toggleCollectPopup',
-            'removeTrackFromPlaylist',
-            'insertTrackIntoRandomPlaylist',
+            'removeTrackFromPlaylist'
         ]),
         toggleFindInput() {
             this.showFindInput = !this.showFindInput;
@@ -184,9 +180,6 @@ export default {
             if (this.indexMap.size > 0 && this.indexMap.has(index)) {
                 i = this.indexMap.get(index);
             }
-            if (this.playlist.loopMode == LOOP_MODE.RANDOM) {
-                this.insertTrackIntoRandomPlaylist({ index: i, offset: 0 });
-            }
             this.playTrackIndex(i);
         },
         sourceTipText(track) {

src/renderer/components/TrackList/TrackList.vue

@@ -23,7 +23,6 @@ import { mapActions } from 'vuex';
 
 import TrackItem from './TrackItem.vue';
 import CenteredTip from '@/components/CenteredTip.vue';
-import { LOOP_MODE } from '@/store/modules/playlist';
 
 /** @typedef {{ event: string, icon: string, title: string }} TrackListShortcut */
 
@@ -83,8 +82,6 @@ export default {
             'playTrackIndex',
             'toggleCollectPopup',
             'insertTrackIntoPlaylist',
-            'insertTrackIntoRandomPlaylist',
-            'generateRandomHeardList',
             'playPlaylist'
         ]),
         handleCollect(id) {
@@ -106,11 +103,6 @@ export default {
         queueTrack(index) {
             if (this.findTrackInPlaylist(index) > -1) {
                 // track exists in playlist
-                if (this.playlist.loopMode == LOOP_MODE.RANDOM) {
-                    this.insertTrackIntoRandomPlaylist({index,offset: 1});
-                    this.$toast.message('已添加下一首播放  _(:з」∠)_');
-                    return;
-                }
                 this.$toast.message('已经在播放列表中了  ( >﹏<。)～');
                 return;
             }
@@ -119,13 +111,6 @@ export default {
                 source: this.source,
                 index: this.playlist.index + 1
             });
-            if (this.playlist.loopMode == LOOP_MODE.RANDOM) {
-                if (this.playlist.randomHeardList.length == 0) {//若列表为空，直接生成
-                    this.generateRandomHeardList(this.playlist.list.length);
-                }
-                else //否则插入
-                    this.insertTrackIntoRandomPlaylist({ index:this.playlist.index + 1 ,offset:1});
-            }
             this.$toast.message('已添加下一首播放  _(:з」∠)_');
         },
         handleQueue(index) {
@@ -137,26 +122,6 @@ export default {
         },
         playTrack(index) {
             const i = this.findTrackInPlaylist(index);
-            if (this.playlist.loopMode == LOOP_MODE.RANDOM) {
-                if (i > -1) {
-                    // track exists in playlist
-                    this.insertTrackIntoRandomPlaylist({index: i,offset: 0});
-                    this.playTrackIndex(i);
-                    return;
-                }
-                if (this.playlist.randomHeardList.length == 0) {
-                    this.generateRandomHeardList(this.playlist.list.length);
-                }
-                this.insertTrackIntoPlaylist({
-                    tracks: [this.trackDetails[index]],
-                    source: this.source,
-                    index: this.playlist.index,
-                });
-                const newIndex = this.findTrackInPlaylist(index);
-                this.insertTrackIntoRandomPlaylist({ index:newIndex, offset: 0 });
-                this.playTrackIndex(newIndex);
-                return;
-            }
             if (i > -1) {
                 // track exists in playlist
                 this.playTrackIndex(i);
@@ -176,7 +141,7 @@ export default {
                 this.activateRadio(false);
             }
             if (this.settings.autoReplacePlaylist) {
-                this.playPlaylist({ tracks: this.trackDetails, source: this.source, firstIndex: index });
+                this.playPlaylist({ tracks: this.trackDetails, source: this.source, start: index });
             } else {
                 this.playTrack(index);
             }

src/renderer/components/TrackList/TrackListHeader.vue

@@ -20,6 +20,7 @@ import { mapActions } from 'vuex';
 export default {
     inheritAttrs: false,
     props: {
+        /** @type {Vue.PropOptions<Models.Track[]>} */
         tracks: {
             type: Array,
             required: true
@@ -32,6 +33,7 @@ export default {
         }
     },
     computed: {
+        /** @returns {string} */
         btnPlayText() {
             return `播放全部 (${this.count || this.tracks.length})`;
         }

src/renderer/store/actions.js

@@ -424,72 +424,58 @@ export async function playTrackIndex({ state, commit, dispatch }, index) {
     if (state.ui.radioMode === true) {
         commit(types.SET_RADIO_INDEX, index);
     } else {
-        commit(types.SET_CURRENT_INDEX, index);
+        commit(types.SET_PLAYLIST_INDEX, index);
+        if (state.playlist.loopMode === LOOP_MODE.RANDOM) {
+            commit(types.GENERATE_RANDOM_PLAYLIST, index);
+        }
     }
     await dispatch('updateUiTrack');
     dispatch('playAudio');
 }
 
 /**
  * @param {ActionContext} param0
+ * @param {number} number
  */
-export function playNextTrack({ commit, dispatch, getters }) {
-    let { index, list, loopMode, randomHeardList, randomHeardListPointer } = getters.queue;
+export async function playTrackOffset({ commit, dispatch, state, getters }, payload) {
+    const { index, list, loopMode } = getters.queue;
     let nextIndex;
-    switch (loopMode) {
-        case LOOP_MODE.RANDOM:
-            if (randomHeardList.length == 0) {
-                commit(types.GENERATE_RANDOM_HEARD_LIST, list.length);
-                randomHeardList = getters.queue.randomHeardList;
-            }
-            if (randomHeardListPointer == randomHeardList.length - 1) {
-                commit(types.SET_RANDOMLIST_POINTER, 0);
-                nextIndex = randomHeardList[0];
-            }
-            else {
-                nextIndex = randomHeardList[randomHeardListPointer + 1];
-                commit(types.SET_RANDOMLIST_POINTER, randomHeardListPointer + 1);
-            }
-            break;
-        default:
-            nextIndex = (index + 1) % list.length;
-            break;
+    if (loopMode === LOOP_MODE.RANDOM) {
+        const { randomIndex, randomList } = state.playlist;
+        const nextRandomIndex = (randomIndex + randomList.length + payload) % randomList.length;
+        commit(types.SET_RANDOM_PLAYLIST_INDEX, nextRandomIndex);
+        nextIndex = randomList[nextRandomIndex];
+    } else {
+        nextIndex = (index + list.length + payload) % list.length;
     }
-    dispatch('playTrackIndex', nextIndex);
+    if (state.ui.radioMode === true) {
+        commit(types.SET_RADIO_INDEX, nextIndex);
+    } else {
+        commit(types.SET_PLAYLIST_INDEX, nextIndex);
+    }
+    await dispatch('updateUiTrack');
+    dispatch('playAudio');
 }
 
 /**
  * @param {ActionContext} param0
  */
-export function playPreviousTrack({ commit, dispatch, getters }) {
-    let { index, list, loopMode, randomHeardList, randomHeardListPointer } = getters.queue;
-    let nextIndex;
-    switch (loopMode) {
-        case LOOP_MODE.RANDOM:
-            if (randomHeardList.length == 0) {
-                commit(types.GENERATE_RANDOM_HEARD_LIST, list.length);
-                randomHeardList = getters.queue.randomHeardList;
-            }
-            if (randomHeardListPointer == 0) {
-                commit(types.SET_RANDOMLIST_POINTER, randomHeardList.length - 1);
-                nextIndex = randomHeardList[randomHeardList.length - 1];
-            }
-            else {
-                nextIndex = randomHeardList[randomHeardListPointer - 1];
-                commit(types.SET_RANDOMLIST_POINTER, randomHeardListPointer - 1);
-            }
-            break;
-        default:
-            nextIndex = (index + list.length - 1) % list.length;
-            break;
-    }
-    dispatch('playTrackIndex', nextIndex);
+export function playNextTrack({ dispatch }) {
+    dispatch('playTrackOffset', 1);
 }
 
 /**
  * @param {ActionContext} param0
  */
-export async function playPlaylist({ commit, dispatch, state }, { tracks, source, firstIndex = -1 }) {
+export function playPreviousTrack({ dispatch }) {
+    dispatch('playTrackOffset', -1);
+}
+
+/**
+ * @param {ActionContext} param0
+ * @param {{ tracks: Models.Track[], source?: any, start?: number }}
+ */
+export async function playPlaylist({ commit, dispatch, state }, { tracks, source, start = -1 }) {
     const list = [];
     for (const t of tracks) {
         if (source) {
@@ -501,24 +487,25 @@ export async function playPlaylist({ commit, dispatch, state }, { tracks, source
     if (state.ui.radioMode === true) {
         commit(types.ACTIVATE_RADIO, false);
     }
-    if (firstIndex === -1 && state.playlist.loopMode === LOOP_MODE.RANDOM) {
-        //firstIndex = Math.floor(Math.random() * list.length);
-        commit(types.GENERATE_RANDOM_HEARD_LIST, list.length);//换歌单了，重置随机队列
-        firstIndex = state.playlist.randomHeardList[0];
-    }
-    if (firstIndex === -1) {
-        firstIndex = 0;
+    let nextIndex;
+    if (start === -1) {
+        if (state.playlist.loopMode === LOOP_MODE.RANDOM) {
+            nextIndex = Math.floor(Math.random() * list.length);
+            commit(types.GENERATE_RANDOM_PLAYLIST, nextIndex);
+        } else {
+            nextIndex = 0;
+        }
+    } else {
+        nextIndex = start;
     }
-    dispatch('playTrackIndex', firstIndex);
+    dispatch('playTrackIndex', nextIndex);
 }
 
 /**
  * @param {ActionContext} context
  */
 export function clearPlaylist({ commit, dispatch }) {
-    commit(types.SET_PLAY_LIST, []);
-    commit(types.SET_CURRENT_INDEX, 0);
-    commit(types.GENERATE_RANDOM_HEARD_LIST, 0);
+    commit(types.CLEAR_PLAY_LIST);
     dispatch('updateUiTrack');
 }
 
@@ -548,6 +535,9 @@ export async function restorePlaylist({ commit }) {
                 }
             }
             commit(types.RESTORE_PLAYLIST, { index, list, loopMode });
+            if (loopMode === LOOP_MODE.RANDOM) {
+                commit(types.GENERATE_RANDOM_PLAYLIST, index);
+            }
         }
     } catch (e) {
         console.error('restorePlaylist failed:', e); // eslint-disable-line no-console
@@ -625,13 +615,13 @@ export async function checkDownloaded({ commit }, { metadata }) {
  * @param {ActionContext} param0
  */
 export function nextLoopMode({ commit, state }) {
-    const { loopMode } = state.playlist;
+    const { index, loopMode } = state.playlist;
     switch (loopMode) {
         case LOOP_MODE.LIST:
             commit(types.SET_LOOP_MODE_SINGLE);
             break;
         case LOOP_MODE.SINGLE:
-            commit(types.GENERATE_RANDOM_HEARD_LIST, state.playlist.list.length);//换播放方式了，重置随机队列
+            commit(types.GENERATE_RANDOM_PLAYLIST, index);
             commit(types.SET_LOOP_MODE_RANDOM);
             break;
         case LOOP_MODE.RANDOM:
@@ -644,36 +634,30 @@ export function nextLoopMode({ commit, state }) {
  * @param {ActionContext} param0
  * @param {{ tracks: Models.Track[]; source?: any; index?: number }} payload
  */
-export function insertTrackIntoPlaylist({ commit, state }, payload) {
+export function insertTrackIntoPlaylist({ commit, state, getters }, payload) {
     if (payload.source) {
         for (const t of payload.tracks) {
             t.source = payload.source;
         }
     }
-    const index = payload.index || state.playlist.index;
-    commit(types.INSERT_TRACK_INTO_PLAYLIST, { tracks: payload.tracks, index });
-}
-
-/**
- * @param {ActionContext} param0
- * @param {number} payload
- */
-export function insertTrackIntoRandomPlaylist({ commit, state }, payload) {
-    commit(types.INSERT_TRACK_INTO_RANDOM_PLAYLIST, payload);
-}
-
-export function generateRandomHeardList({ commit, state }, payload) {
-    commit(types.GENERATE_RANDOM_HEARD_LIST, payload);
+    const start = payload.index || state.playlist.index;
+    commit(types.INSERT_TRACK_INTO_PLAYLIST, { tracks: payload.tracks, start });
+    if (getters.queue.loopMode === LOOP_MODE.RANDOM) {
+        commit(types.INSERT_TRACK_INTO_RANDOM_PLAYLIST, { start, count: payload.tracks.length });
+    }
 }
 
 /**
  * @param {ActionContext} param0
+ * @param {{ start: number; count: number }} payload
  */
 export function removeTrackFromPlaylist({ getters, commit, dispatch }, payload) {
-    const playingId = getters.playing.id;
+    const { index, loopMode } = getters.queue;
     commit(types.REMOVE_TRACK_FROM_PLAYLIST, payload);
-    commit(types.GENERATE_RANDOM_HEARD_LIST, getters.queue.list.length);//删歌了，重置随机队列
-    if (playingId !== getters.playing.id) {
+    if (loopMode === LOOP_MODE.RANDOM) {
+        commit(types.REMOVE_TRACK_FROM_RANDOM_PLAYLIST, payload);
+    }
+    if (index >= payload.start) {
         dispatch('updateUiTrack');
     }
 }

src/renderer/store/getters.js

@@ -5,7 +5,7 @@
 
 /**
  * @param {State} state
- * @typedef {{ index: number, loopMode: number, list: Models.Track[], randomHeardList: number[], randomHeardListPointer: number }} QueueGetter
+ * @typedef {{ index: number, loopMode: number, list: Models.Track[] }} QueueGetter
  * @returns {QueueGetter}
  */
 export function queue(state) {

src/renderer/store/hooks.js

@@ -77,14 +77,16 @@ function updatePlaylistTable(mutation) {
         case SET_PLAY_LIST:
             PlaylistDb.replace(mutation.payload);
             break;
-        case INSERT_TRACK_INTO_PLAYLIST:
-            const { index, tracks } = mutation.payload;
-            PlaylistDb.insert(index, tracks);
+        case INSERT_TRACK_INTO_PLAYLIST: {
+            const { start, tracks } = mutation.payload;
+            PlaylistDb.insert(start, tracks);
             break;
-        case REMOVE_TRACK_FROM_PLAYLIST:
+        }
+        case REMOVE_TRACK_FROM_PLAYLIST: {
             const { start, count } = mutation.payload;
             PlaylistDb.remove(start, count);
             break;
+        }
     }
 }