From 9d979a2b0412f79e432afb354a0a9b890946e5d2 Mon Sep 17 00:00:00 2001
From: Molunerfinn <marksz@teamsz.xyz>
Date: Thu, 29 Nov 2018 11:14:45 +0800
Subject: [PATCH] Fixed: progress display when upload from clipboard

---
 src/main/index.js          | 15 ++-------------
 src/main/utils/uploader.js | 21 +--------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 7f8254ac..b664f005 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -317,24 +317,13 @@ const showWindow = (bounds) => {
 }
 
 const uploadClipboardFiles = async () => {
-  let img = clipboard.readImage()
-  let uploadImg = null
-  if (!img.isEmpty()) {
-    // 从剪贴板来的图片默认转为png
-    const imgUrl = 'data:image/png;base64,' + Buffer.from(img.toPNG(), 'binary').toString('base64')
-    uploadImg = {
-      width: img.getSize().width,
-      height: img.getSize().height,
-      imgUrl
-    }
-  }
   let win
-  if (miniWindow.isVisible) {
+  if (miniWindow.isVisible()) {
     win = miniWindow
   } else {
     win = settingWindow || window
   }
-  img = await uploader(uploadImg, 'imgFromClipboard', win.webContents)
+  let img = await uploader(undefined, 'imgFromClipboard', win.webContents)
   if (img !== false) {
     if (img.length > 0) {
       const pasteStyle = db.read().get('settings.pasteStyle').value() || 'markdown'
diff --git a/src/main/utils/uploader.js b/src/main/utils/uploader.js
index a33a2fb7..ace0e2d4 100644
--- a/src/main/utils/uploader.js
+++ b/src/main/utils/uploader.js
@@ -63,26 +63,7 @@ const waitForRename = (window, id) => {
 const uploader = (img, type, webContents) => {
   const picgo = new PicGo(CONFIG_PATH)
   picgo.config.debug = true
-  let input = []
-  switch (type) {
-    case 'imgFromClipboard':
-      if (img !== null) {
-        const today = dayjs().format('YYYYMMDDHHmmss') + '.png'
-        input = [
-          {
-            base64Image: img.imgUrl.replace(/^data\S+,/, ''),
-            fileName: today,
-            width: img.width,
-            height: img.height,
-            extname: '.png'
-          }
-        ]
-      }
-      break
-    default:
-      input = img
-      break
-  }
+  let input = img
 
   picgo.helper.beforeUploadPlugins.register('renameFn', {
     handle: async ctx => {