From d335f57a1a4c949e7cbf68718f352b3c29f31d5f Mon Sep 17 00:00:00 2001
From: alger <algerkc@qq.com>
Date: Sat, 1 Mar 2025 10:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E4=BC=98=E5=8C=96=E9=9F=B3?=
 =?UTF-8?q?=E4=B9=90=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=80=A7=E5=92=8C=E9=94=99=E8=AF=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/MusicList.vue | 84 +++++++++++++++++++++------
 1 file changed, 65 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/MusicList.vue b/src/renderer/components/MusicList.vue
index feafdc9..c2392c5 100644
--- a/src/renderer/components/MusicList.vue
+++ b/src/renderer/components/MusicList.vue
@@ -82,6 +82,7 @@
 </template>
 
 <script setup lang="ts">
+import { onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStore } from 'vuex';
 
@@ -147,18 +148,53 @@ const formatDetail = computed(() => (detail: any) => {
 
 const loadAllSongs = () => {
   return new Promise((resolve, reject) => {
-    const loadNext = () => {
-      if (displayedSongs.value.length >= total.value) {
-        resolve(true);
-        return;
-      }
+    // 设置最大重试次数
+    let retryCount = 0;
+    const maxRetries = 3;
 
-      loadMoreSongs()
-        .then(() => {
+    const loadNext = async () => {
+      try {
+        // 如果已经加载完所有歌曲或者达到最大重试次数，则解析 Promise
+        if (displayedSongs.value.length >= total.value) {
+          console.log('所有歌曲加载完成，总数:', displayedSongs.value.length);
+          resolve(true);
+          return;
+        }
+
+        // 如果重试次数过多，也解析 Promise，但记录警告
+        if (retryCount >= maxRetries) {
+          console.warn(
+            '达到最大重试次数，已加载:',
+            displayedSongs.value.length,
+            '总数:',
+            total.value
+          );
+          resolve(false);
+          return;
+        }
+
+        // 记录加载前的歌曲数量
+        const beforeCount = displayedSongs.value.length;
+
+        // 加载更多歌曲
+        await loadMoreSongs();
+
+        // 检查是否有新歌曲被加载
+        if (displayedSongs.value.length > beforeCount) {
+          // 重置重试计数
+          retryCount = 0;
           // 使用 setTimeout 避免阻塞主线程
           setTimeout(loadNext, 100);
-        })
-        .catch(reject);
+        } else {
+          // 如果没有新歌曲被加载，增加重试计数
+          retryCount++;
+          console.log('没有新歌曲被加载，重试:', retryCount);
+          setTimeout(loadNext, 500 * retryCount);
+        }
+      } catch (error) {
+        console.error('加载歌曲出错:', error);
+        reject(error);
+      }
     };
 
     loadNext();
@@ -180,10 +216,13 @@ const handlePlay = () => {
 
   // 如果还有未加载的歌曲，在后台异步加载
   if (displayedSongs.value.length < total.value) {
-    setTimeout(() => {
-      loadAllSongs()
-        .then(() => {
-          // 加载完成后更新完整播放列表
+    // 使用一个标志变量来跟踪后台加载状态
+    const isBackgroundLoading = ref(true);
+
+    loadAllSongs()
+      .then(() => {
+        // 加载完成后更新完整播放列表
+        if (isBackgroundLoading.value) {
           store.commit(
             'setPlayList',
             displayedSongs.value.map((item) => ({
@@ -194,12 +233,19 @@ const handlePlay = () => {
               }
             }))
           );
-        })
-        .catch((error) => {
-          console.error('加载完整播放列表失败:', error);
-          window.$message.warning(t('common.partialLoadFailed'));
-        });
-    }, 2000);
+        }
+      })
+      .catch((error) => {
+        console.error('加载完整播放列表失败:', error);
+      })
+      .finally(() => {
+        isBackgroundLoading.value = false;
+      });
+
+    // 监听组件销毁，避免组件已卸载时仍然更新状态
+    onUnmounted(() => {
+      isBackgroundLoading.value = false;
+    });
   }
 };