🐞 fix: 修复本地歌词及元信息错误

Author: imsyy

.github/workflows/build.yml

@@ -7,24 +7,31 @@ on:
     branches:
       - dev
 
+env:
+  NODE_VERSION: 22.x
+  PNPM_VERSION: 8
+
 jobs:
   # Windows x64 架构
-  release-x64:
-    name: Build Electron App for Windows (x64)
+  build-win:
+    name: Build Electron App for Windows
     runs-on: windows-latest
 
     steps:
       # 检出 Git 仓库
       - name: Check out git repository
         uses: actions/checkout@v4
+      # 设置 pnpm 版本
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: ${{ env.PNPM_VERSION }}
       # 安装 Node.js
       - name: Install Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: "22.x"
-      # 安装 pnpm
-      - name: Install pnpm
-        run: npm install -g pnpm
+          node-version: ${{ env.NODE_VERSION }}
+          cache: "pnpm"
       # 复制环境变量文件
       - name: Copy .env.example
         run: |
@@ -44,7 +51,7 @@ jobs:
           }
       # 构建 Electron App (x64)
       - name: Build Electron App for Windows x64
-        run: pnpm run build:win -- --x64 || true
+        run: pnpm run build:win || true
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # 清理不必要的构建产物（保留 .exe 和 .blockmap 文件）
@@ -54,58 +61,6 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: SPlayer-dev-x64
-          path: |
-            dist/*x64*.exe
-            dist/*x64*.exe.blockmap
-
-  # Windows ARM64 架构
-  release-arm64:
-    name: Build Electron App for Windows (ARM64)
-    runs-on: windows-11-arm
-
-    steps:
-      # 检出 Git 仓库
-      - name: Check out git repository
-        uses: actions/checkout@v4
-      # 安装 Node.js
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "22.x"
-      # 安装 pnpm
-      - name: Install pnpm
-        run: npm install -g pnpm
-      # 复制环境变量文件
-      - name: Copy .env.example
-        run: |
-          if (-not (Test-Path .env)) {
-            Copy-Item .env.example .env
-          } else {
-            Write-Host ".env file already exists. Skipping the copy step."
-          }
-      # 安装项目依赖
-      - name: Install Dependencies
-        run: pnpm install
-      # 清理旧的构建产物
-      - name: Clean dist folder
-        run: |
-          if (Test-Path dist) {
-            Remove-Item -Recurse -Force dist
-          }
-      # 构建 Electron App (ARM64)
-      - name: Build Electron App for Windows ARM64
-        run: pnpm run build:win -- --arm64 || true
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # 清理不必要的构建产物（保留 .exe 和 .blockmap 文件）
-      - name: Cleanup Artifacts
-        run: npx del-cli "dist/**/*.yaml" "dist/**/*.yml"
-      # 上传构建产物（仅上传 ARM64 架构的 .exe 文件）
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: SPlayer-dev-arm64
+          name: SPlayer-dev
           path: |
-            dist/*arm64*.exe
-            dist/*arm64*.exe.blockmap
+            dist/**.exe

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Build & Release SPlayer
+name: Build & Release
 
 on:
   push:
@@ -29,6 +29,7 @@ jobs:
       # 检出 Git 仓库
       - name: Check out git repository
         uses: actions/checkout@v4
+      # 设置 pnpm 版本
       - name: Setup pnpm
         uses: pnpm/action-setup@v3
         with:
@@ -94,8 +95,6 @@ jobs:
       - name: Install Snapcraft
         if: runner.os == 'Linux'
         uses: samuelmeuli/action-snapcraft@v2
-        with:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
       # 构建 Electron App
       - name: Build Windows x64 & ARM64 App
         if: runner.os == 'Windows'
@@ -145,6 +144,7 @@ jobs:
       # 创建 GitHub Release 并上传所有产物
       - name: Create GitHub Release and Upload Assets
         uses: softprops/action-gh-release@v2
+        continue-on-error: true
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           # 自动生成 Release 说明

electron-builder.config.ts

@@ -165,6 +165,9 @@ const config: Configuration = {
   electronDownload: {
     mirror: "https://npmmirror.com/mirrors/electron/",
   },
+  // 发布配置
+  // 先留空，不自动上传
+  publish: [],
 };
 
 export default config;

electron/main/ipcMain.ts

@@ -15,7 +15,7 @@ import { getFonts } from "font-list";
 import { MainTray } from "./tray";
 import { Thumbar } from "./thumbar";
 import { StoreType } from "./store";
-import { isDev, getFileID, getFileMD5 } from "./utils";
+import { isDev, getFileID, getFileMD5, metaDataLyricsArrayToLrc } from "./utils";
 import { isShortcutRegistered, registerShortcut, unregisterShortcuts } from "./shortcut";
 import { join, basename, resolve, relative, isAbsolute } from "path";
 import { download } from "electron-dl";
@@ -199,7 +199,7 @@ const initWinIpcMain = (
           name: common.title || basename(filePath),
           artists: common.artists?.[0] || common.artist,
           album: common.album || "",
-          alia: common.comment?.[0],
+          alia: common.comment?.[0]?.text || "",
           duration: (format?.duration ?? 0) * 1000,
           size: (size / (1024 * 1024)).toFixed(2),
           path: filePath,
@@ -226,6 +226,11 @@ const initWinIpcMain = (
         fileSize: (await fs.stat(filePath)).size / (1024 * 1024),
         // 元信息
         common,
+        // 歌词
+        lyric:
+          metaDataLyricsArrayToLrc(common?.lyrics?.[0]?.syncText || []) ||
+          common?.lyrics?.[0]?.text ||
+          "",
         // 音质信息
         format,
         // md5
@@ -242,8 +247,12 @@ const initWinIpcMain = (
     try {
       const filePath = resolve(path).replace(/\\/g, "/");
       const { common } = await parseFile(filePath);
-      const lyric = common?.lyrics;
-      if (lyric && lyric.length > 0) return String(lyric[0]);
+      const lyric = common?.lyrics?.[0]?.syncText;
+      if (lyric && lyric.length > 0) {
+        return metaDataLyricsArrayToLrc(lyric);
+      } else if (common?.lyrics?.[0]?.text) {
+        return common?.lyrics?.[0]?.text;
+      }
       // 如果歌词数据不存在，尝试读取同名的 lrc 文件
       else {
         const lrcFilePath = filePath.replace(/\.[^.]+$/, ".lrc");

electron/main/utils.ts

@@ -30,3 +30,32 @@ export const getFileMD5 = async (path: string): Promise<string> => {
   hash.update(data);
   return hash.digest("hex");
 };
+
+/**
+ * 将 music-metadata 库中的歌词数组转换为LRC格式字符串
+ * @param lyrics 歌词数组，每个元素包含时间戳（毫秒）和歌词文本
+ * @returns LRC格式的字符串
+ */
+export const metaDataLyricsArrayToLrc = (
+  lyrics: {
+    text: string;
+    timestamp?: number;
+  }[],
+): string => {
+  return lyrics
+    .map(({ timestamp, text }) => {
+      if (!timestamp) return "";
+      const totalSeconds = Math.floor(timestamp / 1000);
+      const minutes = Math.floor(totalSeconds / 60);
+      const seconds = totalSeconds % 60;
+      const centiseconds = Math.floor((timestamp % 1000) / 10);
+
+      // 格式化为两位数字
+      const mm = String(minutes).padStart(2, "0");
+      const ss = String(seconds).padStart(2, "0");
+      const cs = String(centiseconds).padStart(2, "0");
+
+      return `[${mm}:${ss}.${cs}]${text}`;
+    })
+    .join("\n");
+};

electron/server/netease/index.ts

@@ -1,6 +1,6 @@
 import { FastifyInstance, FastifyRequest, FastifyReply } from "fastify";
 import { pathCase } from "change-case";
-import NeteaseCloudMusicApi from "@neteaseapireborn/api";
+import NeteaseCloudMusicApi from "@neteasecloudmusicapienhanced/api";
 import log from "../../main/logger";
 
 // 获取数据

package.json

@@ -40,7 +40,7 @@
     "@electron-toolkit/utils": "^4.0.0",
     "@imsyy/color-utils": "^1.0.2",
     "@material/material-color-utilities": "^0.3.0",
-    "@neteaseapireborn/api": "^4.29.9",
+    "@neteasecloudmusicapienhanced/api": "^4.29.11",
     "@pixi/app": "^7.4.3",
     "@pixi/core": "^7.4.3",
     "@pixi/display": "^7.4.3",

pnpm-lock.yaml

@@ -190,24 +190,24 @@ const getSongInfo = async () => {
     common: ICommonTagsResult;
     format: IFormat;
     md5: string;
+    lyric?: string;
   } = await window.electron.ipcRenderer.invoke("get-music-metadata", path);
-  // console.log(infoData);
   // 解构数据
-  const { fileName, fileSize, common, format, md5 } = infoData;
+  const { fileName, fileSize, common, format, md5, lyric } = infoData;
   // 更新数据
   infoFormData.value = {
-    fileName,
-    name: common.title || "",
-    artist: common.artist || "",
-    album: common.album || "",
-    alia: (common.comment?.[0] as string) || "",
-    lyric: (common.lyrics?.[0] as unknown as string) || "",
-    type: format.codec,
+    fileName: String(fileName),
+    name: String(common.title ?? ""),
+    artist: String(common.artist ?? ""),
+    album: String(common.album ?? ""),
+    alia: String(common.comment?.[0]?.text ?? ""),
+    lyric: String(lyric ?? ""),
+    type: String(format.codec ?? ""),
     duration: format.duration ? Number(format.duration.toFixed(2)) : 0,
     size: fileSize,
     br: format.bitrate ? Math.floor(format.bitrate / 1000 || 0) : 0,
     frequency: format.sampleRate,
-    md5,
+    md5: String(md5),
   };
   // 获取封面
   const coverBuff = common.picture?.[0]?.data || "";

src/components/Modal/SongInfoEditor.vue

@@ -168,10 +168,10 @@ class Player {
       return { index, lyrics };
     }
 
-    // 逐字歌词（对唱最多两句同时存在）：
+    // 逐字歌词（并发最多三句同时存在）：
     // - 计算在播放进度下处于激活区间的句子集合 activeIndices（[time, endTime)）
-    // - 若激活数 >= 2，仅保留最后两句作为对唱对（不允许三句同时有效）
-    // - 索引取该对唱对中较早的一句（保持“上一句”高亮）
+    // - 若激活数 >= 3，仅保留最后三句作为并发显示（允许三句同时有效）；否则保持最后两句
+    // - 索引取该并发集合中较早的一句（保持“上一句”高亮）
     // - 若无激活句：首句之前返回 -1；否则回退到最近一句
 
     const firstStart = lyrics[0]?.time ?? 0;
@@ -199,9 +199,10 @@ class Player {
       return { index: activeIndices[0], lyrics };
     }
 
-    // 激活句 >= 2：限制为最后两句对唱
-    const pair = activeIndices.slice(-2);
-    return { index: pair[0], lyrics };
+    // 激活句 >= 2：如果达到三句或更多，限制为最后三句并发；否则保持最后两句
+    const concurrent =
+      activeIndices.length >= 3 ? activeIndices.slice(-3) : activeIndices.slice(-2);
+    return { index: concurrent[0], lyrics };
   }
   /**
    * 获取在线播放链接