Skip to content

Commit

Permalink
refactor(views/library): 修改取词逻辑 (#1135)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
pan93412 and 是虹川飴 committed Dec 28, 2021
1 parent e838f1d commit f5cdbea
Showing 1 changed file with 6 additions and 19 deletions.
25 changes: 6 additions & 19 deletions src/views/library.vue
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,6 @@ export default {
pickedLyric() {
if (this.lyric === undefined) return '';
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);
while (lineIndex + 4 > lyric.length) {
lineIndex = randomNum(0, lyric.length - 1);
Expand Down Expand Up @@ -290,16 +281,12 @@ export default {
this.liked.songs[randomNum(0, this.liked.songs.length - 1)]
).then(data => {
if (data.lrc !== undefined) {
let ifl = data.lrc.lyric.split('\n').filter(l => {
if (l.includes('作词')) {
if (l.includes('纯音乐,请欣赏') || l.includes('作词 : 无')) {
return false;
}
this.lyric = data.lrc.lyric;
return true + ifl;
}
return false;
});
const isInstrumental = data.lrc.lyric
.split('\n')
.filter(l => l.includes('纯音乐,请欣赏'));
if (isInstrumental.length === 0) {
this.lyric = data.lrc.lyric;
}
}
});
},
Expand Down

0 comments on commit f5cdbea

Please sign in to comment.