fix: make document hooks breakable and improve file watching on Windows

purocean · Feb 5, 2025 · b42b163 · b42b163
1 parent 24448c3
commit b42b163
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 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, force: false })
+    await triggerHook('DOC_BEFORE_DELETE', { doc, force: false }, { breakable: true })
     await api.deleteFile(doc, true)
   } catch (error: any) {
     const force = await useModal().confirm({
@@ -506,7 +506,7 @@ export async function deleteDoc (doc: PathItem, skipConfirm = false) {
 
     if (force) {
       try {
-        triggerHook('DOC_BEFORE_DELETE', { doc, force: true })
+        await triggerHook('DOC_BEFORE_DELETE', { doc, force: true }, { breakable: true })
         await api.deleteFile(doc, false)
       } catch (err: any) {
         useToast().show('warning', err.message)
@@ -573,7 +573,7 @@ export async function moveDoc (doc: Doc, newPath?: string) {
   }
 
   try {
-    triggerHook('DOC_BEFORE_MOVE', { doc, newDoc })
+    await triggerHook('DOC_BEFORE_MOVE', { doc, newDoc }, { breakable: true })
     await api.moveFile(doc, newPath)
     triggerHook('DOC_MOVED', { oldDoc: doc, newDoc })
   } catch (error: any) {

diff --git a/src/renderer/startup.ts b/src/renderer/startup.ts
@@ -25,7 +25,7 @@ import plugins from '@fe/plugins'
 import ctx from '@fe/context'
 import ga from '@fe/support/ga'
 import * as jsonrpc from '@fe/support/jsonrpc'
-import { getLogger } from '@fe/utils'
+import { getLogger, sleep } from '@fe/utils'
 import { removeOldDatabases } from './others/db'
 
 const logger = getLogger('startup')
@@ -55,10 +55,11 @@ function switchDefaultPreviewer () {
   }
 }
 
-function reWatchFsOnWindows ({ doc }: { doc: PathItem & { type?: Doc['type'] }}) {
+async 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.stopWatch()
+    await sleep(50)
     setTimeout(() => {
       indexer.triggerWatchCurrentRepo()
     }, 500)