refactor(views/library): 修改取词逻辑 (#1135)

* refactor(views/library): 修改取词逻辑

* refactor(views/library): clean up long-winded code

Co-authored-by: 是虹川飴 <r0akg9yxh@relay.firefox.com>
Closed: #1133
Fixed: #1019 #1127 #1067 #1064 #1058 #1022
This commit is contained in:
pan93412 2021-12-28 17:58:31 +08:00 committed by GitHub
parent e838f1d6d4
commit f5cdbea379
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -199,15 +199,6 @@ export default {
pickedLyric() { pickedLyric() {
if (this.lyric === undefined) return ''; if (this.lyric === undefined) return '';
let lyric = this.lyric.split('\n'); let lyric = this.lyric.split('\n');
lyric = lyric.filter(l => {
if (l.includes('纯音乐,请欣赏')) {
if (l.includes('作词') || l.includes('作曲')) {
return false;
}
return true;
}
return true;
});
let lineIndex = randomNum(0, lyric.length - 1); let lineIndex = randomNum(0, lyric.length - 1);
while (lineIndex + 4 > lyric.length) { while (lineIndex + 4 > lyric.length) {
lineIndex = randomNum(0, lyric.length - 1); lineIndex = randomNum(0, lyric.length - 1);
@ -290,16 +281,12 @@ export default {
this.liked.songs[randomNum(0, this.liked.songs.length - 1)] this.liked.songs[randomNum(0, this.liked.songs.length - 1)]
).then(data => { ).then(data => {
if (data.lrc !== undefined) { if (data.lrc !== undefined) {
let ifl = data.lrc.lyric.split('\n').filter(l => { const isInstrumental = data.lrc.lyric
if (l.includes('作词')) { .split('\n')
if (l.includes('纯音乐,请欣赏') || l.includes('作词 : 无')) { .filter(l => l.includes('纯音乐,请欣赏'));
return false; if (isInstrumental.length === 0) {
}
this.lyric = data.lrc.lyric; this.lyric = data.lrc.lyric;
return true + ifl;
} }
return false;
});
} }
}); });
}, },