✨ feat: 添加默认的规则集以便和自定义分开

imsyy · imsyy · commit 441918098cb4 · 2026-01-02T22:22:15.000+08:00
diff --git a/src/components/Modal/Setting/ExcludeLyrics.vue b/src/components/Modal/Setting/ExcludeLyrics.vue
@@ -2,68 +2,65 @@
   <div class="exclude">
     <n-alert :show-icon="false">请勿添加过多，以免影响歌词的正常显示</n-alert>
 
-    <n-tabs type="line" v-model:value="page" animated>
+    <n-tabs v-model:value="page" animated>
       <n-tab-pane name="keywords" tab="关键词">
-        <n-dynamic-tags v-model:value="settingStore.excludeKeywords" />
+        <n-scrollbar style="max-height: 70vh">
+          <n-flex vertical :size="12">
+            <n-dynamic-tags v-model:value="settingStore.excludeUserKeywords" />
+            <n-button type="primary" strong secondary size="small" @click="resetUserKeywords">
+              重置规则
+            </n-button>
+          </n-flex>
+        </n-scrollbar>
       </n-tab-pane>
+
       <n-tab-pane name="regexes" tab="正则表达式">
-        <n-dynamic-tags v-model:value="settingStore.excludeRegexes" />
+        <n-scrollbar style="max-height: 70vh">
+          <n-flex vertical :size="12">
+            <n-dynamic-tags v-model:value="settingStore.excludeUserRegexes" />
+            <n-button type="primary" strong secondary size="small" @click="resetUserRegexes">
+              重置规则
+            </n-button>
+          </n-flex>
+        </n-scrollbar>
       </n-tab-pane>
-
-      <template #suffix>
-        <n-flex>
-          <n-button type="primary" strong secondary @click="clear">清空此页</n-button>
-          <n-button type="primary" strong secondary @click="reset">重置此页</n-button>
-        </n-flex>
-      </template>
     </n-tabs>
   </div>
 </template>
 
 <script setup lang="ts">
 import { useSettingStore } from "@/stores";
-import { keywords, regexes } from "@/assets/data/exclude";
 
 const settingStore = useSettingStore();
 
 const page = ref("keywords");
 
-const pageConfig = {
-  keywords: {
-    name: "关键词",
-    storeKey: "excludeKeywords",
-    defaultValue: keywords,
-  },
-  regexes: {
-    name: "正则表达式",
-    storeKey: "excludeRegexes",
-    defaultValue: regexes,
-  },
-} as const;
-
-const handleAction = (action: "clear" | "reset") => {
-  const pageKey = page.value as keyof typeof pageConfig;
-  const { name, storeKey, defaultValue } = pageConfig[pageKey];
-  const isClear = action === "clear";
-
-  const actionText = isClear ? "清空" : "重置";
-  const contentDetail = isClear ? "" : "为默认值";
-  const successMessage = isClear ? "列表已清空" : "列表已重置为默认值";
-
+// 重置规则
+const resetUserKeywords = () => {
   window.$dialog.warning({
-    title: `${actionText}确认`,
-    content: `确认${actionText}${name}列表${contentDetail}？该操作不可撤销！`,
+    title: "重置确认",
+    content: "确认清空所有关键词规则？该操作不可撤销！",
     positiveText: "确认",
     negativeText: "取消",
     onPositiveClick: () => {
-      settingStore[storeKey] = isClear ? [] : defaultValue;
-      window.$message.success(`${name}${successMessage}`);
+      settingStore.excludeUserKeywords = [];
+      window.$message.success("关键词规则已清空");
     },
   });
 };
 
-const clear = () => handleAction("clear");
-const reset = () => handleAction("reset");
+const resetUserRegexes = () => {
+  window.$dialog.warning({
+    title: "重置确认",
+    content: "确认清空所有正则表达式规则？该操作不可撤销！",
+    positiveText: "确认",
+    negativeText: "取消",
+    onPositiveClick: () => {
+      settingStore.excludeUserRegexes = [];
+      window.$message.success("正则表达式规则已清空");
+    },
+  });
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/core/player/LyricManager.ts b/src/core/player/LyricManager.ts
@@ -324,17 +324,13 @@ class LyricManager {
     const settingStore = useSettingStore();
     const musicStore = useMusicStore();
 
-    const { enableExcludeLyrics, excludeKeywords, excludeRegexes } = settingStore;
+    const { enableExcludeLyrics, excludeUserKeywords, excludeUserRegexes } = settingStore;
 
     if (!enableExcludeLyrics) return lyricData;
 
-    // 将设置中和默认的预定义的关键字和正则表达式合并在一起给 stripLyricMetadata，方便之后更新默认的列表
-    // TODO: 建议在设置界面加一个默认的规则集以便和用户自己加的关键字分开，也方便更新默认列表
-    const userKeywords = excludeKeywords || [];
-    const userRegexes = excludeRegexes || [];
-
-    const mergedKeywords = [...new Set([...userKeywords, ...defaultKeywords])];
-    const mergedRegexes = [...new Set([...userRegexes, ...defaultRegexes])];
+    // 合并默认规则和用户自定义规则
+    const mergedKeywords = [...new Set([...defaultKeywords, ...(excludeUserKeywords ?? [])])];
+    const mergedRegexes = [...new Set([...defaultRegexes, ...(excludeUserRegexes ?? [])])];
 
     const { name, artists } = musicStore.playSong;
     const songMetadataRegexes: string[] = [];
diff --git a/src/stores/migrations/settingMigrations.ts b/src/stores/migrations/settingMigrations.ts
@@ -1,11 +1,12 @@
 import { SongUnlockServer } from "@/core/player/SongManager";
 import type { SettingState } from "../setting";
 import { defaultAMLLDbServer } from "@/utils/meta";
+import { keywords, regexes } from "@/assets/data/exclude";
 
 /**
  * 当前设置 Schema 版本号
  */
-export const CURRENT_SETTING_SCHEMA_VERSION = 4;
+export const CURRENT_SETTING_SCHEMA_VERSION = 5;
 
 /**
  * 迁移函数类型
@@ -36,5 +37,45 @@ export const settingMigrations: Record<number, MigrationFunction> = {
       ],
     };
   },
+  5: (state) => {
+    // 迁移排除歌词关键字和正则表达式到用户自定义字段
+    // 如果旧字段存在且不为空，则迁移到新字段
+    // 定义旧版本的设置状态类型（包含已废弃的字段）
+    interface OldSettingState extends Partial<SettingState> {
+      excludeKeywords?: string[];
+      excludeRegexes?: string[];
+    }
+
+    const oldState = state as OldSettingState;
+    const oldKeywords = oldState.excludeKeywords;
+    const oldRegexes = oldState.excludeRegexes;
+
+    // 如果旧字段包含默认值，则只保留用户自定义的部分
+    const userKeywords: string[] = [];
+    const userRegexes: string[] = [];
+
+    if (oldKeywords && Array.isArray(oldKeywords)) {
+      // 过滤掉默认关键字，只保留用户自定义的
+      oldKeywords.forEach((keyword) => {
+        if (!keywords.includes(keyword)) {
+          userKeywords.push(keyword);
+        }
+      });
+    }
+
+    if (oldRegexes && Array.isArray(oldRegexes)) {
+      // 过滤掉默认正则，只保留用户自定义的
+      oldRegexes.forEach((regex) => {
+        if (!regexes.includes(regex)) {
+          userRegexes.push(regex);
+        }
+      });
+    }
+
+    return {
+      excludeUserKeywords: userKeywords,
+      excludeUserRegexes: userRegexes,
+    };
+  },
 };
 
diff --git a/src/stores/setting.ts b/src/stores/setting.ts
@@ -1,5 +1,4 @@
 import { defineStore } from "pinia";
-import { keywords, regexes } from "@/assets/data/exclude";
 import { SongUnlockServer } from "@/core/player/SongManager";
 import type { SongLevelType } from "@/types/main";
 import { defaultAMLLDbServer } from "@/utils/meta";
@@ -212,10 +211,10 @@ export interface SettingState {
   enableExcludeTTML: boolean;
   /** 「排除歌词」是否适用于本地歌词 */
   enableExcludeLocalLyrics: boolean;
-  /** 排除歌词关键字 */
-  excludeKeywords: string[];
-  /** 排除歌词正则表达式 */
-  excludeRegexes: string[];
+  /** 用户自定义的排除歌词关键字 */
+  excludeUserKeywords: string[];
+  /** 用户自定义的排除歌词正则表达式 */
+  excludeUserRegexes: string[];
   /** 显示默认本地路径 */
   showDefaultLocalPath: boolean;
   /** 本地文件夹显示模式 */
@@ -373,8 +372,8 @@ export const useSettingStore = defineStore("setting", {
     enableExcludeLyrics: true,
     enableExcludeTTML: false,
     enableExcludeLocalLyrics: false,
-    excludeKeywords: keywords,
-    excludeRegexes: regexes,
+    excludeUserKeywords: [],
+    excludeUserRegexes: [],
     localFilesPath: [],
     localLyricPath: [],
     showDefaultLocalPath: true,
diff --git a/src/utils/lyricStripper.ts b/src/utils/lyricStripper.ts
@@ -21,6 +21,26 @@
 
 import { type LyricLine } from "@applemusic-like-lyrics/lyric";
 
+const STRICT_MATCH_SEPARATORS = [
+  ":",
+  "：",
+  ",",
+  "，",
+  ".",
+  "。",
+  "!",
+  "！",
+  "-",
+  "_",
+  "(",
+  "（",
+  "[",
+  "【",
+  "{",
+  "『",
+  "「",
+];
+
 /**
  * 扫描限制配置
  */
@@ -149,7 +169,15 @@ function isStrictMatch(text: string, keywords: string[], regexes: RegExp[]): boo
     if (normalizedText.startsWith(normalizedKw)) {
       const remainder = normalizedText.slice(normalizedKw.length);
 
-      if (remainder.startsWith(":") || remainder.startsWith("：")) {
+      // 如果剩余部分为空，说明完全匹配
+      if (remainder.length === 0) {
+        return true;
+      }
+
+      // 检查分隔符
+      // 允许的分隔符包括：冒号、逗号、句号、感叹号、连字符、括号等
+      // 注意：normalizedText 已经移除了空格
+      if (STRICT_MATCH_SEPARATORS.includes(remainder.charAt(0))) {
         return true;
       }
     }
