fix: enhance document deletion hooks and improve file watching on Win…

…dows
purocean · Feb 5, 2025 · 24448c3 · 24448c3
1 parent a21175b
commit 24448c3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/renderer/services/document.ts b/src/renderer/services/document.ts
@@ -496,7 +496,7 @@ export async function deleteDoc (doc: PathItem, skipConfirm = false) {
   }
 
   try {
-    triggerHook('DOC_BEFORE_DELETE', { doc })
+    triggerHook('DOC_BEFORE_DELETE', { doc, force: false })
     await api.deleteFile(doc, true)
   } catch (error: any) {
     const force = await useModal().confirm({
@@ -506,6 +506,7 @@ export async function deleteDoc (doc: PathItem, skipConfirm = false) {
 
     if (force) {
       try {
+        triggerHook('DOC_BEFORE_DELETE', { doc, force: true })
         await api.deleteFile(doc, false)
       } catch (err: any) {
         useToast().show('warning', err.message)

diff --git a/src/renderer/startup.ts b/src/renderer/startup.ts
@@ -58,7 +58,10 @@ function switchDefaultPreviewer () {
 function reWatchFsOnWindows ({ doc }: { doc: PathItem & { type?: Doc['type'] }}) {
   // fix parent folder rename / delete on Windows https://github.com/paulmillr/chokidar/issues/664
   if (isWindows && doc.type === 'dir') {
-    indexer.triggerWatchCurrentRepo()
+    indexer.stopWatch()
+    setTimeout(() => {
+      indexer.triggerWatchCurrentRepo()
+    }, 500)
   }
 }
 

diff --git a/src/renderer/types.ts b/src/renderer/types.ts
@@ -509,7 +509,7 @@ export type BuildInHookTypes = {
   EDITOR_CURRENT_EDITOR_CHANGE: { current?: CustomEditor | null },
   EDITOR_CONTENT_CHANGE: { uri: string, value: string },
   DOC_CREATED: { doc: Doc },
-  DOC_BEFORE_DELETE: { doc: PathItem },
+  DOC_BEFORE_DELETE: { doc: PathItem, force: boolean },
   DOC_DELETED: { doc: PathItem },
   DOC_BEFORE_MOVE: { doc: Doc, newDoc: Doc },
   DOC_MOVED: { oldDoc: Doc, newDoc: Doc },