Merge branch 'dev' into dev-feat

kazukokawagawa · web-flow · commit 53b697f32a69 · 2026-02-04T14:02:01.000+08:00
diff --git a/components.d.ts b/components.d.ts
@@ -39,7 +39,6 @@ declare module 'vue' {
     FullPlayer: typeof import('./src/components/Player/FullPlayer.vue')['default']
     FullPlayerMobile: typeof import('./src/components/Player/FullPlayerMobile.vue')['default']
     FullscreenPlayerManager: typeof import('./src/components/Modal/Setting/FullscreenPlayerManager.vue')['default']
-    GlobalErrorHandler: typeof import('./src/components/Global/GlobalErrorHandler.vue')['default']
     HomePageSectionManager: typeof import('./src/components/Modal/Setting/HomePageSectionManager.vue')['default']
     JumpArtist: typeof import('./src/components/Modal/JumpArtist.vue')['default']
     ListComment: typeof import('./src/components/List/ListComment.vue')['default']
diff --git a/electron/main/ipc/ipc-file.ts b/electron/main/ipc/ipc-file.ts
@@ -1,3 +1,4 @@
+import type { SongMetadata } from "@native/tools";
 import { app, BrowserWindow, dialog, ipcMain, shell } from "electron";
 import FastGlob from "fast-glob";
 import type { Options as GlobOptions } from "fast-glob/out/settings";
@@ -12,30 +13,8 @@ import { useStore } from "../store";
 import { getFileID, getFileMD5, metaDataLyricsArrayToLrc } from "../utils/helper";
 import { loadNativeModule } from "../utils/native-loader";
 
-interface SongMetadata {
-  title: string;
-  artist: string;
-  album: string;
-  coverUrl?: string;
-  lyric?: string;
-  description?: string;
-}
-
-interface ToolsModule {
-  downloadFile(
-    id: number,
-    url: string,
-    filePath: string,
-    metadata: SongMetadata | undefined | null,
-    threadCount: number,
-    referer: string | undefined | null,
-    onProgress: (err: any, progressJson: string) => void,
-  ): Promise<void>;
-  cancelDownload(id: number): void;
-  writeMusicMetadata(filePath: string, metadata: SongMetadata, coverPath?: string): Promise<void>;
-}
-
-const tools = loadNativeModule("tools.node", "tools") as ToolsModule;
+type toolModule = typeof import("@native/tools");
+const tools: toolModule = loadNativeModule("tools.node", "tools");
 
 interface DownloadProgress {
   percent: number;
diff --git a/electron/main/services/MusicCacheService.ts b/electron/main/services/MusicCacheService.ts
@@ -1,21 +1,11 @@
 import { existsSync } from "fs";
-import { unlink, rename, stat } from "fs/promises";
-import { CacheService } from "./CacheService";
+import { rename, stat, unlink } from "fs/promises";
 import { cacheLog } from "../logger";
 import { loadNativeModule } from "../utils/native-loader";
+import { CacheService } from "./CacheService";
 
-interface ToolsModule {
-  downloadFile(
-    id: number,
-    url: string,
-    filePath: string,
-    metadata: any,
-    threadCount: number,
-    onProgress: (err: any, progressJson: string) => void
-  ): Promise<void>;
-}
-
-const tools = loadNativeModule("tools.node", "tools") as ToolsModule;
+type toolModule = typeof import("@native/tools");
+const tools: toolModule = loadNativeModule("tools.node", "tools");
 
 export class MusicCacheService {
   private static instance: MusicCacheService;
@@ -102,14 +92,14 @@ export class MusicCacheService {
       // 使用 Rust 下载器
       // 这里的 id 仅用于进度或取消，缓存下载暂时传入 0 或尝试转换
       const numericId = typeof id === "number" ? id : 0;
-      
+
       await tools.downloadFile(
-        numericId, 
-        url, 
-        tempPath, 
+        numericId,
+        url,
+        tempPath,
         null, // No metadata for cache
-        4,    // Thread count
-        () => {} // No progress callback needed for cache currently
+        4, // Thread count
+        () => {}, // No progress callback needed for cache currently
       );
 
       // 检查临时文件是否存在
diff --git a/native/tools/src/lib.rs b/native/tools/src/lib.rs
@@ -1,15 +1,31 @@
-#[cfg(target_os = "linux")]
-mod linux;
-#[cfg(target_os = "macos")]
-mod macos;
-#[cfg(target_os = "windows")]
-mod windows;
-mod download;
+//! 适用于 `SPlayer` 的工具原生模块
+//!
+//! 你可以在这里添加代码量不那么多的单个功能，如果代码量非常多，请新开一个原生模块
+//!
+//! 注意：若使用了针对特点平台的条件编译，必须在这里重新导出一个在全平台下可用的函数，
+//! 即使它在其他平台是空操作以防止 JS 端在其他平台编译时找不到对应的函数声明
 
+mod download;
 mod scanner;
 
+pub use download::*;
+use napi_derive::napi;
 pub use scanner::scan_music_library;
 #[cfg(target_os = "windows")]
-pub use windows::get_taskbar_created_message_id;
+use windows::{
+    core::w,
+    Win32::UI::WindowsAndMessaging::RegisterWindowMessageW,
+};
 
-pub use download::*;
+#[napi]
+pub fn get_taskbar_created_message_id() -> u32 {
+    #[cfg(target_os = "windows")]
+    {
+        unsafe { RegisterWindowMessageW(w!("TaskbarCreated")) }
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    {
+        0
+    }
+}
diff --git a/native/tools/src/linux.rs b/native/tools/src/linux.rs
diff --git a/native/tools/src/macos.rs b/native/tools/src/macos.rs
diff --git a/native/tools/src/scanner.rs b/native/tools/src/scanner.rs
@@ -15,8 +15,8 @@ use std::{
 
 use anyhow::Result;
 use crossbeam_channel::{
-    Receiver,
     bounded,
+    Receiver,
 };
 use jwalk::WalkDir;
 use lofty::{
diff --git a/native/tools/src/windows.rs b/native/tools/src/windows.rs
diff --git a/src/assets/data/lyricConfig.ts b/src/assets/data/lyricConfig.ts
@@ -16,6 +16,7 @@ const config: LyricConfig = {
   textBackgroundMask: false,
   backgroundMaskColor: "rgba(0, 0, 0, 0.5)",
   alwaysShowPlayInfo: false,
+  animation: true,
 };
 
 export default config;
diff --git a/src/components/Setting/config/lyric.ts b/src/components/Setting/config/lyric.ts
@@ -637,6 +637,19 @@ export const useLyricSettings = (): SettingConfig => {
               },
             }),
           },
+          {
+            key: "desktopLyricAnimation",
+            label: "歌词切换动画",
+            type: "switch",
+            description: "开启后歌词切换时会有动画过渡效果",
+            value: computed({
+              get: () => desktopLyricConfig.animation,
+              set: (v) => {
+                desktopLyricConfig.animation = v;
+                saveDesktopLyricConfig();
+              },
+            }),
+          },
           {
             key: "desktopLyricFontWeight",
             label: "文字字重",
diff --git a/src/core/player/PlayerController.ts b/src/core/player/PlayerController.ts
@@ -562,7 +562,6 @@ class PlayerController {
       mediaSessionManager.updateState(duration, currentTime);
       // 更新桌面歌词
       playerIpc.sendLyric({
-        lyricIndex: statusStore.lyricIndex,
         currentTime,
         songId: musicStore.playSong?.id,
         songOffset: statusStore.getSongOffset(musicStore.playSong?.id),
diff --git a/src/types/desktop-lyric.d.ts b/src/types/desktop-lyric.d.ts
@@ -55,6 +55,8 @@ export interface LyricConfig {
   backgroundMaskColor: string;
   /** 始终展示播放信息 */
   alwaysShowPlayInfo: boolean;
+  /** 是否开启歌词切换动画 */
+  animation: boolean;
 }
 
 /**
diff --git a/src/utils/calc.ts b/src/utils/calc.ts
@@ -5,12 +5,14 @@ import { LyricLine } from "@applemusic-like-lyrics/lyric";
  * @param currentTime 当前播放时间 (ms)
  * @param lyrics 原始歌词数组
  * @param offset 偏移量
+ * @param maxKeep 最大保留行数 (用于多行同时激活)
  * @returns 歌词索引
  */
 export const calculateLyricIndex = (
   currentTime: number,
   lyrics: LyricLine[],
   offset: number = 0,
+  maxKeep: number = 3,
 ): number => {
   // 边界检查
   if (!lyrics || !lyrics.length) return -1;
@@ -28,26 +30,44 @@ export const calculateLyricIndex = (
     const idx = lyrics.findIndex((v) => getStart(v) >= playSeek);
     return idx === -1 ? lyrics.length - 1 : idx - 1;
   }
-
   // 逐字歌词
   if (playSeek < getStart(lyrics[0])) return -1;
   const activeCandidates: number[] = [];
-  for (let i = 0; i < lyrics.length; i++) {
+  // 使用二分查找找到第一个开始时间大于 playSeek 的行
+  // 那么它的前一个可能就是当前行的候选
+  let low = 0;
+  let high = lyrics.length - 1;
+  let firstAfterIndex = lyrics.length;
+  while (low <= high) {
+    const mid = (low + high) >> 1;
+    if (getStart(lyrics[mid]) > playSeek) {
+      firstAfterIndex = mid;
+      high = mid - 1;
+    } else {
+      low = mid + 1;
+    }
+  }
+  // 从找到的位置向前回溯，找到所有包含当前时间的行 (处理重叠情况)
+  // 向前回溯直到 endTime < playSeek 或者到达数组头部
+  // 通常重叠不会太严重，回溯几行即可
+  for (let i = firstAfterIndex - 1; i >= 0; i--) {
     const line = lyrics[i];
-    if (getStart(line) > playSeek) break;
     const end = line.endTime ?? Infinity;
+    // 如果该行的结束时间已经在播放时间之前，且不是因为 Infinity
+    // 只要 startTime <= playSeek 且 endTime > playSeek，就是候选
     if (playSeek >= getStart(line) && playSeek < end) {
-      activeCandidates.push(i);
+      activeCandidates.push(i); // 倒序加入
     }
   }
-  // 不在任何区间 -> 找最近的上一句
+  // 恢复顺序 (因为是倒序 push 的)
+  activeCandidates.reverse();
+  // 不在任何区间 -> 找最近的上一句 (Gap)
   if (activeCandidates.length === 0) {
-    const next = lyrics.findIndex((v) => getStart(v) > playSeek);
-    return next === -1 ? lyrics.length - 1 : next - 1;
+    return firstAfterIndex - 1;
   }
   // 多句激活处理
   if (activeCandidates.length === 1) return activeCandidates[0];
-  const keepCount = activeCandidates.length >= 3 ? 3 : 2;
+  const keepCount = activeCandidates.length >= maxKeep ? maxKeep : 2;
   const concurrent = activeCandidates.slice(-keepCount);
   return concurrent[0];
 };
diff --git a/src/views/DesktopLyric/index.vue b/src/views/DesktopLyric/index.vue
