🐞 fix: 修复本地歌曲文件读取 #593

imsyy · imsyy · commit 69ae3382cdbb · 2025-11-28T00:38:55.000+08:00
diff --git a/.github/workflows/issue-helper.yml b/.github/workflows/issue-helper.yml
@@ -35,7 +35,7 @@ jobs:
           actions: "create-comment, close-issue"
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |
-            抱歉，由于该 Issue 被标记为 **${{ github.event.label.name }}**，系统将自动将其关闭
+            抱歉，由于被标记为 **${{ github.event.label.name }}**，该 Issue 将自动关闭
             如果您认为该 Issue 仍然有效，请重新开启或者创建新的 Issue，我们会尽快确认并修复
       # 有问题回复
       - name: Auto Reply
@@ -45,7 +45,7 @@ jobs:
           actions: "create-comment"
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |
-            🤝 您好 @${{ github.event.issue.user.login }}，感谢您的反馈！我们注意到该问题被添加了 **${{ github.event.label.name }}**
+            🤝 您好 @${{ github.event.issue.user.login }}，感谢您的反馈！
             由于缺少复现步骤，我们无法重现问题，因此无法修复
             请确保您已经详细描述了问题的复现步骤，维护团队会尽快查看
       # 已确认 BUG
diff --git a/auto-eslint.mjs b/auto-eslint.mjs
@@ -59,6 +59,7 @@ export default {
     "isRef": true,
     "isShallow": true,
     "makeDestructurable": true,
+    "manualResetRef": true,
     "markRaw": true,
     "nextTick": true,
     "onActivated": true,
@@ -96,11 +97,11 @@ export default {
     "refAutoReset": true,
     "refDebounced": true,
     "refDefault": true,
+    "refManualReset": true,
     "refThrottled": true,
     "refWithControl": true,
     "resolveComponent": true,
     "resolveRef": true,
-    "resolveUnref": true,
     "shallowReactive": true,
     "shallowReadonly": true,
     "shallowRef": true,
diff --git a/electron/main/ipc/ipc-file.ts b/electron/main/ipc/ipc-file.ts
@@ -33,35 +33,53 @@ const initFileIpc = (): void => {
   // 遍历音乐文件
   ipcMain.handle("get-music-files", async (_, dirPath: string) => {
     try {
+      // 校验路径有效性
+      if (!dirPath || dirPath.trim() === "") {
+        ipcLog.warn("⚠️ Empty directory path provided, skipping");
+        return [];
+      }
       // 规范化路径
       const filePath = resolve(dirPath).replace(/\\/g, "/");
+      // 检查目录是否存在
+      try {
+        await access(filePath);
+      } catch {
+        ipcLog.warn(`⚠️ Directory not accessible: ${filePath}`);
+        return [];
+      }
       console.info(`📂 Fetching music files from: ${filePath}`);
       // 查找指定目录下的所有音乐文件
       const musicFiles = await FastGlob("**/*.{mp3,wav,flac,aac,webm}", globOpt(filePath));
-      // 解析元信息
+      // 解析元信息（使用 allSettled 防止单个文件失败影响整体）
       const metadataPromises = musicFiles.map(async (file) => {
-        const filePath = join(dirPath, file);
-        // 处理元信息
-        const { common, format } = await parseFile(filePath);
-        // 获取文件大小
-        const { size } = await stat(filePath);
-        return {
-          id: getFileID(filePath),
-          name: common.title || basename(filePath),
-          artists: common.artists?.[0] || common.artist,
-          album: common.album || "",
-          alia: common.comment?.[0]?.text || "",
-          duration: (format?.duration ?? 0) * 1000,
-          size: (size / (1024 * 1024)).toFixed(2),
-          path: filePath,
-          quality: format.bitrate ?? 0,
-        };
+        const fullPath = join(dirPath, file);
+        try {
+          // 处理元信息
+          const { common, format } = await parseFile(fullPath);
+          // 获取文件大小
+          const { size } = await stat(fullPath);
+          return {
+            id: getFileID(fullPath),
+            name: common.title || basename(fullPath),
+            artists: common.artists?.[0] || common.artist,
+            album: common.album || "",
+            alia: common.comment?.[0]?.text || "",
+            duration: (format?.duration ?? 0) * 1000,
+            size: (size / (1024 * 1024)).toFixed(2),
+            path: fullPath,
+            quality: format.bitrate ?? 0,
+          };
+        } catch (err) {
+          ipcLog.warn(`⚠️ Failed to parse file: ${fullPath}`, err);
+          return null;
+        }
       });
-      const metadataArray = await Promise.all(metadataPromises);
-      return metadataArray;
+      const metadataResults = await Promise.all(metadataPromises);
+      // 过滤掉解析失败的文件
+      return metadataResults.filter((item) => item !== null);
     } catch (error) {
       ipcLog.error("❌ Error fetching music metadata:", error);
-      throw error;
+      return [];
     }
   });
 
diff --git a/src/components/Player/FullPlayer.vue b/src/components/Player/FullPlayer.vue
@@ -82,7 +82,6 @@
 <script setup lang="ts">
 import { useStatusStore, useMusicStore, useSettingStore } from "@/stores";
 import { isElectron } from "@/utils/env";
-import { throttle } from "lodash-es";
 
 const musicStore = useMusicStore();
 const statusStore = useStatusStore();
@@ -139,13 +138,13 @@ const {
 }, 3000);
 
 // 鼠标移动
-const playerMove = throttle(
+const playerMove = useThrottleFn(
   () => {
     statusStore.playerMetaShow = true;
     if (!isPending.value) startShow();
   },
   300,
-  { trailing: false },
+  false,
 );
 
 // 停用隐藏
@@ -168,7 +167,7 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
-  console.log("离开播放器");
+  stopShow();
   if (isElectron) window.electron.ipcRenderer.send("prevent-sleep", false);
 });
 </script>
diff --git a/src/components/Player/MainLyric.vue b/src/components/Player/MainLyric.vue
@@ -312,6 +312,9 @@ onMounted(() => {
 onBeforeUnmount(() => {
   console.log("离开歌词");
   pauseSeek();
+  if (isElectron) {
+    window.electron.ipcRenderer.removeAllListeners("lyricsScroll");
+  }
 });
 </script>
 
diff --git a/src/components/Player/PlayerCover.vue b/src/components/Player/PlayerCover.vue
@@ -47,6 +47,17 @@ const dynamicCoverLoaded = ref<boolean>(false);
 // 视频元素
 const videoRef = ref<HTMLVideoElement | null>(null);
 
+// 清理动态封面资源
+const cleanupDynamicCover = () => {
+  if (videoRef.value) {
+    videoRef.value.pause();
+    videoRef.value.src = "";
+    videoRef.value.load();
+  }
+  dynamicCover.value = "";
+  dynamicCoverLoaded.value = false;
+};
+
 // 封面再放送
 const { start: dynamicCoverStart, stop: dynamicCoverStop } = useTimeoutFn(
   () => {
@@ -89,6 +100,13 @@ watch(
 );
 
 onMounted(getDynamicCover);
+
+onBeforeUnmount(() => {
+  // 停止定时器
+  dynamicCoverStop();
+  // 清理动态封面资源
+  cleanupDynamicCover();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/Player/PlayerSpectrum.vue b/src/components/Player/PlayerSpectrum.vue
@@ -107,6 +107,8 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
+  // 停止绘制循环
+  isKeepDrawing.value = false;
   pauseDraw();
 });
 </script>
diff --git a/src/views/Local/layout.vue b/src/views/Local/layout.vue
@@ -158,7 +158,7 @@ const player = usePlayer();
 const localStore = useLocalStore();
 const settingStore = useSettingStore();
 
-const loading = ref<boolean>(true);
+const loading = ref<boolean>(false);
 const loadingMsg = ref<MessageReactive | null>(null);
 
 // 本地歌曲总线
@@ -184,10 +184,12 @@ const listData = computed<SongType[]>(() => {
 // 获取音乐文件夹
 const getMusicFolder = async (): Promise<string[]> => {
   defaultMusicPath.value = await window.electron.ipcRenderer.invoke("get-default-dir", "music");
-  return [
+  const paths = [
     settingStore.showDefaultLocalPath ? defaultMusicPath.value : "",
     ...settingStore.localFilesPath,
   ];
+  // 过滤空路径
+  return paths.filter((p) => p && p.trim() !== "");
 };
 
 // 全部音乐大小
@@ -219,42 +221,50 @@ const moreOptions = computed<DropdownOption[]>(() => [
 // 获取全部路径歌曲
 const getAllLocalMusic = debounce(
   async (showTip: boolean = false) => {
-    // 获取路径
-    const allPath = await getMusicFolder();
-    if (!allPath || !allPath.length) return;
-    // 加载提示
-    if (showTip) {
-      loadingMsg.value = window.$message.loading("正在获取本地歌曲", {
-        duration: 0,
-      });
-    }
-    // 获取全部歌曲
-    loading.value = true;
-    const dirContentsPromises = allPath.map((path) =>
-      window.electron.ipcRenderer.invoke("get-music-files", path),
-    );
-    const results = await Promise.allSettled(dirContentsPromises);
-    const allSongData = results
-      .filter((result) => result.status === "fulfilled")
-      .map((result) => (result as PromiseFulfilledResult<any>).value);
-    // 展平去重
-    const songData = uniqBy(flattenDeep(allSongData), "id");
-    // 处理数据
-    const listData = formatSongsList(songData);
-    // 数据是否变化
-    const oldLength = localStore.localSongs.length;
-    if (oldLength === 0 && listData.length > 0) {
-      window.$message.success(`发现 ${listData.length} 首歌曲`);
-    } else if (listData.length > oldLength) {
-      window.$message.success(`新增 ${listData.length - oldLength} 首歌曲`);
+    try {
+      // 获取路径
+      const allPath = await getMusicFolder();
+      if (!allPath || !allPath.length) {
+        loading.value = false;
+        return;
+      }
+      // 加载提示
+      if (showTip) {
+        loadingMsg.value = window.$message.loading("正在获取本地歌曲", {
+          duration: 0,
+        });
+      }
+      // 获取全部歌曲
+      loading.value = true;
+      const dirContentsPromises = allPath.map((path) =>
+        window.electron.ipcRenderer.invoke("get-music-files", path),
+      );
+      const results = await Promise.allSettled(dirContentsPromises);
+      const allSongData = results
+        .filter((result) => result.status === "fulfilled")
+        .map((result) => (result as PromiseFulfilledResult<any>).value);
+      // 展平去重
+      const songData = uniqBy(flattenDeep(allSongData), "id");
+      // 处理数据
+      const listData = formatSongsList(songData);
+      // 数据是否变化
+      const oldLength = localStore.localSongs.length;
+      if (oldLength === 0 && listData.length > 0) {
+        window.$message.success(`发现 ${listData.length} 首歌曲`);
+      } else if (listData.length > oldLength) {
+        window.$message.success(`新增 ${listData.length - oldLength} 首歌曲`);
+      }
+      if (showTip) window.$message.success(`已发现 ${listData.length} 首`);
+      // 保存并更新
+      localStore.updateLocalSong(listData);
+    } catch (error) {
+      console.error("获取本地音乐失败:", error);
+      window.$message.error("获取本地音乐失败，请重试");
+    } finally {
+      loading.value = false;
+      loadingMsg.value?.destroy();
+      loadingMsg.value = null;
     }
-    if (showTip) window.$message.success(`已发现 ${listData.length} 首`);
-    // 保存并更新
-    localStore.updateLocalSong(listData);
-    // 关闭加载
-    loading.value = false;
-    loadingMsg.value?.destroy();
-    loadingMsg.value = null;
   },
   300,
   { leading: true, trailing: false },
