修复酷狗歌词格式问题
parent
d0ec90130c
commit
6fe794fdf5
|
@ -158,6 +158,9 @@ const getUrl = (downloadInfo, isRefresh) => {
|
||||||
return url && !isRefresh ? Promise.resolve({ url }) : music[downloadInfo.musicInfo.source].getMusicUrl(downloadInfo.musicInfo, downloadInfo.type).promise
|
return url && !isRefresh ? Promise.resolve({ url }) : music[downloadInfo.musicInfo.source].getMusicUrl(downloadInfo.musicInfo, downloadInfo.type).promise
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 修复 1.1.x版本 酷狗源歌词格式
|
||||||
|
const fixKgLyric = lrc => lrc.startsWith('\ufeff[id:$00000000]') ? lrc.replace(/(?:\[00:(\d\d:\d\d.\d+\]))/gm, '[$1') : lrc
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置歌曲meta信息
|
* 设置歌曲meta信息
|
||||||
* @param {*} downloadInfo
|
* @param {*} downloadInfo
|
||||||
|
@ -185,6 +188,7 @@ const saveMeta = (downloadInfo, filePath, isEmbedPic, isEmbedLyric) => {
|
||||||
: Promise.resolve(),
|
: Promise.resolve(),
|
||||||
]
|
]
|
||||||
Promise.all(tasks).then(([imgUrl, lyrics = {}]) => {
|
Promise.all(tasks).then(([imgUrl, lyrics = {}]) => {
|
||||||
|
if (lyrics.lyric) lyrics.lyric = fixKgLyric(lyrics.lyric)
|
||||||
setMeta(filePath, {
|
setMeta(filePath, {
|
||||||
title: downloadInfo.musicInfo.name,
|
title: downloadInfo.musicInfo.name,
|
||||||
artist: downloadInfo.musicInfo.singer,
|
artist: downloadInfo.musicInfo.singer,
|
||||||
|
@ -205,7 +209,10 @@ const downloadLyric = (downloadInfo, filePath) => {
|
||||||
? Promise.resolve({ lyric: downloadInfo.musicInfo.lrc, tlyric: downloadInfo.musicInfo.tlrc || '' })
|
? Promise.resolve({ lyric: downloadInfo.musicInfo.lrc, tlyric: downloadInfo.musicInfo.tlrc || '' })
|
||||||
: music[downloadInfo.musicInfo.source].getLyric(downloadInfo.musicInfo).promise
|
: music[downloadInfo.musicInfo.source].getLyric(downloadInfo.musicInfo).promise
|
||||||
promise.then(lrcs => {
|
promise.then(lrcs => {
|
||||||
if (lrcs.lyric) saveLrc(filePath.replace(/(mp3|flac|ape|wav)$/, 'lrc'), lrcs.lyric)
|
if (lrcs.lyric) {
|
||||||
|
lrcs.lyric = fixKgLyric(lrcs.lyric)
|
||||||
|
saveLrc(filePath.replace(/(mp3|flac|ape|wav)$/, 'lrc'), lrcs.lyric)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,12 +21,10 @@ const parseLyric = str => {
|
||||||
let time = parseInt(result[2])
|
let time = parseInt(result[2])
|
||||||
let ms = time % 1000
|
let ms = time % 1000
|
||||||
time /= 1000
|
time /= 1000
|
||||||
let h = parseInt(time / 3600).toString().padStart(2, '0')
|
|
||||||
time %= 3600
|
|
||||||
let m = parseInt(time / 60).toString().padStart(2, '0')
|
let m = parseInt(time / 60).toString().padStart(2, '0')
|
||||||
time %= 60
|
time %= 60
|
||||||
let s = parseInt(time).toString().padStart(2, '0')
|
let s = parseInt(time).toString().padStart(2, '0')
|
||||||
time = `${h}:${m}:${s}.${ms}`
|
time = `${m}:${s}.${ms}`
|
||||||
if (tlyric) tlyric[i] = `[${time}]${tlyric[i++][0]}`
|
if (tlyric) tlyric[i] = `[${time}]${tlyric[i++][0]}`
|
||||||
return str.replace(result[1], time)
|
return str.replace(result[1], time)
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue