Merge pull request #660 from imsyy/dev-perf

优化下载与修复音质切换BUG

Author: imsyy

electron/main/ipc/ipc-file.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, dialog, ipcMain, shell } from "electron";
+import { type DownloadItem, app, BrowserWindow, dialog, ipcMain, shell } from "electron";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve } from "path";
 import { access, mkdir, readdir, readFile, stat, unlink, writeFile } from "fs/promises";
 import { parseFile } from "music-metadata";
@@ -12,6 +12,9 @@ import { useStore } from "../store";
 import FastGlob from "fast-glob";
 import pLimit from "p-limit";
 
+// 下载项
+const downloadItems = new Map<number, DownloadItem>();
+
 /**
  * 文件相关 IPC
  */
@@ -119,10 +122,10 @@ const initFileIpc = (): void => {
         "aac",
         "webm",
         "m4a",
-        "mp4",
         "ogg",
         "aiff",
         "aif",
+        "aifc",
       ];
       // 查找指定目录下的所有音乐文件
       const musicFiles = await FastGlob(`**/*.{${musicExtensions.join(",")}}`, globOpt(filePath));
@@ -467,7 +470,7 @@ const initFileIpc = (): void => {
         fileType: "mp3",
         path: app.getPath("downloads"),
       },
-    ): Promise<{ status: "success" | "skipped" | "error"; message?: string }> => {
+    ): Promise<{ status: "success" | "skipped" | "error" | "cancelled"; message?: string }> => {
       try {
         // 获取窗口
         const win = BrowserWindow.fromWebContents(event.sender);
@@ -505,16 +508,57 @@ const initFileIpc = (): void => {
           }
         }
 
+        // 尝试删除可能存在的临时文件
+        const tempPath = join(downloadPath, `${fileName}.${fileType}.tmp`);
+        try {
+          await unlink(tempPath);
+        } catch {
+          // 忽略错误
+        }
+
         // 下载文件
-        const songDownload = await download(win, url, {
-          directory: downloadPath,
-          filename: `${fileName}.${fileType}`,
-          showProgressBar: false,
-          onProgress: (progress) => {
-            win.webContents.send("download-progress", { ...progress, id: songData?.id });
-          },
-        });
+        let songDownload: DownloadItem;
+        try {
+          songDownload = await download(win, url, {
+            directory: downloadPath,
+            filename: `${fileName}.${fileType}`,
+            showProgressBar: false,
+            onProgress: (progress) => {
+              win.webContents.send("download-progress", { ...progress, id: songData?.id });
+            },
+            onStarted: (item) => {
+              if (songData?.id) {
+                downloadItems.set(songData.id, item);
+              }
+            },
+          });
+} catch (error: unknown) {
+  if (error instanceof Error && error.message === "The download was cancelled") {
+    return { status: "cancelled", message: "下载已取消" };
+  }
+  throw error;
+        } finally {
+          if (songData?.id) {
+            downloadItems.delete(songData.id);
+          }
+        }
+
         if (!downloadMeta || !songData?.cover) return { status: "success" };
+
+        // 验证文件是否存在
+        const savedPath = songDownload.getSavePath();
+        try {
+          await access(savedPath);
+        } catch (e) {
+          // 等待一小段时间再次检查（解决某些情况下文件系统延迟）
+          await new Promise((resolve) => setTimeout(resolve, 500));
+          try {
+            await access(savedPath);
+          } catch {
+            throw new Error(`File not found at ${savedPath}`);
+          }
+        }
+
         // 下载封面
         const coverUrl = songData?.coverSize?.l || songData.cover;
         const coverDownload = await download(win, coverUrl, {
@@ -523,7 +567,7 @@ const initFileIpc = (): void => {
           showProgressBar: false,
         });
         // 读取歌曲文件
-        let songFile = File.createFromPath(songDownload.getSavePath());
+        let songFile = File.createFromPath(savedPath);
         // 清除原有标签，防止脏数据（如模拟播放下载时的乱码歌词）
         songFile.removeTags(TagTypes.AllTags);
         songFile.save();
@@ -565,6 +609,17 @@ const initFileIpc = (): void => {
     },
   );
 
+  // 取消下载
+  ipcMain.handle("cancel-download", async (_, songId: number) => {
+    const item = downloadItems.get(songId);
+    if (item) {
+      item.cancel();
+      downloadItems.delete(songId);
+      return true;
+    }
+    return false;
+  });
+
   // 检查是否是相同的路径（规范化后比较）
   ipcMain.handle("check-if-same-path", (_, localFilesPath: string[], selectedDir: string) => {
     const resolvedSelectedDir = resolve(selectedDir);

electron/main/ipc/ipc-tray.ts

@@ -19,7 +19,7 @@ const initTrayIpc = (): void => {
 
   // 音乐名称更改
   ipcMain.on("play-song-change", (_, options) => {
-    let { title } = options;
+    let title = options?.title;
     if (!title) title = appName;
     // 更改标题
     tray?.setTitle(title);

src/components/Player/FullPlayer.vue

@@ -1,6 +1,6 @@
 <template>
   <Teleport to="body">
-    <Transition name="up" mode="out-in">
+    <Transition :name="settingStore.playerExpandAnimation" mode="out-in">
       <div
         v-if="statusStore.showFullPlayer"
         :style="{

src/components/Player/PlayerComment.vue

@@ -243,6 +243,13 @@ onMounted(() => {
   }
   .comment-list {
     margin: 0 auto;
+    :deep(.comments) {
+      .text {
+        &::selection {
+          background-color: rgba(var(--main-cover-color));
+        }
+      }
+    }
   }
   .placeholder {
     width: 100%;

src/components/Player/PlayerData.vue

@@ -43,7 +43,7 @@
         <n-popselect
           :value="currentPlayingLevel"
           :options="qualityOptions"
-          :disabled="!!musicStore.playSong.path || statusStore.playUblock"
+          :disabled="!!musicStore.playSong.path || statusStore.playUblock || !!musicStore.playSong.pc"
           class="player"
           trigger="click"
           placement="top"

src/components/Setting/AboutSetting.vue

@@ -56,6 +56,55 @@
         </n-card>
       </n-flex>
     </div>
+    <div class="set-list">
+      <n-h3 prefix="bar"> 开发人员 </n-h3>
+      <n-flex :size="12" class="link">
+        <n-card
+          v-for="(item, index) in developers"
+          :key="index"
+          class="link-item"
+          hoverable
+          @click="openLink(item.url)"
+        >
+          <n-flex align="center">
+            <n-avatar round :size="40" :src="item.avatar" fallback-src="/images/avatar.jpg?asset" />
+            <n-flex vertical :gap="4">
+              <n-text class="name" strong> {{ item.name }} </n-text>
+              <n-text class="tip" :depth="3" style="font-size: 12px">
+                {{ item.role }}
+              </n-text>
+            </n-flex>
+          </n-flex>
+        </n-card>
+      </n-flex>
+    </div>
+    <Transition name="fade" mode="out-in">
+      <div v-if="allContributors.length > 0" class="set-list">
+        <n-collapse arrow-placement="right">
+          <n-collapse-item title="更多贡献者" name="1">
+            <n-flex :size="12" class="link">
+              <n-card
+                v-for="(item, index) in allContributors"
+                :key="index"
+                class="link-item"
+                hoverable
+                @click="openLink(item.url)"
+              >
+                <n-flex align="center">
+                  <n-avatar round :size="40" :src="item.avatar" fallback-src="/images/avatar.jpg?asset" />
+                  <n-flex vertical :gap="4">
+                    <n-text class="name" strong> {{ item.name }} </n-text>
+                    <n-text class="tip" :depth="3" style="font-size: 12px">
+                      {{ item.role }}
+                    </n-text>
+                  </n-flex>
+                </n-flex>
+              </n-card>
+            </n-flex>
+          </n-collapse-item>
+        </n-collapse>
+      </div>
+    </Transition>
     <div class="set-list">
       <n-h3 prefix="bar"> 社区与资讯 </n-h3>
       <n-flex :size="12" class="link">
@@ -110,6 +159,42 @@ const statusStore = useStatusStore();
 // 开发者模式点击次数
 const developerModeClickCount = ref(0);
 
+// 开发人员
+type DeveloperType = {
+  name: string;
+  role: string;
+  url: string;
+  avatar: string;
+};
+
+const developers = ref<DeveloperType[]>([]);
+const allContributors = ref<DeveloperType[]>([]);
+
+// 获取贡献者
+const getContributors = async () => {
+  try {
+    const response = await fetch(
+      "https://api.github.com/repos/imsyy/SPlayer/contributors?per_page=100&anon=true",
+    );
+    const data = await response.json();
+    if (Array.isArray(data)) {
+      const list = data
+        .filter((item: any) => item.login !== "type-bot" && item.type !== "Bot")
+        .map((item: any) => ({
+          name: item.login || item.name,
+          role: item.login === "imsyy" ? "Owner / Full Stack" : "Contributor",
+          url: item.html_url || "",
+          avatar: item.avatar_url || "/images/avatar.jpg?asset",
+        }));
+      developers.value = list.slice(0, 6);
+      allContributors.value = list.slice(6);
+    }
+  } catch (error) {
+    console.error("Failed to fetch contributors:", error);
+    // Fallback or empty state handling if needed, currently just empty
+  }
+};
+
 // 特别鸣谢
 const contributors = [
   {
@@ -215,7 +300,10 @@ const openDeveloperMode = useThrottleFn(() => {
   }
 }, 100);
 
-onMounted(getUpdateData);
+onMounted(() => {
+  getUpdateData();
+  getContributors();
+});
 </script>
 
 <style lang="scss" scoped>

src/components/Setting/PlaySetting.vue

@@ -142,6 +142,26 @@
     </div>
     <div class="set-list">
       <n-h3 prefix="bar"> 播放器 </n-h3>
+      <n-card class="set-item">
+        <div class="label">
+          <n-text class="name">播放器展开动画</n-text>
+          <n-text class="tip" :depth="3">选择播放器展开时的动画效果</n-text>
+        </div>
+        <n-select
+          v-model:value="settingStore.playerExpandAnimation"
+          :options="[
+            {
+              label: '上浮',
+              value: 'up',
+            },
+            {
+              label: '平滑',
+              value: 'smooth',
+            },
+          ]"
+          class="set"
+        />
+      </n-card>
       <n-card class="set-item">
         <div class="label">
           <n-text class="name">播放器样式</n-text>

src/core/player/PlayerController.ts

@@ -491,6 +491,14 @@ class PlayerController {
       this.retryInfo.count = 0;
       this.failSkipCount++;
 
+      // 连续跳过 3 首直接暂停
+      if (this.failSkipCount >= 3) {
+        window.$message.error("播放失败次数过多，已停止播放");
+        this.pause(true);
+        this.failSkipCount = 0;
+        return;
+      }
+
       // 列表只有一首，或连续跳过所有歌曲
       if (dataStore.playList.length <= 1 || this.failSkipCount >= dataStore.playList.length) {
         window.$message.error("当前已无可播放歌曲");
@@ -944,11 +952,11 @@ class PlayerController {
           ? song.album.name
           : String(song.album),
       artwork: [
-        { src: musicStore.getSongCover("s"), sizes: "100x100", type: "image/jpeg" },
-        { src: musicStore.getSongCover("m"), sizes: "300x300", type: "image/jpeg" },
-        { src: musicStore.getSongCover("cover"), sizes: "512x512", type: "image/jpeg" },
-        { src: musicStore.getSongCover("l"), sizes: "1024x1024", type: "image/jpeg" },
-        { src: musicStore.getSongCover("xl"), sizes: "1920x1920", type: "image/jpeg" },
+        { src: musicStore.getSongCover("s") || musicStore.playSong.cover || "", sizes: "100x100", type: "image/jpeg" },
+        { src: musicStore.getSongCover("m") || musicStore.playSong.cover || "", sizes: "300x300", type: "image/jpeg" },
+        { src: musicStore.getSongCover("cover") || musicStore.playSong.cover || "", sizes: "512x512", type: "image/jpeg" },
+        { src: musicStore.getSongCover("l") || musicStore.playSong.cover || "", sizes: "1024x1024", type: "image/jpeg" },
+        { src: musicStore.getSongCover("xl") || musicStore.playSong.cover || "", sizes: "1920x1920", type: "image/jpeg" },
       ],
     });
   }

src/core/player/SongManager.ts

@@ -79,9 +79,10 @@ class SongManager {
    * @param id 歌曲id
    * @returns 在线播放信息
    */
-  public getOnlineUrl = async (id: number): Promise<AudioSource> => {
+  public getOnlineUrl = async (id: number, isPc: boolean = false): Promise<AudioSource> => {
     const settingStore = useSettingStore();
-    const res = await songUrl(id, settingStore.songLevel);
+    const level = isPc ? "exhigh" : settingStore.songLevel;
+    const res = await songUrl(id, level);
     console.log(`🌐 ${id} music data:`, res);
     const songData = res.data?.[0];
     // 是否有播放地址
@@ -198,7 +199,7 @@ class SongManager {
       // 是否可解锁
       const canUnlock = isElectron && nextSong.type !== "radio" && settingStore.useSongUnlock;
       // 先请求官方地址
-      const { url: officialUrl, isTrial, quality } = await this.getOnlineUrl(songId);
+      const { url: officialUrl, isTrial, quality } = await this.getOnlineUrl(songId, false);
       if (officialUrl && !isTrial) {
         // 官方可播放且非试听
         this.nextPrefetch = { id: songId, url: officialUrl, isUnlocked: false, quality };
@@ -273,7 +274,7 @@ class SongManager {
       // 是否可解锁
       const canUnlock = isElectron && song.type !== "radio" && settingStore.useSongUnlock;
       // 尝试获取官方链接
-      const { url: officialUrl, isTrial, quality } = await this.getOnlineUrl(songId);
+      const { url: officialUrl, isTrial, quality } = await this.getOnlineUrl(songId, !!song.pc);
       // 如果官方链接有效且非试听（或者用户接受试听）
       if (officialUrl && (!isTrial || (isTrial && settingStore.playSongDemo))) {
         if (isTrial) window.$message.warning("当前歌曲仅可试听");