From 43c4e13c11b959a2fd68ecaf2aeed7ca042efc6c Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 12 Feb 2025 22:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0=20FLAC=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=85=E5=B5=8C=E6=AD=8C=E8=AF=8D=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=AF=BB=E5=8F=96=E7=9A=84=E9=97=AE=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/music.ts | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 1542a19b..64e61253 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -3,6 +3,7 @@
 - 修复 Windows 下桌面歌词最小高度与宽度设置问题（#2244）
 - 修复 Windows 下界面缩放后移动桌面歌词会改变歌词窗口大小的问题（#2244）
 - 修复 tx 歌单搜索名字、描述出现乱码的问题（#2250）
+- 修复本地 FLAC 文件内嵌歌词无法读取的问题
 
 ### 优化
 
diff --git a/src/renderer/utils/music.ts b/src/renderer/utils/music.ts
index 3c935849..73adbc87 100644
--- a/src/renderer/utils/music.ts
+++ b/src/renderer/utils/music.ts
@@ -208,7 +208,7 @@ export const getLocalMusicFileLyric = async(path: string): Promise<LX.Music.Lyri
 
   // 尝试读取文件内歌词
   const metadata = await getFileMetadata(path)
-  // console.log(metadata)
+  // console.log(metadata?.common)
   if (!metadata) return null
   let lyricInfo = metadata.common.lyrics?.[0]
   if (lyricInfo) {
@@ -221,12 +221,17 @@ export const getLocalMusicFileLyric = async(path: string): Promise<LX.Music.Lyri
   }
   // console.log(metadata)
   for (const info of Object.values(metadata.native)) {
-    const ust = info.find(i => i.id == 'USLT')
-    if (ust) {
-      const value = ust.value as IComment
-      if (value.text && value.text.length > 10) {
-        return {
-          lyric: value.text,
+    for (const ust of info) {
+      switch (ust.id) {
+        case 'LYRICS': {
+          const value = typeof ust.value == 'string' ? ust.value : (ust as IComment).text
+          if (value && value.length > 10) return { lyric: value }
+          break
+        }
+        case 'USLT': {
+          const value = ust.value as IComment
+          if (value.text && value.text.length > 10) return { lyric: value.text }
+          break
         }
       }
     }