feat (x-ite): 搜索关键词替换, 结果更精确 (pt-plugins#1860)

* feat: 启用 `searchEntryConfig.area.keyAutoMatch` 正则 Unicode 支持 * feat: 增加禁用 `searchEntryConfig.area` 选项
trim21 · May 19, 2024 · f991439 · f991439
1 parent b8cacca
commit f991439
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/resource/i18n/en.json b/resource/i18n/en.json
@@ -760,7 +760,8 @@
           "urlTip": "The full address of the website, such as: https:\/\/www.github.com\/",
           "passkey": "Passkey",
           "passkeyTip": "The key is only used to copy the download address operation. If you do not need this function, please leave it blank.",
-          "allowSearch": "Allow Search",
+          "allowSearch": "Allow search",
+          "disableSearchTransform": "Disable search transform",
           "allowGetUserInfo": "Allow access to user information (Beta)",
           "cdn": "Site CDN list",
           "cdnTip": "If you use a different URL than the system definition, you can fill in the currently used website address, fill in one address per line, the first one will be used as the address used for the search.",

diff --git a/resource/i18n/zh-CN.json b/resource/i18n/zh-CN.json
@@ -756,6 +756,7 @@
           "passkey": "密钥",
           "passkeyTip": "密钥仅用于复制下载地址操作，如果不需要用到此功能，请留空",
           "allowSearch": "允许搜索",
+          "disableSearchTransform": "禁用搜索替换",
           "allowGetUserInfo": "允许获取用户信息（Beta）",
           "cdn": "站点CDN列表",
           "cdnTip": "如您使用的网址和系统定义的不同，可在此填写当前使用的网站地址，每行填写一个地址，第一个将做为搜索时使用的地址",

diff --git a/src/background/searcher.ts b/src/background/searcher.ts
@@ -161,12 +161,12 @@ export class Searcher {
         searchEntryConfigQueryString = searchEntryConfig.queryString + "";
 
         // 搜索区域
-        if (searchEntryConfig.area) {
+        if (searchEntryConfig.area && !site.disableSearchTransform) {
           searchEntryConfig.area.some((area: SearchEntryConfigArea) => {
             // 是否有自动匹配关键字的正则
             if (
               area.keyAutoMatch &&
-              new RegExp(area.keyAutoMatch, "").test(key)
+              new RegExp(area.keyAutoMatch, "u").test(key)
             ) {
               // 是否替换默认页面
               if (area.page) {
@@ -276,10 +276,12 @@ export class Searcher {
 
               // 替换关键字
               if (area.replaceKey) {
+                const old = key;
                 key = key.replace(
                   new RegExp(area.replaceKey[0], "g"),
                   area.replaceKey[1]
                 );
+                console.log(`[${site.name}] "${old}" => "${key}"`);
               }
 
               // 解析脚本，最终返回搜索关键字，可调用 payload 里的数据进行关键字替换

diff --git a/src/interface/common.ts b/src/interface/common.ts
@@ -270,6 +270,7 @@ export interface Site {
   defaultClientId?: string;
   plugins?: any[];
   allowSearch?: boolean;
+  disableSearchTransform?: boolean;
   securityKeys?: object;
   searchEntryConfig?: SearchEntryConfig;
   searchEntry?: SearchEntry[];

diff --git a/src/options/views/settings/Sites/Editor.vue b/src/options/views/settings/Sites/Editor.vue
@@ -159,7 +159,11 @@
                 :disabled="!site.tokenRequired" :rules="site.tokenRequired ? rules.require : []"
                 :label="$t('settings.sites.editor.authToken')"
                 :placeholder="$t('settings.sites.editor.authTokenTip')"
-        ></v-text-field>
+        ></v-text-field>       
+
+        <!-- 站点已离线（停机/关闭） -->
+        <v-switch :label="$t('settings.sites.editor.offline')" v-model="site.offline" />
+
         <!-- 允许获取用户信息 -->
         <v-switch
           :label="$t('settings.sites.editor.allowGetUserInfo')"
@@ -192,8 +196,12 @@
           </v-container>
         </template>
 
-        <!-- 站点已离线（停机/关闭） -->
-        <v-switch :label="$t('settings.sites.editor.offline')" v-model="site.offline"></v-switch>
+        <!-- 禁用搜索替换  -->
+        <v-switch
+          v-model="site.disableSearchTransform"
+          :disabled="!site.allowSearch || site.offline"
+          :label="$t('settings.sites.editor.disableSearchTransform')"
+        />
 
         <!-- 消息提醒开关 -->
         <v-switch :label="$t('settings.sites.editor.disableMessageCount')" v-model="site.disableMessageCount"></v-switch>