Merge branch 'dev-lyric' into dev

Author: imsyy

auto-imports.d.ts

@@ -1,8 +1,11 @@
 /* eslint-disable */
 // @ts-nocheck
+// biome-ignore lint: disable
+// oxlint-disable
+// ------
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-// biome-ignore lint: disable
+
 export {}
 
 /* prettier-ignore */
@@ -61,15 +64,19 @@ declare module 'vue' {
     NDrawerContent: typeof import('naive-ui')['NDrawerContent']
     NDropdown: typeof import('naive-ui')['NDropdown']
     NDynamicTags: typeof import('naive-ui')['NDynamicTags']
+    NEllipsis: typeof import('naive-ui')['NEllipsis']
     NEmpty: typeof import('naive-ui')['NEmpty']
     NFlex: typeof import('naive-ui')['NFlex']
+    NFloatButton: typeof import('naive-ui')['NFloatButton']
+    NFloatButtonGroup: typeof import('naive-ui')['NFloatButtonGroup']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
     NFormItemGi: typeof import('naive-ui')['NFormItemGi']
     NGi: typeof import('naive-ui')['NGi']
     NGlobalStyle: typeof import('naive-ui')['NGlobalStyle']
     NGrid: typeof import('naive-ui')['NGrid']
     NH1: typeof import('naive-ui')['NH1']
+    NH2: typeof import('naive-ui')['NH2']
     NH3: typeof import('naive-ui')['NH3']
     NIcon: typeof import('naive-ui')['NIcon']
     NImage: typeof import('naive-ui')['NImage']
@@ -93,14 +100,18 @@ declare module 'vue' {
     NP: typeof import('naive-ui')['NP']
     NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
+    NProgress: typeof import('naive-ui')['NProgress']
     NQrCode: typeof import('naive-ui')['NQrCode']
     NRadio: typeof import('naive-ui')['NRadio']
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
+    NResult: typeof import('naive-ui')['NResult']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
     NSelect: typeof import('naive-ui')['NSelect']
     NSkeleton: typeof import('naive-ui')['NSkeleton']
     NSlider: typeof import('naive-ui')['NSlider']
+    NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
+    NTab: typeof import('naive-ui')['NTab']
     NTabPane: typeof import('naive-ui')['NTabPane']
     NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']

components.d.ts

@@ -199,20 +199,50 @@ const initFileIpc = (): void => {
   // 读取本地歌词
   ipcMain.handle(
     "read-local-lyric",
-    async (_, lyricDir: string, id: number, ext: string): Promise<string> => {
-      const pattern = `**/{,*.}${id}.${ext}`;
+    async (_, lyricDirs: string[], id: number): Promise<{ lrc: string; ttml: string }> => {
+      const result = { lrc: "", ttml: "" };
+
       try {
-        const files = await FastGlob(pattern, { cwd: lyricDir });
-        if (files.length > 0) {
-          const firstMatch = join(lyricDir, files[0]);
-          await access(firstMatch);
-          const lyric = await readFile(firstMatch, "utf-8");
-          if (lyric) return lyric;
+        // 定义需要查找的模式
+        const patterns = {
+          ttml: `**/${id}.ttml`,
+          lrc: `**/${id}.lrc`,
+        };
+
+        // 遍历每一个目录
+        for (const dir of lyricDirs) {
+          try {
+            // 查找 ttml
+            if (!result.ttml) {
+              const ttmlFiles = await FastGlob(patterns.ttml, { cwd: dir });
+              if (ttmlFiles.length > 0) {
+                const filePath = join(dir, ttmlFiles[0]);
+                await access(filePath);
+                result.ttml = await readFile(filePath, "utf-8");
+              }
+            }
+
+            // 查找 lrc
+            if (!result.lrc) {
+              const lrcFiles = await FastGlob(patterns.lrc, { cwd: dir });
+              if (lrcFiles.length > 0) {
+                const filePath = join(dir, lrcFiles[0]);
+                await access(filePath);
+                result.lrc = await readFile(filePath, "utf-8");
+              }
+            }
+
+            // 如果两种文件都找到了就提前结束搜索
+            if (result.ttml && result.lrc) break;
+          } catch {
+            // 某个路径异常，跳过
+          }
         }
       } catch {
-        /* empty */
+        /* 忽略错误 */
       }
-      return "";
+
+      return result;
     },
   );
 

electron/main/ipc/ipc-file.ts

@@ -40,7 +40,7 @@
     "@electron-toolkit/utils": "^4.0.0",
     "@imsyy/color-utils": "^1.0.2",
     "@material/material-color-utilities": "^0.3.0",
-    "@neteasecloudmusicapienhanced/api": "^4.29.16",
+    "@neteasecloudmusicapienhanced/api": "^4.29.17",
     "@pixi/app": "^7.4.3",
     "@pixi/core": "^7.4.3",
     "@pixi/display": "^7.4.3",
@@ -52,7 +52,7 @@
     "axios": "^1.13.2",
     "axios-retry": "^4.5.0",
     "change-case": "^5.4.4",
-    "dayjs": "^1.11.18",
+    "dayjs": "^1.11.19",
     "electron-dl": "^4.0.0",
     "electron-store": "^11.0.2",
     "electron-updater": "^6.6.2",
@@ -66,11 +66,11 @@
     "jss-preset-default": "^10.10.0",
     "localforage": "^1.10.0",
     "lodash-es": "^4.17.21",
-    "marked": "^16.4.0",
+    "marked": "^16.4.2",
     "md5": "^2.3.0",
-    "music-metadata": "^11.9.0",
-    "pinia": "^3.0.3",
-    "pinia-plugin-persistedstate": "^4.5.0",
+    "music-metadata": "^11.10.0",
+    "pinia": "^3.0.4",
+    "pinia-plugin-persistedstate": "^4.7.1",
     "plyr": "^3.8.3",
     "vue-virt-list": "^1.6.1"
   },
@@ -80,40 +80,40 @@
     "@electron-toolkit/utils": "^4",
     "@fastify/cookie": "^11.0.2",
     "@fastify/http-proxy": "^11.3.0",
-    "@fastify/multipart": "^9.2.1",
-    "@fastify/static": "^8.2.0",
+    "@fastify/multipart": "^9.3.0",
+    "@fastify/static": "^8.3.0",
     "@types/file-saver": "^2.0.7",
     "@types/howler": "^2.2.12",
     "@types/js-cookie": "^3.0.6",
-    "@types/md5": "^2.3.5",
-    "@types/node": "^24.7.2",
-    "@typescript-eslint/eslint-plugin": "^8.46.0",
-    "@typescript-eslint/parser": "^8.46.0",
+    "@types/md5": "^2.3.6",
+    "@types/node": "^24.10.1",
+    "@typescript-eslint/eslint-plugin": "^8.46.4",
+    "@typescript-eslint/parser": "^8.46.4",
     "@vitejs/plugin-vue": "^6.0.1",
     "ajv": "^8.17.1",
     "crypto-js": "^4.2.0",
     "electron": "38.2.2",
     "electron-builder": "^26.0.12",
     "electron-log": "^5.4.3",
     "electron-vite": "^4.0.1",
-    "eslint": "^9.37.0",
-    "eslint-plugin-vue": "^10.5.0",
+    "eslint": "^9.39.1",
+    "eslint-plugin-vue": "^10.5.1",
     "fast-glob": "^3.3.3",
-    "fastify": "^5.6.1",
+    "fastify": "^5.6.2",
     "naive-ui": "^2.43.1",
     "node-taglib-sharp": "^6.0.1",
     "prettier": "^3.6.2",
-    "sass": "^1.93.2",
-    "terser": "^5.44.0",
+    "sass": "^1.94.0",
+    "terser": "^5.44.1",
     "typescript": "^5.9.3",
     "unplugin-auto-import": "^20.2.0",
-    "unplugin-vue-components": "^29.1.0",
+    "unplugin-vue-components": "^29.2.0",
     "vite": "^7.2.2",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-vue-devtools": "^8.0.3",
     "vite-plugin-wasm": "^3.5.0",
     "vue": "^3.5.24",
-    "vue-router": "^4.5.1",
+    "vue-router": "^4.6.3",
     "vue-tsc": "^3.1.3"
   },
   "pnpm": {
@@ -122,7 +122,9 @@
       "electron-builder-squirrel-windows": "26.0.12"
     },
     "onlyBuiltDependencies": [
+      "@applemusic-like-lyrics/core",
       "@applemusic-like-lyrics/lyric",
+      "@applemusic-like-lyrics/vue",
       "@parcel/watcher",
       "core-js",
       "electron",