Update obvault-server.ts

tiddly-gittly · Sep 5, 2023 · 86bd739 · 86bd739
1 parent aa21b2c
commit 86bd739
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/src/obsidian-vault/obvault-server.ts b/src/obsidian-vault/obvault-server.ts
@@ -6,24 +6,32 @@ class ObvaultServer {
 
     constructor() {
         $tw.rootWidget.addEventListener('tw-obsidian-add', async (event) => {
-            if (event.type === "tw-obsidian-add") {    
-                console.log(event.paramObject.path);
-                // 其实点几次都可以，只有一次有效。
-                if (event.paramObject.path !== '') {
-                    let data = await fetchData(event.paramObject.path, event.paramObject.reg, event.paramObject.ignore);
-                    // console.log(data);
-                    if (data != false) { addVault(data); }
-                } else {
-                    console.log("输入为空！");
-                    tm_notify("addVault", "输入为空！");
-                }
+            // 其实点几次都可以，只有一次有效。
+            if (this.isValidPath(event.paramObject.path)) {
+                let data = await fetchData(event.paramObject.path, event.paramObject.reg, event.paramObject.ignore);
+                // console.log(data);
+                if (data != false) { addVault(data); }
             }
         });
         $tw.rootWidget.addEventListener('tw-obsidian-purge', async (event) => {
             purgeVault();
         });
         $tw.rootWidget.addEventListener('tw-obsidian-update', async (event) => { });
     }
+    isValidPath(path: string) {
+        const pathRegEx = /^(\/|\.\.?\/|([A-Za-z]:)?[\\|\/])[^\\|\/]+([\\|\/][^\\|\/]+)*[\\|\/]?$/
+        if (path === '') {
+            console.log("路径为空！");
+            tm_notify("addVault", "路径为空！");
+            return false
+        }
+        if (!pathRegEx.test(path)) {
+            console.log("无效路径！");
+            tm_notify("addVault", "无效路径！");
+            return false
+        }
+        return true
+    }
 }
 
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */