github-mirror/YesPlayMusic
2
0
Fork 0
mirror of https://github.com/qier222/YesPlayMusic.git synced 2024-11-22 12:15:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(utils/lyrics): do not preserve the empty lyric

Browse Source
This commit is contained in:
pan93412 2022-01-27 00:07:09 +08:00
parent 3ddfe9c3bb
commit 9ae5e4f059
No known key found for this signature in database
GPG Key ID: 42154B1B1CFE3377
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/utils/lyrics.js
View File

@ -9,19 +9,18 @@ export function lyricParser(lrc) {
}; };
} }
const extractTimeRegex = /^(?<rawTime>\[(?<min>\d+):(?<sec>\d+)(?:\.|:)(?<ms>\d+)\])\s*(?<content>(.+|))$/; const extractTimeRegex = /^(?<rawTime>\[(?<min>\d+):(?<sec>\d+)(?:\.|:)(?<ms>\d+)\])\s*(?<content>.+)$/;
function parseLyric(lrc) { function parseLyric(lrc) {
const lyrics = lrc.trim().split('\n'); const lyrics = lrc.trim().split('\n');
const parsedLyrics = lyrics const parsedLyrics = lyrics
.filter(lyric => lyric.length) // filter the lyric line which is empty
.map((/** @type {string} */ line) => { .map((/** @type {string} */ line) => {
try { try {
const extractedLyric = extractTimeRegex.exec(line); const extractedLyric = extractTimeRegex.exec(line);
// If this line is not a lyric. // If this line is not a lyric.
if (!extractedLyric) throw 'This line is not a lyric.'; if (!extractedLyric) throw 'This line is not a valid lyric.';
// Otherwise, we extract the lyric part. // Otherwise, we extract the lyric part.
const { rawTime, min, sec, ms, content } = extractedLyric.groups; const { rawTime, min, sec, ms, content } = extractedLyric.groups;
@ -33,7 +32,7 @@ function parseLyric(lrc) {
content: trimContent(content), content: trimContent(content),
}; };
} catch (e) { } catch (e) {
console.warn(`Failed to extract "${line}". ${e}`); console.debug(`lyrics.js: Failed to extract "${line}". ${e}`);
} }
}) })
.filter(response => !!response) // remove "undefined" entries .filter(response => !!response) // remove "undefined" entries