@doki-land/live2d 0.0.6 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@doki-land/live2d",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "keywords": [
         "live2d",
         "pixi",

package/src/fs/index.ts

@@ -45,17 +45,20 @@ export function allowShowLive2D(currentPath: string, includePaths: string[], exc
  */
 export function findAllModels(folder: string, depth: number = 99): string[] {
     const models: string[] = [];
-    for (const file of fs.readdirSync(folder)) {
-        const filePath = path.join(folder, file);
-        const stat = fs.statSync(filePath);
-        if (stat.isDirectory()) {
-            if (depth > 0) {
-                models.push(...findAllModels(filePath, depth - 1));
+    if (fs.existsSync(folder)) {
+        for (const file of fs.readdirSync(folder)) {
+            const filePath = path.join(folder, file);
+            const stat = fs.statSync(filePath);
+            if (stat.isDirectory()) {
+                if (depth > 0) {
+                    models.push(...findAllModels(filePath, depth - 1));
+                }
+            } else if (file.endsWith('.model.json') || file.endsWith('.model3.json')) {
+                models.push(filePath);
             }
-        } else if (file.endsWith('.model.json') || file.endsWith('.model3.json')) {
-            models.push(filePath);
         }
-   }
+    }
+
     return models;
 }
 
@@ -73,14 +76,16 @@ export function findAllModels(folder: string, depth: number = 99): string[] {
  *
  * 本地模型的优先级更高, 本地模型根据自然序(Natural Sort)排列
  */
-export function mergeModels(base: string, local: string[], remote: ModelOptions[]): string[] {
-    const models: string[] = [];
+export function mergeModels(base: string, local: string[], remote: ModelOptions[]): ModelOptions[] {
+    const models: ModelOptions[] = [];
     const url = new URL(base);
     for (const model of local) {
-        models.push(new URL(model, url).href);
+        models.push({
+            model_url: new URL(model, url).href,
+        });
     }
     for (const model of remote) {
-        models.push(model.model_url);
+        models.push(model);
     }
     return models
 }