fix: after the system restarts, the watching not works

showlotus · Jan 15, 2025 · fd9bf39 · fd9bf39
1 parent b5456cf
commit fd9bf39
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 42 deletions.
diff --git a/electron/main/clipboard.ts b/electron/main/clipboard.ts
@@ -50,50 +50,57 @@ function getPublicDirectoryPath(files: string[]) {
   return files[0].split('\\').slice(0, -1).join('\\')
 }
 
-NativeClipboard.watch(
-  (type: 'TEXT' | 'IMAGE' | 'FILE', data: any, source: string, app: string) => {
-    if (!shouldUpdateHistory) return
-    if (type === 'IMAGE') {
-      const img = clipboard.readImage()
-      const { width, height } = img.getSize()
-      data = {
-        url: img.toDataURL(),
-        width,
-        height,
-        content: ''
-      } as any
-    } else if (type === 'FILE') {
-      const files = clipboardFiles.readFiles()
-      if (files.length === 1) {
-        const stat = fs.lstatSync(files[0])
-        if (stat.isFile()) {
-          data = {
-            subType: 'file',
-            content: getFileName(files[0]),
-            path: files[0]
+export function registerWatch() {
+  NativeClipboard.watch(
+    (
+      type: 'TEXT' | 'IMAGE' | 'FILE',
+      data: any,
+      source: string,
+      app: string
+    ) => {
+      if (!shouldUpdateHistory) return
+      if (type === 'IMAGE') {
+        const img = clipboard.readImage()
+        const { width, height } = img.getSize()
+        data = {
+          url: img.toDataURL(),
+          width,
+          height,
+          content: ''
+        } as any
+      } else if (type === 'FILE') {
+        const files = clipboardFiles.readFiles()
+        if (files.length === 1) {
+          const stat = fs.lstatSync(files[0])
+          if (stat.isFile()) {
+            data = {
+              subType: 'file',
+              content: getFileName(files[0]),
+              path: files[0]
+            }
+          } else if (stat.isDirectory()) {
+            data = {
+              subType: 'folder',
+              content: getFileName(files[0]),
+              path: files[0]
+            }
           }
-        } else if (stat.isDirectory()) {
+        } else {
           data = {
-            subType: 'folder',
-            content: getFileName(files[0]),
-            path: files[0]
-          }
+            files,
+            path: getPublicDirectoryPath(files),
+            content: getFileName(getPublicDirectoryPath(files)),
+            subType: 'folder,file'
+          } as any
         }
-      } else {
-        data = {
-          files,
-          path: getPublicDirectoryPath(files),
-          content: getFileName(getPublicDirectoryPath(files)),
-          subType: 'folder,file'
-        } as any
       }
-    }
 
-    getWinWebContents().send('update-clipboard', {
-      type,
-      data,
-      source,
-      app
-    })
-  }
-)
+      getWinWebContents().send('update-clipboard', {
+        type,
+        data,
+        source,
+        app
+      })
+    }
+  )
+}
diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -13,6 +13,7 @@ import { fileURLToPath } from 'node:url'
 
 import {
   currActiveWindowHandle,
+  registerWatch,
   setShouldPaste,
   shouldPaste,
   updateCurrActiveWindowHandle
@@ -195,6 +196,7 @@ async function createWindow() {
 app.whenReady().then(() => {
   createWindow()
   checkUpdate()
+  registerWatch()
 })
 
 app.on('window-all-closed', () => {