Merge pull request #249 from milaiwi/windows_bug

Fixed operation not permitted when renaming directory with children in windows
reorproject · May 11, 2024 · 6bd4133 · 6bd4133
2 parents 794d21f + e6fd035
commit 6bd4133
Showing 1 changed file with 31 additions and 9 deletions.
diff --git a/electron/main/Files/registerFilesHandler.ts b/electron/main/Files/registerFilesHandler.ts
@@ -1,4 +1,4 @@
-import { ipcMain } from "electron";
+import { ipcMain, BrowserWindow } from "electron";
 import * as path from "path";
 import {
   FileInfoTree,
@@ -14,6 +14,8 @@ import {
   GetFilesInfoListForListOfPaths,
   GetFilesInfoList,
   markdownExtensions,
+  startWatchingDirectory,
+  updateFileListForRenderer,
 } from "./Filesystem";
 import * as fs from "fs";
 import {
@@ -140,23 +142,43 @@ export const registerFileHandlers = (
     "rename-file-recursive",
     async (event, renameFileProps: RenameFileProps) => {
       const windowInfo = windowsManager.getWindowInfoForContents(event.sender);
-
+    
       if (!windowInfo) {
         throw new Error("Window info not found.");
       }
+
       windowsManager.watcher?.unwatch(windowInfo?.vaultDirectoryForWindow);
 
-      fs.rename(
-        renameFileProps.oldFilePath,
-        renameFileProps.newFilePath,
-        (err) => {
+      if (process.platform == 'win32') {
+        windowsManager.watcher?.close().then(() => {
+          fs.rename(renameFileProps.oldFilePath, renameFileProps.newFilePath, (err) => {
+            if (err) {
+              throw err;
+            }
+
+            // Re-start watching all paths in array
+            const win = BrowserWindow.fromWebContents(event.sender);
+            if (win) {
+              windowsManager.watcher = startWatchingDirectory(
+                win,
+                windowInfo.vaultDirectoryForWindow,
+              );
+              updateFileListForRenderer(win, windowInfo.vaultDirectoryForWindow);
+            }
+          })
+        });
+      } else {
+        // On non-Windows platforms, directly perform the rename operation
+        fs.rename(renameFileProps.oldFilePath, renameFileProps.newFilePath, (err) => {
           if (err) {
             throw err;
           }
+          // Re-watch the vault directory after renaming
           windowsManager.watcher?.add(windowInfo?.vaultDirectoryForWindow);
-        }
-      );
-
+        });
+      }
+
+      console.log("reindexing folder");
       // then need to trigger reindexing of folder
       windowInfo.dbTableClient.updateDBItemsWithNewFilePath(
         renameFileProps.oldFilePath,