Merge pull request #773 from imsyy/dev-fixerr

🐞 fix: 修复 ttml 歌词解析问题

Author: imsyy

.github/workflows/issue-helper.yml

@@ -36,7 +36,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |
             抱歉，由于被标记为 **${{ github.event.label.name }}**，该 Issue 将自动关闭
-            如果您认为该 Issue 仍然有效，请重新开启或者创建新的 Issue，我们会尽快确认并修复
+            如果您认为该 Issue 仍然有效，请创建新的 Issue，我们会尽快确认并修复
       # 有问题回复
       - name: Auto Reply
         if: github.event.action == 'labeled' && github.event.label.name == '有问题'
@@ -58,6 +58,17 @@ jobs:
           labels: "有问题, 过期"
           body: |
             🤝 您好 @${{ github.event.issue.user.login }}，感谢您的反馈！我们已经确认该问题，并将在下一个版本中修复
+      # 无法复现
+      - name: Auto Unreproducible
+        if: github.event.action == 'labeled' && github.event.label.name == '无法复现'
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "create-comment"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          body: |
+            🤝 您好 @${{ github.event.issue.user.login }}，感谢您的反馈！
+            由于无法复现问题，我们无法修复
+            请确保您已经详细描述了问题的复现步骤，维护团队会尽快查看
       # 已修复
       - name: Auto Fixed
         if: github.event.action == 'labeled' && github.event.label.name == '已修复'
@@ -68,6 +79,6 @@ jobs:
           labels: "BUG"
           close-reason: "completed"
           body: |
-            🎉 您好 @${{ github.event.issue.user.login }}，该问题已修复，感谢您的反馈！
-
-            若您觉得仍存在问题，请重新开启或者创建新的 Issue，我们会尽快确认并修复
+            🎉 您好 @${{ github.event.issue.user.login }}，感谢您的反馈！
+            该问题已在当前开发版或下一个正式版中修复完成。
+            若您觉得仍存在问题，请创建新的 Issue，我们会尽快确认并修复

components.d.ts

@@ -88,7 +88,6 @@ declare module 'vue' {
     NH1: typeof import('naive-ui')['NH1']
     NH2: typeof import('naive-ui')['NH2']
     NH3: typeof import('naive-ui')['NH3']
-    NHelpTip: typeof import('naive-ui')['NHelpTip']
     NIcon: typeof import('naive-ui')['NIcon']
     NImage: typeof import('naive-ui')['NImage']
     NInput: typeof import('naive-ui')['NInput']
@@ -121,7 +120,6 @@ declare module 'vue' {
     NSelect: typeof import('naive-ui')['NSelect']
     NSkeleton: typeof import('naive-ui')['NSkeleton']
     NSlider: typeof import('naive-ui')['NSlider']
-    NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
     NTab: typeof import('naive-ui')['NTab']

src/components/Player/PlayerMeta/PlayerData.vue

@@ -56,13 +56,7 @@
         <span class="meta-item">{{ lyricMode }}</span>
         <!-- 是否在线 -->
         <span class="meta-item">
-          {{
-            musicStore.playSong.path
-              ? "LOCAL"
-              : musicStore.playSong.type === "streaming"
-                ? "STREAMING"
-                : "ONLINE"
-          }}
+          {{ audioSourceText }}
         </span>
       </n-flex>
       <!-- 歌手 -->
@@ -120,6 +114,7 @@ import type { RouteLocationRaw } from "vue-router";
 import { useMusicStore, useStatusStore, useSettingStore } from "@/stores";
 import { debounce, isObject } from "lodash-es";
 import { removeBrackets } from "@/utils/format";
+import { SongUnlockServer } from "@/core/player/SongManager";
 
 defineProps<{
   center?: boolean;
@@ -144,6 +139,23 @@ const lyricMode = computed(() => {
   return musicStore.isHasLrc ? "LRC" : "NO-LRC";
 });
 
+/** 歌曲解锁服务器名称映射 */
+const sourceMap: Record<string, string> = {
+  [SongUnlockServer.NETEASE]: "Netease",
+  [SongUnlockServer.KUWO]: "Kuwo",
+  [SongUnlockServer.BODIAN]: "Bodian",
+  [SongUnlockServer.GEQUBAO]: "Gequbao",
+};
+
+const audioSourceText = computed(() => {
+  if (musicStore.playSong.path) return "LOCAL";
+  if (musicStore.playSong.type === "streaming") return "STREAMING";
+  if (statusStore.audioSource) {
+    return sourceMap[statusStore.audioSource] || statusStore.audioSource.toUpperCase();
+  }
+  return "ONLINE";
+});
+
 const jumpPage = debounce(
   (go: RouteLocationRaw) => {
     if (!go) return;

src/core/player/LyricManager.ts

@@ -511,7 +511,7 @@ class LyricManager {
     const major = lang_filter(context_lang);
     const cleaned_ttml = ttml_cleaner(ttmlContent, major);
 
-    return cleaned_ttml;
+    return cleaned_ttml.replace(/\n\s*/g, "");
   }
 
   /**
@@ -554,7 +554,7 @@ class LyricManager {
       try {
         const ttmlContent = typeof ttml === "string" ? ttml : "";
         if (ttmlContent) {
-          ttmlLines = parseTTML(ttmlContent).lines || [];
+          ttmlLines = parseTTML(this.cleanTTMLTranslations(ttmlContent)).lines || [];
           console.log("检测到本地TTML歌词覆盖", ttmlLines);
         }
       } catch (err) {
@@ -620,7 +620,6 @@ class LyricManager {
     };
 
     const lrcData = stripLyricMetadata(lyricData.lrcData || [], options);
-
     let yrcData = lyricData.yrcData || [];
 
     if (!statusStore.usingTTMLLyric || settingStore.enableExcludeTTML) {

src/core/player/PlayerController.ts

@@ -132,6 +132,7 @@ class PlayerController {
       // 更新音质和解锁状态
       statusStore.songQuality = audioSource.quality;
       statusStore.playUblock = audioSource.isUnlocked ?? false;
+      statusStore.audioSource = audioSource.source;
       // 执行底层播放
       await this.loadAndPlay(audioSource.url, autoPlay, seek);
       if (requestToken !== this.currentRequestToken) return;
@@ -176,6 +177,7 @@ class PlayerController {
       // 更新音质和解锁状态
       statusStore.songQuality = audioSource.quality;
       statusStore.playUblock = audioSource.isUnlocked ?? false;
+      statusStore.audioSource = audioSource.source;
       // 停止当前播放
       audioManager.stop();
       // 执行底层播放，保持进度，保持原播放状态

src/core/player/SongManager.ts

@@ -37,6 +37,8 @@ export type AudioSource = {
   isTrial?: boolean;
   /** 音质 */
   quality?: QualityType;
+  /** 音源 */
+  source?: string;
 };
 
 class SongManager {
@@ -206,13 +208,15 @@ class SongManager {
         // 推断音质
         let quality = QualityType.HQ;
         if (unlockUrl && (unlockUrl.includes(".flac") || unlockUrl.includes(".wav"))) {
-            quality = QualityType.SQ;
+          quality = QualityType.SQ;
         }
+        console.log(`最终音质判断：详细输出：`, { unlockUrl, quality });
         return {
           id: songId,
           url: unlockUrl,
           isUnlocked: true,
           quality,
+          source: r.value.server,
         };
       }
     }
@@ -358,20 +362,20 @@ class SongManager {
       // 如果官方链接有效且非试听（或者用户接受试听）
       if (officialUrl && (!isTrial || (isTrial && settingStore.playSongDemo))) {
         if (isTrial) window.$message.warning("当前歌曲仅可试听");
-        return { id: songId, url: officialUrl, quality, isUnlocked: false };
+        return { id: songId, url: officialUrl, quality, isUnlocked: false, source: "netease" };
       }
       // 尝试解锁
       if (canUnlock) {
         const unlockUrl = await this.getUnlockSongUrl(song);
         if (unlockUrl.url) {
-          console.log(`🔓 [${songId}] 解锁成功`);
+          console.log(`🔓 [${songId}] 解锁成功`, unlockUrl);
           return unlockUrl;
         }
       }
       // 最后的兜底：检查本地是否有缓存（不区分音质）
       const fallbackUrl = await this.checkLocalCache(songId);
       if (fallbackUrl) {
-        console.log(`🚀 [${songId}] 网络请求失败，使用本地缓存兜底`);
+        console.log(`🚀 [${songId}] 网络请求失败，使用本地缓存兜底`, fallbackUrl);
         return { id: songId, url: fallbackUrl, isUnlocked: true };
       }
       // 无可用源

src/stores/status.ts

@@ -60,6 +60,8 @@ interface StatusState {
   usingQRCLyric: boolean;
   /** 当前歌曲音质 */
   songQuality: QualityType | undefined;
+  /** 当前歌曲音源 */
+  audioSource: string | undefined;
   /** 当前播放索引 */
   playIndex: number;
   /** 歌词播放索引 */
@@ -159,6 +161,7 @@ export const useStatusStore = defineStore("status", {
     usingTTMLLyric: false,
     usingQRCLyric: false,
     songQuality: undefined,
+    audioSource: undefined,
     playIndex: -1,
     lyricIndex: -1,
     lyricLoading: false,