From 7ac638c52c94190de570953508870096ceb8d31a Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 25 Oct 2024 19:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20m4a=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=AD=8C=E6=9B=B2=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=EF=BC=88?=
 =?UTF-8?q?#2090=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md        |  1 +
 src/renderer/utils/music.ts | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 9066c241..55cd8c1b 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -14,6 +14,7 @@
 
 - 修复歌单详情页内歌单名字过长时的UI显示问题（#2028）
 - 修复获取自定义环境音效预设列表逻辑问题
+- 修复 m4a 文件歌曲内嵌歌词无法读取的问题（#2090）
 
 ### 变更
 
diff --git a/src/renderer/utils/music.ts b/src/renderer/utils/music.ts
index db899b30..65cb8c53 100644
--- a/src/renderer/utils/music.ts
+++ b/src/renderer/utils/music.ts
@@ -201,10 +201,15 @@ export const getLocalMusicFileLyric = async(path: string): Promise<LX.Music.Lyri
 
   // 尝试读取文件内歌词
   const metadata = await getFileMetadata(path)
+  // console.log(metadata)
   if (!metadata) return null
-  if (metadata.common.lyrics?.[0]?.text && metadata.common.lyrics[0].text.length > 10) {
-    return {
-      lyric: metadata.common.lyrics[0].text,
+  let lyricInfo = metadata.common.lyrics?.[0]
+  if (lyricInfo) {
+    let lyric: string | undefined
+    if (typeof lyricInfo == 'object') lyric = lyricInfo.text
+    else if (typeof lyricInfo == 'string') lyric = lyricInfo
+    if (lyric && lyric.length > 10) {
+      return { lyric }
     }
   }
   // console.log(metadata)