From 74f7f3ebdf18a16f2df2cbc0ab4808c250bfe888 Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Mon, 28 Jun 2021 20:08:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9Fapp?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/App.vue | 24 +++++++-- src/renderer/assets/common/constans.js | 9 +++- src/renderer/assets/common/utils.js | 68 ++++++++++++++++++++++++++ src/renderer/store/modules/main.js | 27 +++++++++- 4 files changed, 122 insertions(+), 6 deletions(-) diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 1fa1984..6a23680 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -16,7 +16,7 @@ id="search" :placeholder="subPlaceHolder && selected && selected.key === 'plugin-container' ? subPlaceHolder : 'Hi, Rubick'" class="main-input" - @change="e => onSearch({value: e.target.value})" + @change="e => search({value: e.target.value})" :value="searchValue" :maxLength="selected && selected.key !== 'plugin-container' ? 0 : 1000" > @@ -33,7 +33,7 @@ - {{ item.name }} + import {mapActions, mapMutations, mapState} from "vuex"; import {ipcRenderer, remote} from "electron"; -import {getWindowHeight} from "./assets/common/utils"; +import {getWindowHeight, debounce} from "./assets/common/utils"; const {Menu, MenuItem} = remote; @@ -75,7 +75,8 @@ export default { data() { return { searchType: this.$route.query.searchType ? 'subWindow' : '', - query: this.$route.query + query: this.$route.query, + searchFn: null, } }, mounted() { @@ -89,6 +90,16 @@ export default { methods: { ...mapActions('main', ['onSearch', 'showMainUI']), ...mapMutations('main', ['commonUpdate']), + search(v) { + if (!this.searchFn) { + this.searchFn = debounce(this.onSearch, 200); + } + this.searchFn(v); + }, + renderTitle(title) { + const result = title.split(this.searchValue); + return `
${result[0]}${this.searchValue}${result[1]}
` + }, checkNeedInit(e) { // 如果搜索栏无内容，且按了删除键，则清空 tag if (this.searchValue === '' && e.keyCode === 8) { @@ -178,6 +189,9 @@ export default { padding-top: 60px; height: 100vh; overflow: auto; + ::-webkit-scrollbar { + width: 0; + } } .rubick-select, .rubick-select-subMenu { display: flex; @@ -211,6 +225,8 @@ export default { left: 0; width: 100%; z-index: 99; + max-height: calc(~'100vh - 60px'); + overflow: auto; .op-item { padding: 0 10px; height: 60px; diff --git a/src/renderer/assets/common/constans.js b/src/renderer/assets/common/constans.js index 2bcf52a..3de9673 100644 --- a/src/renderer/assets/common/constans.js +++ b/src/renderer/assets/common/constans.js @@ -39,11 +39,18 @@ const SYSTEM_PLUGINS = [ ], "tag": 'rubick-screen-short-cut', } -] +]; + +const APP_FINDER_PATH = [ + '/System/Applications', + '/Applications', + '/System/Library/PreferencePanes', +]; export { WINDOW_MAX_HEIGHT, WINDOW_MIN_HEIGHT, PRE_ITEM_HEIGHT, SYSTEM_PLUGINS, + APP_FINDER_PATH, } diff --git a/src/renderer/assets/common/utils.js b/src/renderer/assets/common/utils.js index 8ebb51c..b4308ce 100644 --- a/src/renderer/assets/common/utils.js +++ b/src/renderer/assets/common/utils.js @@ -5,6 +5,8 @@ import fs from 'fs'; import process from 'child_process'; import Store from 'electron-store'; import downloadFile from 'download'; +import {nativeImage} from 'electron'; +import {APP_FINDER_PATH} from './constans'; const store = new Store(); @@ -148,6 +150,70 @@ function find(p, target = 'plugin.json') { console.log(e); } } +const fileLists = []; +// 默认搜索目录 +APP_FINDER_PATH.forEach((searchPath) => { + fs.readdir(searchPath, (err, files) => { + try { + for (let i = 0; i < files.length; i++) { + const appName = files[i]; + const extname = path.extname(appName); + const appSubStr = appName.split(extname)[0]; + if ((extname === '.app' || extname === '.prefPane') >= 0 ) { + try { + const path1 = path.join(searchPath, `${appName}/Contents/Resources/App.icns`); + const path2 = path.join(searchPath, `${appName}/Contents/Resources/AppIcon.icns`); + const path3 = path.join(searchPath, `${appName}/Contents/Resources/${appSubStr}.icns`); + const path4 = path.join(searchPath, `${appName}/Contents/Resources/${appSubStr.replace(' ', '')}.icns`); + let iconPath = path1; + if (fs.existsSync(path1)) { + iconPath = path1; + } else if (fs.existsSync(path2)) { + iconPath = path2; + } else if (fs.existsSync(path3)) { + iconPath = path3; + } else if (fs.existsSync(path4)) { + iconPath = path4; + } else { + // 性能最低的方式 + const resourceList = fs.readdirSync(path.join(searchPath, `${appName}/Contents/Resources`)); + const iconName = resourceList.filter(file => path.extname(file) === '.icns')[0]; + iconPath = path.join(searchPath, `${appName}/Contents/Resources/${iconName}`); + } + nativeImage.createThumbnailFromPath(iconPath, {width: 64, height: 64}).then(img => { + fileLists.push({ + name: appSubStr, + value: 'plugin', + icon: img.toDataURL(), + desc: path.join(searchPath, appName), + type: 'app', + action: `open ${path.join(searchPath, appName).replace(' ', '\\ ')}` + }) + }) + } catch (e) { + } + + } + } + } catch (e) { + console.log(e); + } + }); +}); + + +function debounce(fn, delay) { + let timer + return function () { + const context = this + const args = arguments + + clearTimeout(timer) + timer = setTimeout(function () { + fn.apply(context, args) + }, delay) + } +} export { getWindowHeight, @@ -157,4 +223,6 @@ export { mergePlugins, find, downloadZip, + fileLists, + debounce, } diff --git a/src/renderer/store/modules/main.js b/src/renderer/store/modules/main.js index 54b4c5d..09f76e2 100644 --- a/src/renderer/store/modules/main.js +++ b/src/renderer/store/modules/main.js @@ -8,10 +8,12 @@ import { mergePlugins, find, downloadZip, + fileLists, } from '../../assets/common/utils'; import systemMethod from '../../assets/common/system'; import fs from "fs"; import path from 'path'; +import {execSync} from 'child_process'; const state = { selected: null, @@ -89,7 +91,7 @@ const actions = { }) }) }, - onSearch ({ commit }, paylpad) { + async onSearch ({ commit }, paylpad) { if (state.selected && state.selected.key !== 'plugin-container') { commit('commonUpdate', {searchValue: ''}); return; @@ -199,6 +201,16 @@ const actions = { ] }) }); + options = [ + ...options, + ...(fileLists.filter(plugin => plugin.name.indexOf(value) >= 0)).map(plugin => { + plugin.click = () => { + console.log(plugin) + actions.openPlugin({commit}, {plugin}); + } + return plugin + }), + ] } commit('commonUpdate', { @@ -224,6 +236,19 @@ const actions = { }); }, openPlugin({commit}, {cmd, plugin, feature, router}) { + if (plugin.type === 'app') { + execSync(plugin.action); + commit('commonUpdate', { + selected: null, + showMain: false, + options: [], + searchValue: '', + }); + ipcRenderer.send('changeWindowSize-rubick', { + height: getWindowHeight([]), + }); + return; + } commit('commonUpdate', { selected: { key: 'plugin-container',