github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

修复本地歌曲歌词获取问题

pull/1761/head
lyswhut 2023-12-28 14:53:12 +08:00
parent 1637ae4d17
commit 2337a3e8a3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/renderer/core/music/local.ts
View File

@ -116,15 +116,14 @@ export const getLyricInfo = async({ musicInfo, isRefresh, onToggleSource = () =>
onToggleSource?: (musicInfo?: LX.Music.MusicInfoOnline) => void onToggleSource?: (musicInfo?: LX.Music.MusicInfoOnline) => void
}): Promise<LX.Player.LyricInfo> => { }): Promise<LX.Player.LyricInfo> => {
if (!isRefresh) { if (!isRefresh) {
const lyricInfo = await getCachedLyricInfo(musicInfo) const [lyricInfo, fileLyricInfo] = await Promise.all([getCachedLyricInfo(musicInfo), window.lx.worker.main.getMusicFileLyric(musicInfo.meta.filePath)])
if (lyricInfo) { if (lyricInfo?.lyric && lyricInfo.lyric != lyricInfo.rawlrcInfo.lyric) {
// 存在已编辑、原始歌词 // 存在已编辑歌词
if (lyricInfo.rawlrcInfo.lyric) return buildLyricInfo(lyricInfo) return buildLyricInfo({ ...lyricInfo, rawlrcInfo: fileLyricInfo ?? lyricInfo.rawlrcInfo })
} }
// 尝试读取文件内歌词 if (fileLyricInfo) return buildLyricInfo(fileLyricInfo)
const rawlrcInfo = await window.lx.worker.main.getMusicFileLyric(musicInfo.meta.filePath) if (lyricInfo?.lyric) return buildLyricInfo(lyricInfo)
if (rawlrcInfo) return buildLyricInfo(lyricInfo ? { ...lyricInfo, rawlrcInfo } : rawlrcInfo)
} }
onToggleSource() onToggleSource()