refactor: ♻️ 改为内联正则

hymbz · May 12, 2024 · 6d807b9 · 6d807b9
1 parent d4dad99
commit 6d807b9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 19 deletions.
diff --git a/src/helper/detectAd.ts b/src/helper/detectAd.ts
@@ -182,15 +182,13 @@ export const getAdPageByContent = async (
   return getAdPage(imgList, byContent(qrEngine, canvas), adList);
 };
 
-const adFileNameRe = /^[zZ]+/;
-
 /** 通过文件名判断是否是广告 */
 export const getAdPageByFileName = async (
   fileNameList: Array<string | undefined>,
   adList = new Set<number>(),
 ) =>
   getAdPage(
     fileNameList,
-    (fileName: string) => adFileNameRe.test(fileName),
+    (fileName: string) => /^[zZ]+/.test(fileName),
     adList,
   );
diff --git a/src/helper/eleSelector.ts b/src/helper/eleSelector.ts
@@ -1,8 +1,6 @@
-const hasNumRe = /\d/;
-
 const getTagText = (ele: HTMLElement) => {
   let text = ele.nodeName;
-  if (ele.id && !hasNumRe.test(ele.id)) text += `#${ele.id}`;
+  if (ele.id && !/\d/.test(ele.id)) text += `#${ele.id}`;
   return text;
 };
 

diff --git a/src/index.ts b/src/index.ts
@@ -487,13 +487,12 @@ try {
         );
       };
 
-      const urlMatchRe = /comic\/\d+\/chapter\/\d+\/images\//;
-
       options = {
         name: 'komiic',
         getImgList,
         SPA: {
-          isMangaPage: () => urlMatchRe.test(window.location.href),
+          isMangaPage: () =>
+            /comic\/\d+\/chapter\/\d+\/images\//.test(window.location.href),
           getOnPrev: handlePrevNext('上一'),
           getOnNext: handlePrevNext('下一'),
         },

diff --git a/src/pwa/src/helper.ts b/src/pwa/src/helper.ts
@@ -12,10 +12,9 @@ export const zipExtension = new Set<ZipExtension>([
   '.cb7',
 ]);
 
-const extensionRe = /\.[^.]+$/;
 /** 根据文件名判断文件是否受支持 */
 export const isSupportFile = (name: string) => {
-  const extension = extensionRe.exec(name)?.[0];
+  const extension = /\.[^.]+$/.exec(name)?.[0];
   if (!extension) return null;
   if (zipExtension.has(extension as any)) return extension as ZipExtension;
   if (imgExtension.has(extension)) return 'img';

diff --git a/src/site/dmzj.tsx b/src/site/dmzj.tsx
@@ -74,9 +74,6 @@ import { getComicId, getViewpoint, useComicDetail } from '../helper/dmzjApi';
     return { comicId, chapterId };
   };
 
-  const isListPageRe = /^\/[^/]*?\/?$/;
-  const isMangaPageRe = /^\/.*?\/\d+\.shtml$/;
-
   const handleListPage = async () => {
     await waitDom('.newpl_ans');
     // 判断漫画被禁
@@ -165,8 +162,8 @@ import { getComicId, getViewpoint, useComicDetail } from '../helper/dmzjApi';
   };
 
   const isMangaPage = async () => {
-    if (isListPageRe.test(window.location.pathname)) return handleListPage();
-    return isMangaPageRe.test(window.location.pathname);
+    if (/^\/[^/]*?\/?$/.test(window.location.pathname)) return handleListPage();
+    return /^\/.*?\/\d+\.shtml$/.test(window.location.pathname);
   };
 
   await universalInit({

diff --git a/src/site/dmzj_www.tsx b/src/site/dmzj_www.tsx
@@ -2,8 +2,6 @@ import { log, querySelector, toast, useInit, waitDom } from 'main';
 
 import { getChapterInfo } from '../helper/dmzjApi';
 
-const chapterIdRe = /(?<=\/)\d+(?=\.html)/;
-
 const turnPage = (chapterId?: number) => {
   if (!chapterId) return undefined;
 
@@ -19,7 +17,7 @@ const turnPage = (chapterId?: number) => {
   await waitDom('.head_wz');
   // 只在漫画页内运行
   const comicId = querySelector('.head_wz [id]')?.id;
-  const chapterId = chapterIdRe.exec(window.location.pathname)?.[0];
+  const chapterId = /(?<=\/)\d+(?=\.html)/.exec(window.location.pathname)?.[0];
 
   if (!comicId || !chapterId) return;