Merge branch 'refactor/forbidden' into 'main'

Refactor/forbidden

See merge request mycard/Neos!266

src/api/forbiddens.ts

-//! 禁限卡表
-
-import { clear, createStore, get, setMany } from "idb-keyval";
-
 import { useConfig } from "@/config";
+import { initStore } from "@/stores";
 
 const { lflistUrl } = useConfig();
 
-type Forbiddens = Map<number, number>;
-
-const IDB_NAME = "forbiddens";
-
-// 禁限卡表的时间，比如 [2023.4] - 2023年4月表
-export let forbiddenTime = "?";
-
-const idb = createStore(IDB_NAME, IDB_NAME);
+class Forbidden {
+  private data: Map<number, number> = new Map<number, number>();
+  public time: string = "?";
 
-export async function initForbiddens(): Promise<void> {
-  const text = await (await fetch(lflistUrl)).text();
-  const { time, forbiddens } = extractForbiddensFromText(text);
-  forbiddenTime = time;
-
-  // 先清掉之前的记录
-  clear(idb);
-  // 设置新记录
-  await setMany(Array.from(forbiddens));
-}
-
-// 获取禁限信息
-export async function getForbiddenInfo(
-  id: number,
-): Promise<number | undefined> {
-  return await get(id, idb);
-}
+  public async init(): Promise<void> {
+    const text = await (await fetch(lflistUrl)).text();
+    const { time, forbiddens } = this.extractForbiddensFromText(text);
+    this.time = time;
+    this.setForbiddens(forbiddens);
+    initStore.forbidden = true;
+  }
 
-// 解析函数，提取卡片编号和限制张数
-function parseCardInfo(
-  input: string,
-): { cardId: number; limitCount: number } | null {
-  const match = input.match(/^(\d+)\s+(\d+)\s+--/);
-  if (match) {
-    const cardId = parseInt(match[1]);
-    const limitCount = parseInt(match[2]);
-    return { cardId, limitCount };
+  public set(cardId: number, limitCount: number): void {
+    this.data.set(cardId, limitCount);
   }
-  return null;
-}
 
-// 分割文本为行，并提取每行的限制信息
-function extractForbiddensFromText(text: string): {
-  time: string;
-  forbiddens: Forbiddens;
-} {
-  const lines = text.split("\n");
-  const forbiddens = new Map<number, number>([]);
+  public get(id: number): number | undefined {
+    return this.data.get(id);
+  }
 
-  // remove first line
-  lines.shift();
+  private setForbiddens(forbiddens: Map<number, number>): void {
+    this.data.clear();
+    for (const [cardId, limitCount] of forbiddens) {
+      this.data.set(cardId, limitCount);
+    }
+  }
 
-  let time = "?";
+  private extractForbiddensFromText(text: string): {
+    time: string;
+    forbiddens: Map<number, number>;
+  } {
+    // 解析文本行中的卡片信息
+    function parseCardInfo(
+      input: string,
+    ): { cardId: number; limitCount: number } | null {
+      const match = input.match(/^(\d+)\s+(\d+)\s+--/);
+      if (match) {
+        const cardId = parseInt(match[1]);
+        const limitCount = parseInt(match[2]);
+        return { cardId, limitCount };
+      }
+      return null;
+    }
 
-  for (const line of lines) {
-    if (line.startsWith("#")) {
-      // do nothing
-    } else if (line.startsWith("!")) {
-      if (time !== "?") {
-        // 已经读取完第一个禁限表的信息了，退出循环
-        break;
+    const lines = text.split("\n");
+    const forbiddens = new Map<number, number>();
+    let time = "?";
+
+    // 移除第一行标题
+    lines.shift();
+
+    for (const line of lines) {
+      if (line.startsWith("#")) {
+        // 忽略注释行
+      } else if (line.startsWith("!")) {
+        // 如果时间已经设置，退出循环
+        if (time !== "?") {
+          break;
+        } else {
+          // 提取时间信息
+          time = line.substring(1).trim();
+        }
       } else {
-        time = line.substring(1).trim();
-      }
-    } else {
-      const cardInfo = parseCardInfo(line);
-      if (cardInfo) {
-        forbiddens.set(cardInfo.cardId, cardInfo.limitCount);
+        const cardInfo = parseCardInfo(line);
+        if (cardInfo) {
+          // 将卡片信息添加到禁限表
+          forbiddens.set(cardInfo.cardId, cardInfo.limitCount);
+        }
       }
     }
-  }
 
-  return { time, forbiddens };
+    // 返回时间和禁限表
+    return { time, forbiddens };
+  }
 }
+
+export const forbidden = new Forbidden();

src/stores/initStore.ts

@@ -5,10 +5,11 @@ import { type NeosStore } from "./shared";
 export const initStore = proxy({
   sqlite: {
     progress: 0, // 0 -> 1
-  },
+  }, // ygodb
   decks: false,
   i18n: false,
   wasm: false,
+  forbidden: false, // 禁卡表
   // ...
   reset() {},
 } satisfies NeosStore);

src/ui/BuildDeck/CardDetail.tsx

@@ -8,9 +8,9 @@ import {
   extraCardTypes,
   isLinkMonster,
   isMonster,
+  isPendulumMonster,
   Race2StringCodeMap,
   Type2StringCodeMap,
-  isPendulumMonster,
 } from "@/common";
 import { CardEffectText, IconFont, ScrollableArea, YgoCard } from "@/ui/Shared";
 

src/ui/BuildDeck/index.tsx

@@ -26,7 +26,7 @@ import { LoaderFunction } from "react-router-dom";
 import { proxy, useSnapshot } from "valtio";
 import { subscribeKey } from "valtio/utils";
 
-import { type CardMeta, initForbiddens, searchCards } from "@/api";
+import { type CardMeta, searchCards } from "@/api";
 import { isToken } from "@/common";
 import { FtsConditions } from "@/middleware/sqlite/fts";
 import { deckStore, type IDeck, initStore } from "@/stores";
@@ -59,8 +59,13 @@ export const loader: LoaderFunction = async () => {
     });
   }
 
-  // 更新禁限卡表
-  await initForbiddens();
+  // 同时，等待禁卡表的加载
+  if (!initStore.forbidden) {
+    await new Promise<void>((rs) => {
+      subscribeKey(initStore, "forbidden", (done) => done && rs());
+    });
+  }
+
   return null;
 };
 

src/ui/Layout/index.tsx

@@ -9,6 +9,7 @@ import {
 } from "react-router-dom";
 import { useSnapshot } from "valtio";
 
+import { forbidden } from "@/api";
 import { useConfig } from "@/config";
 import { accountStore } from "@/stores";
 
@@ -28,6 +29,7 @@ export const loader: LoaderFunction = async () => {
   initDeck();
   initSqlite();
   initWASM();
+  forbidden.init();
   return null;
 };