From d15381020552cbd0faa1c6447367687ea0b99657 Mon Sep 17 00:00:00 2001
From: pan93412 <pan93412@gmail.com>
Date: Wed, 29 Dec 2021 07:37:58 +0800
Subject: [PATCH] fix(views/library): better lyric-picking logic (#1143)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(views/library): better lyric-picking logic

* feat(views/library): filter out lines with "作詞" and "作曲" included
---
 src/views/library.vue | 45 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/views/library.vue b/src/views/library.vue
index 2dc1874..fa54fc2 100644
--- a/src/views/library.vue
+++ b/src/views/library.vue
@@ -183,6 +183,16 @@ import CoverRow from '@/components/CoverRow.vue';
 import SvgIcon from '@/components/SvgIcon.vue';
 import MvRow from '@/components/MvRow.vue';
 
+/**
+ * Pick the lyric part from a string formed in `[timecode] lyric`.
+ *
+ * @param {string} rawLyric The raw lyric string formed in `[timecode] lyric`
+ * @returns {string} The lyric part
+ */
+function extractLyricPart(rawLyric) {
+  return rawLyric.split(']')[1].trim();
+}
+
 export default {
   name: 'Library',
   components: { SvgIcon, CoverRow, TrackList, MvRow, ContextMenu },
@@ -196,18 +206,31 @@ export default {
   },
   computed: {
     ...mapState(['data', 'liked']),
+    /**
+     * @returns {string[]}
+     */
     pickedLyric() {
-      if (this.lyric === undefined) return '';
-      let lyric = this.lyric.split('\n');
-      let lineIndex = randomNum(0, lyric.length - 1);
-      while (lineIndex + 4 > lyric.length) {
-        lineIndex = randomNum(0, lyric.length - 1);
-      }
-      return [
-        lyric[lineIndex].split(']')[1],
-        lyric[lineIndex + 1].split(']')[1],
-        lyric[lineIndex + 2].split(']')[1],
-      ];
+      /** @type {string?} */
+      const lyric = this.lyric;
+
+      // Returns [] if we got no lyrics.
+      if (!lyric) return [];
+
+      const lyricLine = lyric
+        .split('\n')
+        .filter(line => !line.includes('作词') && !line.includes('作曲'));
+
+      // Pick 3 or fewer lyrics based on the lyric lines.
+      const lyricsToPick = Math.min(lyricLine.length, 3);
+
+      // The upperbound of the lyric line to pick
+      const randomUpperBound = lyricLine.length - lyricsToPick;
+      const startLyricLineIndex = randomNum(0, randomUpperBound - 1);
+
+      // Pick lyric lines to render.
+      return lyricLine
+        .slice(startLyricLineIndex, startLyricLineIndex + lyricsToPick)
+        .map(extractLyricPart);
     },
     playlistFilter() {
       return this.data.libraryPlaylistFilter || 'all';