Update README.md

Fix regex match error

.npmrc

@@ -1 +1 @@
-electron_mirror=https://npm.taobao.org/mirrors/electron/
+electron_mirror=https://npmmirror.com/mirrors/electron/

README.md

@@ -109,6 +109,8 @@ Those who are interested in this project or want to exchange and learn can scan
 
 ![image](https://user-images.githubusercontent.com/21073039/127327603-9796f246-ee4b-4950-a69d-ce3205ec9569.png)
 
+<a href="https://hellogithub.com/repository/0a3e2484b44e481e9dcf1850e45193cd" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=0a3e2484b44e481e9dcf1850e45193cd&claim_uid=vXGwjpmYNsBex0C" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
 ## Contribute
 This project exists thanks to all the people who contribute. [[Contribute](https://github.com/rubickCenter/rubick/graphs/contributors)]. <a href="https://github.com/rubickCenter/rubick/graphs/contributors"><img src="https://opencollective.com/rubick/contributors.svg?width=890&button=false" /></a>
 

detach/yarn.lock

@@ -5864,7 +5864,7 @@ lodash.memoize@^4.1.2:
 
 lodash.throttle@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  resolved "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
 
 lodash.transform@^4.6.0:

feature/src/languages/langs/en-US.ts

@@ -67,6 +67,7 @@ export default {
           changeLang: 'Change Language',
           cn: '简体中文',
           en: 'English',
+          history: 'keywords search history',
         },
         global: {
           title: 'Global Shortcut Key',

feature/src/languages/langs/zh-CN.ts

@@ -65,6 +65,7 @@ export default {
           changeLang: '切换语言',
           cn: '简体中文',
           en: 'English',
+          history: '关键词搜索记录',
         },
         global: {
           title: '全局快捷键',

feature/src/views/market/components/result.vue

@@ -31,9 +31,9 @@ const searchValue = computed(() => store.state.searchValue);
 
 const result = computed(() => {
   if (searchValue.value.trim().length > 0) {
-    const pattern = new RegExp(searchValue.value);
+    const pattern = new RegExp(searchValue.value.toLowerCase());
     return totalPlugins.value.filter((plugin) => {
-      if (plugin.pluginName.match(pattern)) {
+      if (plugin.pluginName.toLowerCase().match(pattern)) {
         return true;
       } else {
         return false;

feature/src/views/settings/index.vue

@@ -119,6 +119,16 @@
                 :un-checked-children="$t('feature.settings.basic.off')"
               ></a-switch>
             </div>
+            <div class="settings-item-li">
+              <div class="label">
+                {{ $t('feature.settings.basic.history') }}
+              </div>
+              <a-switch
+                v-model:checked="common.history"
+                :checked-children="$t('feature.settings.basic.on')"
+                :un-checked-children="$t('feature.settings.basic.off')"
+              ></a-switch>
+            </div>
           </div>
           <div class="setting-item">
             <div class="title">{{ $t('feature.settings.basic.theme') }}</div>
@@ -283,14 +293,15 @@ state.local = perf.local;
 state.global = defaultGlobal;
 
 const setConfig = debounce(() => {
+  const { perf } = localConfig.getConfig();
   localConfig.setConfig(
     JSON.parse(
       JSON.stringify({
         perf: {
+          ...perf,
           shortCut: state.shortCut,
           common: state.common,
           local: state.local,
-          custom: state.custom,
         },
         global: state.global,
       })

feature/src/views/settings/user-info.vue

@@ -64,6 +64,8 @@ const theme = ref(perf.custom.theme);
 state.custom = perf.custom || {};
 
 const setConfig = debounce(() => {
+  const { perf } = localConfig.getConfig();
+
   localConfig.setConfig(
     JSON.parse(
       JSON.stringify({

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.2.0-beta.1",
+  "version": "4.2.4",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {

src/common/constans/defaultConfig.ts

@@ -1,5 +1,5 @@
 export default {
-  version: 6,
+  version: 7,
   perf: {
     custom: {
       theme: 'SPRING',
@@ -25,6 +25,7 @@ export default {
       autoPast: false,
       darkMode: false,
       guide: false,
+      history: true,
       lang: 'zh-CN',
     },
     local: {

src/core/app-search/get-mac-app/app2png.ts

@@ -32,63 +32,6 @@ const getIconFile = (appFileInput) => {
   });
 };
 
-// const sortIcons = (icons) => {
-//   const aWins = -1;
-//   const bWins = 1;
-//   const catWins = 0;
-//   return icons.sort((a, b) => {
-//     const aSize = parseInt(a.match(/(\d+)x\1/)[1], 10);
-//     const bSize = parseInt(b.match(/(\d+)x\1/)[1], 10);
-//     if (aSize === bSize) {
-//       if (a.indexOf('@2x') > -1) return aWins;
-//       if (b.indexOf('@2x') > -1) return bWins;
-//       return catWins;
-//     }
-//     if (aSize > bSize) return aWins;
-//     if (aSize < bSize) return bWins;
-//     return catWins;
-//   });
-// };
-
-// const icnsToPng = (iconFile, pngFileOutput) => {
-//   const outputDir = pngFileOutput.split('.')[0] + '.iconset'
-//   return new Promise((resolve, reject) => {
-//     exec(`iconutil --convert iconset '${iconFile}' --output '${outputDir}'`, (error) => {
-//       if (error) return reject(error)
-//       fs.readdir(outputDir, (error, files) => {
-//         if (error) {
-//           return resolve(tiffToPng(iconFile, pngFileOutput))
-//         }
-//         const realIcons = files.map((file) => {
-//           return path.join(outputDir, file)
-//         })
-//         const biggestIcon = sortIcons(realIcons).find(Boolean)
-//         fs.rename(biggestIcon, pngFileOutput, (error) => {
-//           error ? reject(error) : resolve(realIcons.filter((file) => {
-//             return file !== biggestIcon
-//           }))
-//         })
-//       })
-//     })
-//   }).then((files) => {
-//     // Cleanup temp icons
-//     return Promise.all(files.map((file) => {
-//       return new Promise((resolve, reject) => {
-//         fs.unlink(file, (error) => {
-//           error ? reject(error) : resolve()
-//         })
-//       })
-//     }))
-//   }).then(() => {
-//     // Cleanup temp directory
-//     return new Promise((resolve, reject) => {
-//       fs.rmdir(outputDir, (error) => {
-//         error ? reject(error) : resolve()
-//       })
-//     })
-//   })
-// }
-
 const tiffToPng = (iconFile, pngFileOutput) => {
   return new Promise((resolve, reject) => {
     exec(

src/core/app-search/get-mac-app/getApps.ts

@@ -1,23 +1,23 @@
-import { spawn } from "child_process";
-import plist from "plist";
+import { spawn } from 'child_process';
+import plist from 'plist';
 
 export default function getApps(resolve, reject, filterByAppName = false) {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   let resultBuffer = new Buffer.from([]);
 
-  const profileInstalledApps = spawn("/usr/sbin/system_profiler", [
-    "-xml",
-    "-detailLevel",
-    "mini",
-    "SPApplicationsDataType",
+  const profileInstalledApps = spawn('/usr/sbin/system_profiler', [
+    '-xml',
+    '-detailLevel',
+    'mini',
+    'SPApplicationsDataType',
   ]);
 
-  profileInstalledApps.stdout.on("data", (chunckBuffer) => {
+  profileInstalledApps.stdout.on('data', (chunckBuffer) => {
     resultBuffer = Buffer.concat([resultBuffer, chunckBuffer]);
   });
 
-  profileInstalledApps.on("exit", (exitCode) => {
+  profileInstalledApps.on('exit', (exitCode) => {
     if (exitCode !== 0) {
       reject([]);
       return;
@@ -37,7 +37,7 @@ export default function getApps(resolve, reject, filterByAppName = false) {
     }
   });
 
-  profileInstalledApps.on("error", (err) => {
+  profileInstalledApps.on('error', (err) => {
     reject(err);
   });
 }

src/core/plugin-handler/index.ts

@@ -61,7 +61,7 @@ class AdapterHandler {
     const packageJSON = JSON.parse(
       fs.readFileSync(`${this.baseDir}/package.json`, 'utf-8')
     );
-    const registryUrl = `https://registry.npm.taobao.org/${name}`;
+    const registryUrl = `${this.registry}${name}`;
 
     // 从npm源中获取依赖包的最新版本
     try {
@@ -185,40 +185,6 @@ class AdapterHandler {
           console.log(message);
         });
       });
-
-      // if (cmd !== 'link') {
-      //   args = args
-      //     .concat('--color=always')
-      //     .concat('--save')
-      //     .concat(`--registry=${this.registry}`);
-      // }
-
-      // const npm = spawn('npm', args, {
-      //   cwd: this.baseDir,
-      // });
-      //
-      // console.log(args);
-      //
-      // let output = '';
-      // npm.stdout
-      //   .on('data', (data: string) => {
-      //     output += data; // 获取输出日志
-      //   })
-      //   .pipe(process.stdout);
-      //
-      // npm.stderr
-      //   .on('data', (data: string) => {
-      //     output += data; // 获取报错日志
-      //   })
-      //   .pipe(process.stderr);
-      //
-      // npm.on('close', (code: number) => {
-      //   if (!code) {
-      //     resolve({ code: 0, data: output }); // 如果没有报错就输出正常日志
-      //   } else {
-      //     reject({ code: code, data: output }); // 如果报错就输出报错日志
-      //   }
-      // });
     });
   }
 }

src/main/browsers/main.ts

@@ -25,7 +25,7 @@ export default () => {
       height: WINDOW_HEIGHT,
       minHeight: WINDOW_MIN_HEIGHT,
       useContentSize: true,
-      resizable: true,
+      resizable: false,
       width: WINDOW_WIDTH,
       frame: false,
       title: '拉比克',

src/main/common/api.ts

@@ -139,6 +139,7 @@ class API extends DBInstance {
   public hideMainWindow(arg, window) {
     window.hide();
   }
+
   public showMainWindow(arg, window) {
     window.show();
   }
@@ -156,6 +157,15 @@ class API extends DBInstance {
     if (!originWindow) return;
     const targetHeight = height;
     originWindow.setSize(originWindow.getSize()[0], targetHeight);
+    const screenPoint = screen.getCursorScreenPoint();
+    const display = screen.getDisplayNearestPoint(screenPoint);
+    const position =
+      originWindow.getPosition()[1] + targetHeight > display.bounds.height
+        ? height - 60
+        : 0;
+    originWindow.webContents.executeJavaScript(
+      `window.setPosition && typeof window.setPosition === "function" && window.setPosition(${position})`
+    );
   }
 
   public setSubInput({ data }, window, e) {
@@ -326,6 +336,7 @@ class API extends DBInstance {
     shell.showItemInFolder(data.path);
     return true;
   }
+
   public async getFileIcon({ data }) {
     const nativeImage = await app.getFileIcon(data.path, { size: 'normal' });
     return nativeImage.toDataURL();

src/renderer/App.vue

@@ -35,6 +35,7 @@
 
 <script setup lang="ts">
 import { watch, ref, toRaw } from 'vue';
+import { exec } from 'child_process';
 import Result from './components/result.vue';
 import Search from './components/search.vue';
 import getWindowHeight from '../common/utils/getWindowHeight';
@@ -43,6 +44,7 @@ import useDrag from '../common/utils/dragWindow';
 import { getGlobal } from '@electron/remote';
 import { PLUGIN_HISTORY } from '@/common/constans/renderer';
 import { message } from 'ant-design-vue';
+import localConfig from './confOp';
 
 const { onMouseDown } = useDrag();
 const remote = window.require('@electron/remote');
@@ -73,6 +75,8 @@ initPlugins();
 const currentSelect = ref(0);
 const menuPluginInfo: any = ref({});
 
+const config: any = ref(localConfig.getConfig());
+
 getPluginInfo({
   pluginName: 'feature',
   // eslint-disable-next-line no-undef
@@ -90,7 +94,7 @@ watch(
     window.rubick.setExpendHeight(
       getWindowHeight(
         options.value,
-        pluginLoading.value ? [] : pluginHistory.value
+        (pluginLoading.value || !config.value.perf.common.history) ? [] : pluginHistory.value
       )
     );
   },
@@ -142,6 +146,12 @@ const choosePlugin = (plugin) => {
     const localPlugins = getGlobal('LOCAL_PLUGINS').getLocalPlugins();
     const currentChoose = plugin || pluginHistory.value[currentSelect.value];
     let hasRemove = true;
+    if (currentChoose.pluginType === 'app') {
+      hasRemove = false;
+      changePluginHistory(currentChoose);
+      exec(currentChoose.action);
+      return;
+    }
     localPlugins.find((plugin) => {
       if (plugin.name === currentChoose.originName) {
         hasRemove = false;

src/renderer/components/result.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-show="!currentPlugin.name" class="options">
+  <div v-show="!currentPlugin.name && config.perf.common.history" class="options">
     <div
       class="history-plugins"
       v-if="!options.length || !(searchValue || !!clipboardFile.length)"
@@ -44,12 +44,16 @@
 </template>
 
 <script lang="ts" setup>
-import {defineEmits, defineProps, reactive, toRaw, watch} from 'vue';
+import { defineEmits, defineProps, reactive, ref, toRaw, watch } from 'vue';
+import localConfig from '../confOp';
+
 const path = window.require('path');
 const remote = window.require('@electron/remote');
 
 declare const __static: string;
 
+const config: any = ref(localConfig.getConfig());
+
 const props: any = defineProps({
   searchValue: {
     type: [String, Number],

src/renderer/components/search.vue

@@ -96,6 +96,7 @@ const emit = defineEmits([
 ]);
 
 const keydownEvent = (e, key: string) => {
+  key !== 'space' && e.preventDefault();
   const { ctrlKey, shiftKey, altKey, metaKey } = e;
   const modifiers: Array<string> = [];
   ctrlKey && modifiers.push('control');
@@ -125,6 +126,7 @@ const keydownEvent = (e, key: string) => {
       break;
     case 'space':
       if (runPluginDisable || !config.value.perf.common.space) return;
+      e.preventDefault();
       emit('choosePlugin');
       break;
     default:

src/renderer/plugins-manager/index.ts

@@ -77,6 +77,10 @@ const createPluginManager = (): any => {
   };
 
   const openPlugin = async (plugin, option) => {
+    ipcRenderer.send('msg-trigger', {
+      type: 'removePlugin',
+    });
+    window.initRubick();
     if (plugin.pluginType === 'ui' || plugin.pluginType === 'system') {
       if (state.currentPlugin && state.currentPlugin.name === plugin.name) {
         window.rubick.showMainWindow();
@@ -103,7 +107,6 @@ const createPluginManager = (): any => {
         message.error('启动应用出错，请确保启动应用存在！');
       }
     }
-    window.initRubick();
     changePluginHistory({
       ...plugin,
       ...option,

src/renderer/plugins-manager/options.ts

@@ -8,7 +8,7 @@ import useFocus from './clipboardWatch';
 
 function formatReg(regStr) {
   const flags = regStr.replace(/.*\/([gimy]*)$/, '$1');
-  const pattern = flags.replace(new RegExp('^/(.*?)/' + flags + '$'), '$1');
+  const pattern = regStr.replace(new RegExp('^/(.*?)/' + flags + '$'), '$1');
   return new RegExp(pattern, flags);
 }