improve(electron): compatible paste assets for multiple platform

logseq · Jan 28, 2021 · c151c9c · c151c9c
1 parent 32c2d4f
commit c151c9c
Show file tree

Hide file tree

Showing 3 changed files with 137 additions and 122 deletions.
diff --git a/resources/js/preload.js b/resources/js/preload.js
@@ -5,6 +5,19 @@ const { ipcRenderer, contextBridge, shell, clipboard, BrowserWindow } = require(
 const IS_MAC = process.platform === 'darwin'
 const IS_WIN32 = process.platform === 'win32'
 
+function getFilePathFromClipboard () {
+  if (IS_WIN32) {
+    const rawFilePath = clipboard.read('FileNameW')
+    return rawFilePath.replace(new RegExp(String.fromCharCode(0), 'g'), '')
+  }
+
+  return clipboard.read('public.file-url').replace('file://', '')
+}
+
+function isClipboardHasImage () {
+  return !clipboard.readImage().isEmpty()
+}
+
 contextBridge.exposeInMainWorld('apis', {
   doAction: async (arg) => {
     return await ipcRenderer.invoke('main', arg)
@@ -65,11 +78,12 @@ contextBridge.exposeInMainWorld('apis', {
 
     await fs.promises.mkdir(assetsRoot, { recursive: true })
 
-    from = from || getFilePathFromClipboard()
+    from = decodeURIComponent(from || getFilePathFromClipboard())
 
     if (from) {
       // console.debug('copy file: ', from, dest)
-      return await fs.promises.copyFile(from, dest)
+      await fs.promises.copyFile(from, dest)
+      return path.basename(from)
     }
 
     // support image
@@ -83,16 +97,6 @@ contextBridge.exposeInMainWorld('apis', {
         nImg.toPNG()
       )
     }
-
-    // fns
-    function getFilePathFromClipboard () {
-      if (IS_WIN32) {
-        const rawFilePath = clipboard.read('FileNameW')
-        return rawFilePath.replace(new RegExp(String.fromCharCode(0), 'g'), '')
-      }
-
-      return clipboard.read('public.file-url').replace('file://', '')
-    }
   },
 
   toggleMaxOrMinActiveWindow (isToggleMin = false) {
@@ -107,5 +111,8 @@ contextBridge.exposeInMainWorld('apis', {
    */
   async _callApplication (type, ...args) {
     return await ipcRenderer.invoke('call-application', type, ...args)
-  }
+  },
+
+  getFilePathFromClipboard,
+  isClipboardHasImage
 })