From 02b1bd603d41c52b1f5315b77a4ad3be7a1b4d84 Mon Sep 17 00:00:00 2001 From: ZiuChen <457353192@qq.com> Date: Tue, 20 Sep 2022 20:53:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=88=E6=B3=A8=E5=86=8C=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=20=E5=90=8E=E6=89=A7=E8=A1=8C=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global/initPlugin.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/global/initPlugin.js b/src/global/initPlugin.js index e65c656..001a8ed 100644 --- a/src/global/initPlugin.js +++ b/src/global/initPlugin.js @@ -193,10 +193,17 @@ export default function initPlugin() { const resetNav = () => document.querySelectorAll('.clip-switch-item')[0]?.click() const registerClipEvent = (listener) => { - const errorHandler = () => { + const exitHandler = () => { utools.showNotification('剪贴板监听异常退出 请重启插件以开启监听') utools.outPlugin() } + const errorHandler = (error) => { + const info = '请手动安装 clipboard-event-handler-linux 到 ~/.local/bin' + const site = 'https://ziuchen.gitee.io/project/ClipboardManager/guide/' + utools.showNotification('启动剪贴板监听出错: ' + error + info) + utools.shellOpenExternal(site) + utools.outPlugin() + } listener .on('change', () => { const item = pbpaste() @@ -211,21 +218,15 @@ export default function initPlugin() { item.updateTime = new Date().getTime() db.addItem(item) }) - .on('close', errorHandler) - .on('exit', errorHandler) - .on('error', (error) => { - const info = '请手动安装 clipboard-event-handler-linux 到 ~/.local/bin' - const site = 'https://ziuchen.gitee.io/project/ClipboardManager/guide/' - utools.showNotification('启动剪贴板监听出错: ' + error + info) - utools.shellOpenExternal(site) - utools.outPlugin() - }) + .on('close', exitHandler) + .on('exit', exitHandler) + .on('error', (error) => errorHandler(error)) } try { // 首次启动插件 即开启监听 - listener.startListening() registerClipEvent(listener) + listener.startListening() } catch (error) { utools.showNotification(error) } @@ -233,8 +234,8 @@ export default function initPlugin() { utools.onPluginEnter(() => { if (!listener.listening) { // 进入插件后 如果监听已关闭 则重新开启监听 - listener.startListening() registerClipEvent(listener) + listener.startListening() } toTop() resetNav()