From a3b8f31b1e98c154c016333b82e1fb248eab130c Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 21 Jun 2023 10:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtx=E7=BF=BB=E8=AF=91=E6=AD=8C?=
 =?UTF-8?q?=E8=AF=8D=E8=A7=A3=E6=9E=90=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                    |  1 +
 src/renderer/utils/musicSdk/tx/lyric.js | 26 +++++++++++++++----------
 src/renderer/utils/musicSdk/wy/lyric.js |  5 ++++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 603ade3b..3299d89d 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -20,6 +20,7 @@
 - 修复Deepin 20下启用桌面歌词时可能会导致桌面卡死的问题（#1288）
 - 修复添加单首歌曲弹窗列表创建按钮无法取消的问题
 - 修复mg歌单搜索歌单播放数量显示问题
+- 修复tx翻译歌词解析丢失的问题（更新版本后需手动清理歌词缓存）
 
 ### 其他
 
diff --git a/src/renderer/utils/musicSdk/tx/lyric.js b/src/renderer/utils/musicSdk/tx/lyric.js
index 6e1ac45c..503b1dbf 100644
--- a/src/renderer/utils/musicSdk/tx/lyric.js
+++ b/src/renderer/utils/musicSdk/tx/lyric.js
@@ -100,8 +100,10 @@ const parseTools = {
     return str.replace(/^[\S\s]*?LyricContent="/, '').replace(/"\/>[\S\s]*?$/, '')
   },
   getIntv(interval) {
-    let [m, s, ms] = interval.split(/:|\./)
-
+    if (!interval.includes('.')) interval += '.0'
+    let arr = interval.split(/:|\./)
+    while (arr.length < 3) arr.unshift('0')
+    const [m, s, ms] = arr
     return parseInt(m) * 3600000 + parseInt(s) * 1000 + parseInt(ms)
   },
   fixRlrcTimeTag(rlrc, lrc) {
@@ -123,7 +125,7 @@ const parseTools = {
         const lrcLineResult = this.rxps.lineTime2.exec(lrcLine)
         if (!lrcLineResult) continue
         const t2 = this.getIntv(lrcLineResult[1])
-        if (Math.abs(t1 - t2) < 10) {
+        if (Math.abs(t1 - t2) < 100) {
           newLrc.push(line.replace(this.rxps.lineTime2, lrcLineResult[0]))
           break
         }
@@ -140,21 +142,25 @@ const parseTools = {
     const tlrcLines = tlrc.split('\n')
     let lrcLines = lrc.split('\n')
     // let temp = []
-    const timeTagRxp = /^\[[\d:.]+\]/
     let newLrc = []
     tlrcLines.forEach((line) => {
-      const result = timeTagRxp.exec(line)
+      const result = this.rxps.lineTime2.exec(line)
       if (!result) return
-      const words = line.replace(timeTagRxp, '')
+      const words = line.replace(this.rxps.lineTime2, '')
       if (!words.trim()) return
-      const tag = result[0].replace(/\d]/, '').replace(this.rxps.timeLabelFixRxp, '')
+      let time = result[1]
+      if (time.includes('.')) {
+        time += ''.padStart(3 - time.split('.')[1].length, '0')
+      }
+      const t1 = this.getIntv(time)
 
       while (lrcLines.length) {
         const lrcLine = lrcLines.shift()
-        const lrcLineResult = timeTagRxp.exec(lrcLine)
+        const lrcLineResult = this.rxps.lineTime2.exec(lrcLine)
         if (!lrcLineResult) continue
-        if (lrcLineResult[0].includes(tag)) {
-          newLrc.push(line.replace(timeTagRxp, lrcLineResult[0]))
+        const t2 = this.getIntv(lrcLineResult[1])
+        if (Math.abs(t1 - t2) < 100) {
+          newLrc.push(line.replace(this.rxps.lineTime2, lrcLineResult[0]))
           break
         }
         // temp.push(line)
diff --git a/src/renderer/utils/musicSdk/wy/lyric.js b/src/renderer/utils/musicSdk/wy/lyric.js
index 0d234253..108a2e31 100644
--- a/src/renderer/utils/musicSdk/wy/lyric.js
+++ b/src/renderer/utils/musicSdk/wy/lyric.js
@@ -126,7 +126,10 @@ const parseTools = {
     })
   },
   getIntv(interval) {
-    let [m, s, ms] = interval.split(/:|\./)
+    if (!interval.includes('.')) interval += '.0'
+    let arr = interval.split(/:|\./)
+    while (arr.length < 3) arr.unshift('0')
+    const [m, s, ms] = arr
     return parseInt(m) * 3600000 + parseInt(s) * 1000 + parseInt(ms)
   },
   fixTimeTag(lrc, targetlrc) {