Address comments

Signed-off-by: Daishan Peng <[email protected]>

Author: StrongMonkey

actions/knowledge/knowledge.ts

@@ -57,22 +57,22 @@ export async function ensureFiles(
     fs.mkdirSync(dir, { recursive: true });
   }
 
-  for (const file of Array.from(files.entries())) {
-    if (!fs.existsSync(path.join(dir, file[1].type))) {
-      fs.mkdirSync(path.join(dir, file[1].type), { recursive: true });
+  for (const [location, file] of Array.from(files.entries())) {
+    if (!fs.existsSync(path.join(dir, file.type))) {
+      fs.mkdirSync(path.join(dir, file.type), { recursive: true });
     }
-    const filePath = path.join(dir, file[1].type, path.basename(file[0]));
+    const filePath = path.join(dir, file.type, path.basename(location));
     if (!fs.existsSync(filePath)) {
-      if (file[1].type === 'local') {
-        await fs.promises.copyFile(file[0], filePath);
-      } else if (file[1].type === 'notion' || file[1].type === 'onedrive') {
+      if (file.type === 'local') {
+        await fs.promises.copyFile(location, filePath);
+      } else if (file.type === 'notion' || file.type === 'onedrive') {
         if (
           fs.existsSync(filePath) &&
           fs.lstatSync(filePath).isSymbolicLink()
         ) {
           continue;
         }
-        await fs.promises.symlink(file[0], filePath);
+        await fs.promises.symlink(location, filePath);
       }
     }
   }

actions/knowledge/tool.ts

@@ -20,9 +20,9 @@ export async function runSyncTool(
 
   let toolUrl = '';
   if (tool === 'notion') {
-    toolUrl = 'github.com/gptscript-ai/knowledge-notion-integration@46a273e';
+    toolUrl = 'github.com/gptscript-ai/knowledge-notion-integration';
   } else if (tool === 'onedrive') {
-    toolUrl = 'github.com/gptscript-ai/knowledge-onedrive-integration@ef73dff';
+    toolUrl = 'github.com/gptscript-ai/knowledge-onedrive-integration';
   }
   const runningTool = await gptscript.run(toolUrl, {
     prompt: true,
@@ -53,14 +53,13 @@ export async function syncFiles(
   const metadataFromFiles = fs.readFileSync(path.join(dir, 'metadata.json'));
   const metadata = JSON.parse(metadataFromFiles.toString());
   for (const file of selectedFiles) {
-    const t = path.basename(path.dirname(path.dirname(file)));
-    if (t !== type) {
-      continue;
+    const baseDir = path.dirname(path.dirname(file));
+    if (baseDir === dir) {
+      const documentID = path.basename(path.dirname(file));
+      const detail = metadata[documentID];
+      detail.sync = true;
+      metadata[documentID] = detail;
     }
-    const documentID = path.basename(path.dirname(file));
-    const detail = metadata[documentID];
-    detail.sync = true;
-    metadata[documentID] = detail;
   }
   fs.writeFileSync(path.join(dir, 'metadata.json'), JSON.stringify(metadata));
   await runSyncTool(true, type);

components/edit/configure.tsx

@@ -88,8 +88,8 @@ const Configure: React.FC<ConfigureProps> = ({ collapsed }) => {
       );
       setDroppedFiles((prev) => {
         const newMap = new Map(prev);
-        for (const file of Array.from(files.entries())) {
-          newMap.set(file[0], file[1]);
+        for (const [location, file] of Array.from(files.entries())) {
+          newMap.set(location, file);
         }
         return newMap;
       });