koishipro-core.js 1.1.3 → 1.1.5

package/dist/index.cjs

@@ -2386,31 +2386,29 @@ async function safeReadDir2(fs, dirPath) {
   }
 }
 async function collectFsDbPaths(fs, pathMod, baseDir) {
-  const results = [];
-  const baseDb = joinPath3(pathMod, baseDir, "cards.cdb");
-  try {
-    const stats = await fs.promises.stat(baseDb);
-    if (stats.isFile()) {
-      results.push(baseDb);
-    }
-  } catch {
-  }
-  const expansionsDir = joinPath3(pathMod, baseDir, "expansions");
-  const entries = await safeReadDir2(fs, expansionsDir);
-  for (const entry of entries) {
-    if (!entry.toLowerCase().endsWith(".cdb")) {
-      continue;
-    }
-    const fullPath = joinPath3(pathMod, expansionsDir, entry);
-    try {
-      const stats = await fs.promises.stat(fullPath);
-      if (stats.isFile()) {
-        results.push(fullPath);
+  const collectCdbFiles = async (dirPath) => {
+    const paths = [];
+    const entries = await safeReadDir2(fs, dirPath);
+    for (const entry of entries) {
+      if (!entry.toLowerCase().endsWith(".cdb")) {
+        continue;
+      }
+      const fullPath = joinPath3(pathMod, dirPath, entry);
+      try {
+        const stats = await fs.promises.stat(fullPath);
+        if (stats.isFile()) {
+          paths.push(fullPath);
+        }
+      } catch {
+        continue;
       }
-    } catch {
-      continue;
     }
-  }
+    return paths;
+  };
+  const results = [];
+  const expansionsDir = joinPath3(pathMod, baseDir, "expansions");
+  results.push(...await collectCdbFiles(expansionsDir));
+  results.push(...await collectCdbFiles(baseDir));
   return results;
 }
 function isRootCdbEntry(entryName) {