Merge pull request #771 from imsyy/dev-fixerr

imsyy · web-flow · commit 5d0791606d05 · 2026-01-25T21:55:06.000+08:00
✨ feat: 增加更详细的日志输出
diff --git a/src/components/Player/PlayerMeta/PlayerData.vue b/src/components/Player/PlayerMeta/PlayerData.vue
@@ -212,7 +212,10 @@ const qualityOptions = computed<DropdownOption[]>(() => {
 const lyricMode = computed(() => {
   if (settingStore.showYrc) {
     if (statusStore.usingTTMLLyric) return "TTML";
-    if (musicStore.isHasYrc) return "YRC";
+    if (musicStore.isHasYrc) {
+      // 如果是从QQ音乐获取的歌词，显示QRC
+      return statusStore.usingQRCLyric ? "QRC" : "YRC";
+    }
   }
   return musicStore.isHasLrc ? "LRC" : "NO-LRC";
 });
diff --git a/src/core/player/LyricManager.ts b/src/core/player/LyricManager.ts
@@ -6,7 +6,7 @@ import { useMusicStore, useSettingStore, useStatusStore, useStreamingStore } fro
 import { type SongLyric } from "@/types/lyric";
 import { SongType } from "@/types/main";
 import { isElectron } from "@/utils/env";
-import { isWordLevelFormat, parseSmartLrc } from "@/utils/lyricParser";
+import { alignLyrics, isWordLevelFormat, parseQRCLyric, parseSmartLrc } from "@/utils/lyricParser";
 import { stripLyricMetadata } from "@/utils/lyricStripper";
 import { getConverter } from "@/utils/opencc";
 import { type LyricLine, parseLrc, parseTTML, parseYrc } from "@applemusic-like-lyrics/lyric";
@@ -36,6 +36,7 @@ class LyricManager {
     // 重置歌词数据
     musicStore.setSongLyric({}, true);
     statusStore.usingTTMLLyric = false;
+    statusStore.usingQRCLyric = false;
     // 重置歌词索引
     statusStore.lyricIndex = -1;
     statusStore.lyricLoading = false;
@@ -95,17 +96,7 @@ class LyricManager {
     otherLyrics: LyricLine[],
     key: "translatedLyric" | "romanLyric",
   ): LyricLine[] {
-    const lyricsData = lyrics;
-    if (lyricsData.length && otherLyrics.length) {
-      lyricsData.forEach((v: LyricLine) => {
-        otherLyrics.forEach((x: LyricLine) => {
-          if (v.startTime === x.startTime || Math.abs(v.startTime - x.startTime) < 300) {
-            v[key] = x.words.map((word) => word.word).join("");
-          }
-        });
-      });
-    }
-    return lyricsData;
+    return alignLyrics(lyrics, otherLyrics, key);
   }
 
   /**
@@ -193,6 +184,7 @@ class LyricManager {
       if (durationDiff > 5000) {
         console.warn(
           `QQ 音乐歌词时长不匹配: ${data.song.duration}ms vs ${song.duration}ms (差异 ${durationDiff}ms)`,
+          data,
         );
         return null;
       }
@@ -256,127 +248,7 @@ class LyricManager {
    * @returns LyricLine 数组
    */
   private parseQRCLyric(qrcContent: string, trans?: string, roma?: string): LyricLine[] {
-    // 行匹配: [开始时间,持续时间]内容
-    const linePattern = /^\[(\d+),(\d+)\](.*)$/;
-    // 逐字匹配: 文字(开始时间,持续时间)
-    const wordPattern = /([^(]*)\((\d+),(\d+)\)/g;
-    /**
-     * 解析 QRC 内容为行数据
-     */
-    const parseQRCContent = (
-      rawContent: string,
-    ): Array<{
-      startTime: number;
-      endTime: number;
-      words: Array<{ word: string; startTime: number; endTime: number }>;
-    }> => {
-      // 从 XML 中提取歌词内容
-      const contentMatch = /<Lyric_1[^>]*LyricContent="([^"]*)"[^>]*\/>/.exec(rawContent);
-      const content = contentMatch ? contentMatch[1] : rawContent;
-
-      const result: Array<{
-        startTime: number;
-        endTime: number;
-        words: Array<{ word: string; startTime: number; endTime: number }>;
-      }> = [];
-
-      for (const rawLine of content.split("\n")) {
-        const line = rawLine.trim();
-        if (!line) continue;
-
-        // 跳过元数据标签 [ti:xxx] [ar:xxx] 等
-        if (/^\[[a-z]+:/i.test(line)) continue;
-
-        const lineMatch = linePattern.exec(line);
-        if (!lineMatch) continue;
-
-        const lineStart = parseInt(lineMatch[1], 10);
-        const lineDuration = parseInt(lineMatch[2], 10);
-        const lineContent = lineMatch[3];
-
-        // 解析逐字
-        const words: Array<{ word: string; startTime: number; endTime: number }> = [];
-        let wordMatch: RegExpExecArray | null;
-        const wordRegex = new RegExp(wordPattern.source, "g");
-
-        while ((wordMatch = wordRegex.exec(lineContent)) !== null) {
-          const wordText = wordMatch[1];
-          const wordStart = parseInt(wordMatch[2], 10);
-          const wordDuration = parseInt(wordMatch[3], 10);
-
-          if (wordText) {
-            words.push({
-              word: wordText,
-              startTime: wordStart,
-              endTime: wordStart + wordDuration,
-            });
-          }
-        }
-
-        if (words.length > 0) {
-          result.push({
-            startTime: lineStart,
-            endTime: lineStart + lineDuration,
-            words,
-          });
-        }
-      }
-      return result;
-    };
-    // 解析主歌词
-    const qrcLines = parseQRCContent(qrcContent);
-    let result = qrcLines.map((qrcLine) => {
-      return {
-        words: qrcLine.words.map((word) => ({
-          ...word,
-          romanWord: "",
-        })),
-        startTime: qrcLine.startTime,
-        endTime: qrcLine.endTime,
-        translatedLyric: "",
-        romanLyric: "",
-        isBG: false,
-        isDuet: false,
-      };
-    });
-    // 处理翻译
-    if (trans) {
-      let transLines = parseLrc(trans);
-      if (transLines?.length) {
-        // 过滤包含 "//" 或 "作品的著作权" 的翻译行
-        transLines = transLines.filter((line) => {
-          const text = line.words.map((w) => w.word).join("");
-          return !text.includes("//") && !text.includes("作品的著作权");
-        });
-        result = this.alignLyrics(result, transLines, "translatedLyric");
-      }
-    }
-    // 处理音译
-    if (roma) {
-      const qrcRomaLines = parseQRCContent(roma);
-      if (qrcRomaLines?.length) {
-        const romaLines = qrcRomaLines.map((line) => {
-          return {
-            words: [
-              {
-                startTime: line.startTime,
-                endTime: line.endTime,
-                word: line.words.map((w) => w.word).join(""),
-                romanWord: "",
-              },
-            ],
-            startTime: line.startTime,
-            endTime: line.endTime,
-            translatedLyric: "",
-            romanLyric: "",
-            isBG: false,
-            isDuet: false,
-          };
-        });
-        result = this.alignLyrics(result, romaLines, "romanLyric");
-      }
-    }
-    return result;
+    return parseQRCLyric(qrcContent, trans, roma);
   }
 
   /**
@@ -505,6 +377,8 @@ class LyricManager {
     await Promise.allSettled([adoptTTML(), adoptLRC()]);
     // 优先使用 TTML
     statusStore.usingTTMLLyric = ttmlAdopted;
+    // 设置是否使用 QRC 歌词（来自 QQ 音乐，且未被 TTML 覆盖）
+    statusStore.usingQRCLyric = qqMusicAdopted && !ttmlAdopted;
     return await this.applyChineseVariant(this.handleLyricExclude(result));
   }
 
@@ -560,6 +434,7 @@ class LyricManager {
             lrcData: aligned.lrcData,
             yrcData: qqLyric.yrcData,
           };
+          statusStore.usingQRCLyric = true;
         }
       }
       return await this.applyChineseVariant(aligned);
diff --git a/src/core/player/SongManager.ts b/src/core/player/SongManager.ts
@@ -11,6 +11,7 @@ import { QualityType, type SongType } from "@/types/main";
 import { isLogin } from "@/utils/auth";
 import { isElectron } from "@/utils/env";
 import { formatSongsList } from "@/utils/format";
+import { AI_AUDIO_LEVELS } from "@/utils/meta";
 import { handleSongQuality } from "@/utils/helper";
 import { openUserLogin } from "@/utils/modal";
 
@@ -120,7 +121,13 @@ class SongManager {
    */
   public getOnlineUrl = async (id: number, isPc: boolean = false): Promise<AudioSource> => {
     const settingStore = useSettingStore();
-    const level = isPc ? "exhigh" : settingStore.songLevel;
+    let level = isPc ? "exhigh" : settingStore.songLevel;
+
+    // Fuck AI Mode: 如果开启，且请求的 level 是 AI 音质，降级为 hires
+    if (settingStore.disableAiAudio && AI_AUDIO_LEVELS.includes(level)) {
+      level = "hires";
+    }
+
     const res = await songUrl(id, level);
     console.log(`🌐 ${id} music data:`, res);
     const songData = res.data?.[0];
diff --git a/src/core/resource/DownloadManager.ts b/src/core/resource/DownloadManager.ts
@@ -9,6 +9,7 @@ import { qqMusicMatch } from "@/api/qqmusic";
 import { songLevelData } from "@/utils/meta";
 import { getPlayerInfoObj } from "@/utils/format";
 import { getConverter, type ConverterMode } from "@/utils/opencc";
+import { lyricLinesToTTML, parseQRCLyric } from "@/utils/lyricParser";
 
 interface DownloadTask {
   song: SongType;
@@ -410,10 +411,25 @@ class DownloadManager {
                     console.log(`[Download] Trying QM fallback with keyword: ${keyword}`);
                     const qmResult = await qqMusicMatch(keyword);
                     if (qmResult?.code === 200 && qmResult?.qrc) {
-                      yrcLyric = qmResult.qrc;
-                      console.log(
-                        `[Download] QM QRC fetched as fallback, len: ${yrcLyric?.length}`,
+                      // 解析 QRC 歌词（包含翻译和音译对齐）
+                      const parsedLines = parseQRCLyric(
+                        qmResult.qrc,
+                        qmResult.trans,
+                        qmResult.roma,
                       );
+                      if (parsedLines.length > 0) {
+                        // 转换为 TTML 格式
+                        ttmlLyric = lyricLinesToTTML(parsedLines);
+                        console.log(
+                          `[Download] QM QRC parsed and converted to TTML, lines: ${parsedLines.length}`,
+                        );
+                      } else {
+                        // 如果解析失败，保留原始 QRC
+                        yrcLyric = qmResult.qrc;
+                        console.log(
+                          `[Download] QM QRC fetched as fallback (raw), len: ${yrcLyric?.length}`,
+                        );
+                      }
                     }
                   } catch (e) {
                     console.error("[Download] Error fetching QM lyrics as fallback:", e);
diff --git a/src/stores/status.ts b/src/stores/status.ts
@@ -56,6 +56,8 @@ interface StatusState {
   pureLyricMode: boolean;
   /** 当前是否正使用 TTML 歌词 */
   usingTTMLLyric: boolean;
+  /** 当前是否正使用 QRC 歌词（来自QQ音乐） */
+  usingQRCLyric: boolean;
   /** 当前歌曲音质 */
   songQuality: QualityType | undefined;
   /** 当前播放索引 */
@@ -153,6 +155,7 @@ export const useStatusStore = defineStore("status", {
     songCoverTheme: {},
     pureLyricMode: false,
     usingTTMLLyric: false,
+    usingQRCLyric: false,
     songQuality: undefined,
     playIndex: -1,
     lyricIndex: -1,
diff --git a/src/utils/helper.ts b/src/utils/helper.ts
@@ -426,25 +426,14 @@ export const handleSongQuality = (
     "standard": QualityType.LQ,
   };
 
-  // Fuck AI Filter
-  if (disableAiAudio && typeof song === "object" && song) {
-    if ("level" in song) {
-      if (AI_AUDIO_LEVELS.includes(song.level)) {
-        return QualityType.HiRes;
-      }
-    }
-    if ("privilege" in song) {
-      const p = song.privilege;
-      const level = p?.playMaxBrLevel ?? p?.plLevel;
-      if (AI_AUDIO_LEVELS.includes(level)) {
-        const quality = levelQualityMap["hires"];
-        if (quality) return quality;
-      }
-    }
-  }
+  // Fuck AI Filter: 如果是 AI 音质，跳过 level 属性判断，让后续遍历逻辑来确定真正的最高音质
+  const isAiLevel = disableAiAudio && typeof song === "object" && song && (
+    ("level" in song && AI_AUDIO_LEVELS.includes(song.level)) ||
+    ("privilege" in song && AI_AUDIO_LEVELS.includes(song.privilege?.playMaxBrLevel ?? song.privilege?.plLevel))
+  );
  
-  if (typeof song === "object" && song) {
-    // 含有 level 特殊处理
+  if (typeof song === "object" && song && !isAiLevel) {
+    // 含有 level 特殊处理（仅在非 AI 音质时使用）
     if ("level" in song) {
       const quality = levelQualityMap[song.level];
       if (quality) return quality;
diff --git a/src/utils/lyricParser.ts b/src/utils/lyricParser.ts
