From a17e53d24b8013dd853171e19f4f2e8215415f11 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 27 Mar 2021 17:45:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E8=AF=A6=E7=BB=86=E7=9A=84?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF=EF=BC=9B=E4=B8=8D=E5=8E=8B?=
 =?UTF-8?q?=E7=BC=A9=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/preload.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/preload.js b/src/preload.js
index 96715a4..1c159de 100644
--- a/src/preload.js
+++ b/src/preload.js
@@ -558,24 +558,28 @@ runCodeInVm = (cmd, cb, enterData = {}) => {
         cb(null, stderr.toString())
     });
 
+    let liteErr = e => {
+        return e.stack.replace(/([ ] +at.+)|(.+\.js:\d+)/g, '').trim()
+    }
+
     // 错误处理
     try {
         vm.run(cmd, path.join(__dirname, 'preload.js'));
-    } catch (error) {
-        console.log(error)
-        cb(null, error.toString())
+    } catch (e) {
+        console.log('Error: ',e)
+        cb(null, liteErr(e))
     }
 
     let cbUnhandledError = e => {
         removeAllListener()
-        console.log(e)
-        cb(null, e.error.toString())
+        console.log('UnhandledError: ', e)
+        cb(null, liteErr(e.error))
     }
 
     let cbUnhandledRejection = e => {
         removeAllListener()
-        console.log(e)
-        cb(null, e.reason.toString())
+        console.log('UnhandledRejection: ',e)
+        cb(null, liteErr(e.reason))
     }
 
     let removeAllListener = () => {
@@ -687,11 +691,12 @@ getBase64Ico = async filepath => {
     if (['png', 'jpg', 'jpeg', 'bmp', 'ico', 'gif', 'svg'].includes(ext)) {
         if (ext == 'svg') ext = 'svg+xml'
         sourceImage = `data:image/${ext};base64,` + fs.readFileSync(filepath, 'base64')
+        if (ext == 'png') return sourceImage
     } else {
         sourceImage = utools.getFileIcon(filepath)
+        return sourceImage
     }
     let compressedImage = await getCompressedIco(sourceImage)
-    if (sourceImage.length < compressedImage.length && ext == 'png') compressedImage = sourceImage
     return compressedImage
 }