From 72418194e99934eee96b136bd3f86529e83d9fd7 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 29 Oct 2022 13:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=AD=8C=E8=AF=8D=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/utils/music.ts | 52 +++++++++++++++---------------- src/renderer/worker/main/music.ts | 6 ++-- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/renderer/utils/music.ts b/src/renderer/utils/music.ts index 3e805b3d..7846952f 100644 --- a/src/renderer/utils/music.ts +++ b/src/renderer/utils/music.ts @@ -118,39 +118,39 @@ export const getLocalMusicFilePic = async(path: string) => { return selectCover(metadata.common.picture) } -const timeExp = /^\[([\d:.]*)\]{1}/ +// const timeExp = /^\[([\d:.]*)\]{1}/ /** * 解析歌词文件,分离可能存在的翻译、罗马音歌词 * @param lrc 歌词内容 * @returns */ -export const parseLyric = (lrc: string): LX.Music.LyricInfo => { - const lines = lrc.split(/\r\n|\r|\n/) - const lyrics: string[][] = [] - const map = new Map() +// export const parseLyric = (lrc: string): LX.Music.LyricInfo => { +// const lines = lrc.split(/\r\n|\r|\n/) +// const lyrics: string[][] = [] +// const map = new Map() - for (let i = 0; i < lines.length; i++) { - const line = lines[i].trim() - let result = timeExp.exec(line) - if (result) { - const index = map.get(result[1]) ?? 0 - if (!lyrics[index]) lyrics[index] = [] - lyrics[index].push(line) - map.set(result[1], index + 1) - } else { - if (!lyrics[0]) lyrics[0] = [] - lyrics[0].push(line) - } - } - const lyricInfo: LX.Music.LyricInfo = { - lyric: lyrics[0].join('\n'), - tlyric: '', - } - if (lyrics[1]) lyricInfo.tlyric = lyrics[1].join('\n') - if (lyrics[2]) lyricInfo.rlyric = lyrics[2].join('\n') +// for (let i = 0; i < lines.length; i++) { +// const line = lines[i].trim() +// let result = timeExp.exec(line) +// if (result) { +// const index = map.get(result[1]) ?? 0 +// if (!lyrics[index]) lyrics[index] = [] +// lyrics[index].push(line) +// map.set(result[1], index + 1) +// } else { +// if (!lyrics[0]) lyrics[0] = [] +// lyrics[0].push(line) +// } +// } +// const lyricInfo: LX.Music.LyricInfo = { +// lyric: lyrics[0].join('\n'), +// tlyric: '', +// } +// if (lyrics[1]) lyricInfo.tlyric = lyrics[1].join('\n') +// if (lyrics[2]) lyricInfo.rlyric = lyrics[2].join('\n') - return lyricInfo -} +// return lyricInfo +// } /** diff --git a/src/renderer/worker/main/music.ts b/src/renderer/worker/main/music.ts index be3989bb..c39b8b66 100644 --- a/src/renderer/worker/main/music.ts +++ b/src/renderer/worker/main/music.ts @@ -1,4 +1,4 @@ -import { getLocalMusicFileLyric, getLocalMusicFilePic, parseLyric } from '@renderer/utils/music' +import { getLocalMusicFileLyric, getLocalMusicFilePic } from '@renderer/utils/music' export const getMusicFilePic = async(filePath: string) => { @@ -10,5 +10,7 @@ export const getMusicFilePic = async(filePath: string) => { export const getMusicFileLyric = async(filePath: string): Promise => { const lyric = await getLocalMusicFileLyric(filePath) if (!lyric) return null - return parseLyric(lyric) + return { + lyric, + } }