From 8ee1572ea66f98af6ae0f5d2804109155014e8d8 Mon Sep 17 00:00:00 2001 From: ZiuChen <457353192@qq.com> Date: Wed, 21 Sep 2022 16:43:52 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E4=BA=86=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=86=85=E7=9A=84=E4=BA=8C=E8=BF=9B=E5=88=B6=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20=E6=81=A2=E5=A4=8D=E6=97=A7=E7=9A=84=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E6=9C=BA=E5=88=B6=20=E6=80=A7=E8=83=BD=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=9C=89=E5=BE=85=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/node_modules/clipboard-event/LICENSE | 21 ----- public/node_modules/clipboard-event/index.js | 62 -------------- .../platform/clipboard-event-handler-linux | Bin 12928 -> 0 bytes .../clipboard-event-handler-win32.exe | Bin 8696 -> 0 bytes public/plugin.json | 2 +- public/preload.js | 2 - src/global/initPlugin.js | 78 ++++-------------- src/views/Main.vue | 26 ++---- 8 files changed, 25 insertions(+), 166 deletions(-) delete mode 100644 public/node_modules/clipboard-event/LICENSE delete mode 100644 public/node_modules/clipboard-event/index.js delete mode 100644 public/node_modules/clipboard-event/platform/clipboard-event-handler-linux delete mode 100644 public/node_modules/clipboard-event/platform/clipboard-event-handler-win32.exe diff --git a/public/node_modules/clipboard-event/LICENSE b/public/node_modules/clipboard-event/LICENSE deleted file mode 100644 index 1b0701b..0000000 --- a/public/node_modules/clipboard-event/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Sudhakar R - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/public/node_modules/clipboard-event/index.js b/public/node_modules/clipboard-event/index.js deleted file mode 100644 index 86e615d..0000000 --- a/public/node_modules/clipboard-event/index.js +++ /dev/null @@ -1,62 +0,0 @@ -const { chmodSync, existsSync, mkdirSync, copyFileSync } = require('fs') -const { EventEmitter } = require('events') -const path = require('path') -const { execFile } = require('child_process') -const homeDir = require('os').homedir() - -class ClipboardEventListener extends EventEmitter { - constructor() { - super() - this.child = null - this.listening = false - } - startListening() { - const { platform } = process - if (platform === 'win32') { - this.child = execFile(path.join(__dirname, 'platform/clipboard-event-handler-win32.exe')) - } else if (platform === 'linux') { - // linux: cant execFile without chmod, and cant chmod in app.asar - // so we need to copy the file to /usr/bin - const targetPath = path.resolve(homeDir, '.local', 'bin') - const target = path.resolve(targetPath, 'clipboard-event-handler-linux') - const p = path.join(__dirname, 'platform/clipboard-event-handler-linux') - try { - if (!existsSync(targetPath)) { - // bin dir doesnt exist, create it - mkdirSync(targetPath) - } - if (!existsSync(target)) { - // copy the file - copyFileSync(p, target) - chmodSync(target, 0o755) - } - } catch (error) { - this.emit('error', error) - } - this.child = execFile(target) - } else { - throw 'Not yet supported' - } - this.child.stdout.on('data', (data) => { - if (data.trim() === 'CLIPBOARD_CHANGE') { - this.emit('change') - } - }) - this.child.stdout.on('close', () => { - this.emit('close') - this.listening = false - }) - this.child.stdout.on('exit', () => { - this.emit('exit') - this.listening = false - }) - this.listening = true - } - stopListening() { - const res = this.child.kill() - this.listening = false - return res - } -} - -module.exports = new ClipboardEventListener() diff --git a/public/node_modules/clipboard-event/platform/clipboard-event-handler-linux b/public/node_modules/clipboard-event/platform/clipboard-event-handler-linux deleted file mode 100644 index 0f6d129086294a626f72b451cfbd5e7dd9230bcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12928 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 diff --git a/public/node_modules/clipboard-event/platform/clipboard-event-handler-win32.exe b/public/node_modules/clipboard-event/platform/clipboard-event-handler-win32.exe deleted file mode 100644 index 63411831d18fcea49eda748e113ba7a32d090d6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8696 zcmeHMdvp{<*1z4;nM@KALKF$FI6#09l5r*>VAMz^FBnZi$b(I&Es9kS`K_woS~0_I?a;i6Ej2YcJIcDQlBilR(SAq4r?J^S zq|uZj*on>u#S)>eE<|ZXE=6X*ib9OYjT)I5U@43Y`qF^{)-`_xQ9A$YE2Ajui&O-@ zGgzgRD3d86ma>SxWr~?kGyuh%0-}p!Z9k{9_KMDXTYyiG8)pkDT|waM&I3RjUn}H} zPgcxs(+%ANBA2Zc6}Hd|kmFJ*q_^pcPeVs0E0dY&fJPw4rBb4@IFwgardK2;n@9;1 z9!0cmAW;giM9gM&L~P=1lwsEKC(>jw2P;Yzb4(bVyV#U>p14H7Hsz&6N)3COESho# zqsVe;Ch(l0jHm+*Xv0v=oqXZ<#&A@^=qBab3~aAC z2MbNk%@T7)#+N&nVLzq(EIk#2UrE6Fa-yMI$AG?!iIaoD=5b;UBjkX&d0g%?Q%*K8>qxX0ChG=7 z$r%d*R4@)jZkhXvGJ&u>B(`^*lWcZdp}o*i%qR)u1Iz>4G0TWHqpZf%W86Vq^|yf+ z(I+XOqZ~8KP1k_|)InpW&2m+sycziUn0HK>Piq0r63jxFU9xR(66kbNC}g(8X3s&! zesl90gpwUQ2*}&8SG>enV#BbqUYw1M;gMBTnj)o{9ulnyW*TK;@MYmcX&|j-3Zisz zj%21y9CmSNF)_*kUjLlK@f?092pGGD!>c)^Ozboz({a;*gfx0m+GR4+UlR_2@&{s+ zt-@OHc>r^nNf+3>%cN33zf>-z(KW&@QyLxOutcz-&(m}Wl&8QanO+0WWV#Q0GU!^< z?V!91ikS{djQ?nf)zgJTnDHHqGE=E}4tP%Ie0~50ilA}^pd0o}M;=Q~UJncDbW9pc zF6dt(0oVYJNnGdYG%ewd1Q%M8FgTr_1=ayQr9#{3bQGMO=*RdSNw5ix;ki^GTtL-S zBn+Zcri%gdh06f9P^nO7WfH8++>g}>G>>C@X_hb;*iw%5P@>t)>;NfD8?8H}3ZV}h zZgvS0?czOe$$U+kA(-j$2u6vL8`vK?7MUTDUgy~Le7;0_mtz|&i>0|jA|;L@qz#tA z!aQJUQEZgp0d@h$Hd;<4sDgz?axB8rLSs1=ncYH{p3yd+V|yutlfi6MpmiqVv$FcF zoU$5Fq_H?D0=*226KE=QDA34fIEus|* zjTa`+2D(eI;T~TKcpj|;9L_0YXea6u=~ci&4lm`foYSwQw?KDu%GDft=u1!*(ooSx z28|P4obz^CLIH6*T~7}H{u1!%C|p9j#RSR|5}{bivw^K^Gw# z>oWjQgsmsibEZ-uiFQB>r9uh~Hwz?%*}g>*D_8LI!tR?`GWZP{xr6#>2e9jB(;_D{ ze(ZI0J3qCoFXKKFqZ0XT2Bb>UI~?Tkseu+v*1h>kr{WLhx66L7Pto%iss6%(zSd^m z+8k|djV!L%yKPZv&FztW z3T9NOMllSzO(9o>Y6LVxZt*G9hF;UT>{K7}2h|Rxp*x^NDbti7!>V+xBT6aP{Dy{M zvvoD7RI7f4SO?Cf9FvFi$h@(-t{7TK_b4&k83_1Pj~rArzgr0gnXf974TT~CDOBlI zgPLBZYm2ya?w}l0s9fs^sL<^+#joffc%4DGxt0)`riIjaEY_hMtL^Jlp|phB+7!K3 z^UpFA{alSq6@3HFlA^Bxk~FG@dPZlbVJICfzU~G!7|)}Ztjk`dL)I7eacPisXuS%N zu(C*tZ-|Yl!fG28-GG+*M#UPj1FdRX2#PpobA@7fbTx2hV?={|M7`pZyLip$&l@)8 z4S9n78_Kmnx30FepR=hWAp5)f#zf7C&53zhRG%7*YweVMA*Jtpoa^-1l&+{1`BWS& zH;f&IZv>SNTa>pgsvX!5dATjKTC`7vF5{TBaht3$ddW;4%@2O;DEKG@ODHU`d3`?E zmp>@OlwleEpsx9%jHp%%s;yCLWrv<()?6d|sRkpcJa!4hccnNZkI8h#rp1WU5PZo# zbur(K7_nYy^(h{C4W4qa|{(N2(yL|{} zu~+8Vs^5#7$Ho)}UNM6)XhzEd>jjK(l}M&a4Dl$EN0d(+ygf* zWH>D(WQ1=S6uvFNN*UoTiEIo?PQD`}d7j-k}nBwqineDF!5l{%pz0Z^=_wwd1e+^C#59p-mtgWyK1jIj9xyu;mDdDt)Y$2 zJuzVB?^n(`(ww>^d7XV%V^QeTCzr03X85=4e|G2-->mIA){s-Xy6U=(`&PfOWAa-& zI=k#Ahb;MOO<>*a4Mzt5Zp2j`hjSe}u4p*0;^w2T-S&Km@cE^Ce_7j_yRhr(jvy*In{sk^P#0y}$NP7o;DadClna;xmfw-+gs^Cu}SlkT z$_290iifE{i4MF=@gs5xG|X08+0g6R@}k#t3Er+n5Iybu-X`YoeR6j#d|(C}W9@CR zqOVh+!q|-;JLC?*R+MWVR^U0I`gbj{FO zgEn~XknD2@Lta(0MO-}CMWYb7O|=cTV=uvtJH@9kPaF+9G|s*_vQ#jC2>GQKzI=>L zbPKYtpTIHc>J@|ldY&~F&E;8RdSOp`{PL{PYre#~qquOAV!ya}O#jIu!CP!jtSe#+kPNBLS;798%-g@8`{%b#2EOikS^pB&A)XJbk7qoxaIp7>x~_Cs$we*KJEX?yV2ZEt@4 zm-&1CKE7b%>lgU+%)%QxCSH=aJ^gm}DTCgtseYA}OvJm8*Wnx5I(+|$Pwaa|e5!X> zxUZesJod&nW=*@dA^F7NttqKY_vM!~v8c{ya)-R_@8|ZX}Ar1C!{u z(__h6+Mmb2l)}DR;9Dd6FmOg4N$rx|4}RYktK(xcLsKd@^(l2PzF;oTcaxGJNRC;>$Ur!{i#Sp_f1Jf#ahvK79O zrELC&Yk)Uoo|L^1W$rCCV3BmcG=kmEkST~>%)holqO&=D3&Rz#>ez1*d^U7I!$1|_ zO*MG*4$RH`Hvbrhw$X8I0X}~>Rx9&<(aGW4v(PIxUj_Hr9xg}V3_1Hp3i;?8ixl$D ziWKtWA_cZr@VmWpG-8|%8CA#}(SZYTgS|HsWMYytEe3gCKV|cuK9QaFf^P@->iAX>+YQ{; zd|fl5bFiIe>x$`~VQdEpanspR+0WH=-};*PzD8m+FQPFIRusSY|M(n4llXp~$@}bG zJ$p|t=3|`DhQW2yf;DzSlRq^M>iAFkchLYYH0G>tj&o`ME=&K3w5OVr=C7PCC?-k7i^kq$PM&BMBw_g!QINLP+N$H5XJN>E?PWLda?YrvXTYs5ARv^7ULO}R7in5C5}t&#b(ni z$&^)q2QCXVoRp8puM_UXh0ETBvI+DM+#GveFGOZfYnJQnSwm7C#r9&yB>N;sv7_j! zA*ls+poI>+l7RlR?0bG4FE8|G>RChfo>gK`4?Q>1^};ueUBfqRJ-Fjf)&s4#KVJHY zv*yI(*nW`9>R z;CH*8&f31Y=82>4KKZw<`!_dT_^S!>kg@Z!_pLawH+kt7PWwHNPJL|e$7$`3ImcEW zo@l>(=$t=hd^P6Ifzy|dy=th4of6{3gE~!+E6e4(>4uv=OsKxIc3JnJo8CMn_RKmI zY~4J0`Xy<`k(CRI-nRVjhH;0j|1BN7>Xq+~Wk3J7ozm0CAG~GXadq>1tBlbbpPhQV z^u#j{udmxWqHX@YGd~_sb@j1{H=Q{6S@vdO|AeD&?s|VjS5oDdUmeQHo?&rKIWqd- z54Q~*zW2UYP9>}u@zo~Ba^Y$iz-*YGeda&80q3@#ID6hU&z>G=*SlNsiHyHMRKK#d~!9qn;~P4X(bd`p$V { - const exitHandler = () => { - utools.showNotification('剪贴板监听异常退出 请重启插件以开启监听') - utools.outPlugin() + let prev = db.dataBase.data[0] || {} + function loop() { + time.sleep(300).then(loop) + const item = pbpaste() + if (!item) return + item.id = crypto.createHash('md5').update(item.data).digest('hex') + if (item && prev.id != item.id) { + // 剪切板元素 与最近一次复制内容不同 + prev = item + handleClipboardChange(item) + } else { + // 剪切板元素 与上次复制内容相同 } - 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', handleClipboardChange) - .on('close', exitHandler) - .on('exit', exitHandler) - .on('error', (error) => errorHandler(error)) - } - - if (!utools.isMacOs()) { - // 首次启动插件 即开启监听 - registerClipEvent(listener) - listener.startListening() - } else { - // macos 由于无法执行 clipboard-event-handler-mac 所以使用旧方法 - let prev = db.dataBase.data[0] || {} - function loop() { - time.sleep(300).then(loop) - const item = pbpaste() - if (!item) return - item.id = crypto.createHash('md5').update(item.data).digest('hex') - if (item && prev.id != item.id) { - // 剪切板元素 与最近一次复制内容不同 - prev = item - handleClipboardChange(item) - } else { - // 剪切板元素 与上次复制内容相同 - } - } - loop() } + loop() utools.onPluginEnter(() => { - if (!listener.listening && !utools.isMacOs()) { - // 进入插件后 如果监听已关闭 则重新开启监听 - registerClipEvent(listener) - listener.startListening() - } toTop() resetNav() }) - utools.onPluginOut((processExit) => { - if (processExit && !utools.isMacOs()) { - utools.showNotification('剪贴板监听异常退出 请重启插件以开启监听') - listener.stopListening() - } - }) - window.db = db window.copy = copy window.paste = paste @@ -280,5 +233,4 @@ export default function initPlugin() { window.createFile = createFile window.focus = focus window.toTop = toTop - window.listener = listener } diff --git a/src/views/Main.vue b/src/views/Main.vue index 26e126b..251b750 100644 --- a/src/views/Main.vue +++ b/src/views/Main.vue @@ -226,25 +226,17 @@ onMounted(() => { updateShowList(activeTab.value) // 定期检查更新 - if (!utools.isMacOs) { - window.listener.on('change', () => { + let prev = {} + setInterval(() => { + const now = window.db.dataBase.data[0] + if (prev?.id === now?.id) { + } else { + // 有更新 list.value = window.db.dataBase.data updateShowList(activeTab.value) - }) - } else { - // macos - let prev = {} - setInterval(() => { - const now = window.db.dataBase.data[0] - if (prev?.id === now?.id) { - } else { - // 有更新 - list.value = window.db.dataBase.data - updateShowList(activeTab.value) - prev = now - } - }, 800) - } + prev = now + } + }, 800) // 监听搜索框 watch(filterText, (val) => updateShowList(activeTab.value))