From 044efc0a8f9af7ec010c06b5e68faffd7c3be163 Mon Sep 17 00:00:00 2001
From: ChillyBlaze <l135163642@gmail.com>
Date: Sun, 14 Jan 2024 13:59:58 +0800
Subject: [PATCH 1/2] renderer: control lyric scrolling with mouse wheel

---
 src/renderer/page/Player.vue | 43 +++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/renderer/page/Player.vue b/src/renderer/page/Player.vue
index 82b8c78a..54b4f099 100644
--- a/src/renderer/page/Player.vue
+++ b/src/renderer/page/Player.vue
@@ -176,7 +176,10 @@
                     <p>歌词加载中 ...</p>
                 </div>
                 <div v-show="!ui.lyricLoading"
-                    class="scroller-wrapper">
+                    class="scroller-wrapper"
+                    @mousewheel="handleMouseScroll"
+                    @mouseenter="lyricMouseIn = true"
+                    @mouseleave="lyricMouseIn = false">
                     <div class="scroller"
                         :style="lyricScrollerStyle">
                         <template v-if="lyricToShow">
@@ -259,7 +262,9 @@ export default {
             commentCount: '...',
             currentLyricIndex: -1,
             moreMenuOpen: false,
-            dlgShareOpen: false
+            dlgShareOpen: false,
+            lyricScrollOffset: 0,
+            lyricMouseIn: false,
         };
     },
     computed: {
@@ -324,10 +329,10 @@ export default {
             }
             if (this.currentLyricIndex === -1 || !this.$refs.lyric || this.$refs.lyric.length === 0) {
                 // initial state
-                return 'transform: translateY(164px)';
+                return `transform: translateY(${129 + this.lyricScrollOffset}px)`;
             }
             const currentLyricElem = this.$refs.lyric[this.currentLyricIndex];
-            const offset = 150 - currentLyricElem.offsetTop - currentLyricElem.clientHeight;
+            const offset = 150 - currentLyricElem.offsetTop - currentLyricElem.clientHeight + this.lyricScrollOffset;
             return `transform: translateY(${offset}px);`;
         }
     },
@@ -459,6 +464,24 @@ export default {
                 this.$toast.message('已复制分享内容到粘贴版');
             });
         },
+        handleMouseScroll(e) {
+            if (typeof this.ui.lyric.txtLyric === 'string' || !this.$refs.lyric || this.$refs.lyric.length === 0) {
+                return;
+            }
+            const currentLyricElem = this.$refs.lyric[Math.max(this.currentLyricIndex, 0)];
+            const lastElem = this.$refs.lyric[this.$refs.lyric.length - 1];
+            const currentToTopOffset = currentLyricElem.offsetTop;
+            const currentToBottomOffset = currentLyricElem.offsetTop - lastElem.offsetTop;
+            const willingOffset = this.lyricScrollOffset - 0.3 * e.deltaY;
+            if (willingOffset > currentToTopOffset) {
+                this.lyricScrollOffset = currentToTopOffset;
+            }
+            else if (willingOffset < currentToBottomOffset) {
+                this.lyricScrollOffset = currentToBottomOffset;
+            } else {
+                this.lyricScrollOffset = willingOffset;
+            }
+        },
         async handleDownload() {
             if (this.ui.downloaded) {
                 return;
@@ -507,7 +530,16 @@ export default {
         ['ui.lyric']() {
             // reset lyric position
             this.currentLyricIndex = -1;
-        }
+        },
+        ['currentLyricIndex'](val, oldVal) {
+            if (this.lyricMouseIn && this.lyricScrollOffset !== 0) {
+                const lyrics = this.$refs.lyric;
+                const diff = lyrics[oldVal].offsetTop - lyrics[val].offsetTop;
+                this.lyricScrollOffset -= diff;
+            } else {
+                this.lyricScrollOffset = 0;
+            }
+        },
     },
     mounted() {
         this.paintBkgCanvas();
@@ -524,6 +556,7 @@ export default {
         }
     },
     deactivated() {
+        this.lyricMouseIn = false;
         this.isActive = false;
     }
 };

From 149190db66df96d00bf64165714cacd0305ec7f7 Mon Sep 17 00:00:00 2001
From: ChillyBlaze <l135163642@gmail.com>
Date: Sun, 14 Jan 2024 14:11:41 +0800
Subject: [PATCH 2/2] renderer: avoid radio playing from the beginning

---
 src/renderer/store/actions.js       |  5 +++--
 src/renderer/store/modules/radio.js | 14 ++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/renderer/store/actions.js b/src/renderer/store/actions.js
index 92236c5d..7e78f98c 100644
--- a/src/renderer/store/actions.js
+++ b/src/renderer/store/actions.js
@@ -922,11 +922,12 @@ export function clearRadio({ commit, dispatch }) {
  */
 export async function getRadio({ commit }) {
     const resp = await Api.getRadioE();
+    const tracks = [];
     if (resp.code === 200) {
         const a = { source: { name: 'radio' } };
-        const tracks = resp.data.map(t => new Track(t, a));
-        commit(types.APPEND_RADIO, { tracks });
+        tracks.push(...resp.data.map(t => new Track(t, a)));
     }
+    commit(types.APPEND_RADIO, { tracks });
 }
 
 /**
diff --git a/src/renderer/store/modules/radio.js b/src/renderer/store/modules/radio.js
index 9fa72ad1..03210255 100644
--- a/src/renderer/store/modules/radio.js
+++ b/src/renderer/store/modules/radio.js
@@ -29,16 +29,22 @@ const mutations = {
     [types.CLEAR_RADIO](state) {
         state.list = [];
         state.index = 0;
+        trackIdSet.clear();
     },
     [types.APPEND_RADIO](state, /** @type {{ tracks: Models.Track[] }} */ { tracks }) {
-        const toAppend = [];
+        if (tracks.length === 0) {
+            tracks.push(state.list[0]);
+        }
         for (const t of tracks) {
-            if (!trackIdSet.has(t.id)) {
+            if (trackIdSet.has(t.id)) {
+                const duplicate = state.list.findIndex(s => s.id === t.id);
+                state.list.splice(duplicate, 1);
+                if (duplicate < state.index) state.index--;
+            } else {
                 trackIdSet.add(t.id);
-                toAppend.push(t);
             }
         }
-        state.list.push.apply(state.list, toAppend);
+        state.list.push.apply(state.list, tracks);
         if (state.list.length > RADIO_MAX_SIZE) {
             const removeCount = state.list.length - RADIO_MAX_SIZE;
             const removed = state.list.splice(0, removeCount);