🐛 fix #333, fix #327

.github/workflows/main.yml

@@ -46,6 +46,7 @@ jobs:
         run: |
           sudo apt-get install libxtst-dev libpng++-dev
           sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
+          sudo snap install snapcraft --classic
       # step3: yarn
       - name: Yarn install
         run: |

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
-/build
+build/*
+!build/icons
 
 
 # local env files

README.md

@@ -2,7 +2,7 @@ English | [简体中文](./README.zh-CN.md)
 
 
 <div align= "center">
-<img align="center" width=200 src="https://user-images.githubusercontent.com/21073039/128333805-73e086f0-5523-46a3-a096-cba80b904c46.png" />
+<img align="center" width=200 src="./public/logo.png" />
 </div>
 
 

README.zh-CN.md

@@ -2,10 +2,9 @@
 
 
 <div align= "center">
-<img align="center" width=200 src="https://user-images.githubusercontent.com/21073039/128333805-73e086f0-5523-46a3-a096-cba80b904c46.png" />
+<img align="center" width=200 src="./public/logo.png" />
 </div>
 
-
 <div align= "center">
  <h1>Rubick</h1>
 
@@ -14,7 +13,7 @@
     <img alt="release" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" />
  </a>
  <a href="https://github.com/rubickCenter/rubick/actions">
-   <img alt=building src=https://img.shields.io/github/workflow/status/rubickCenter/rubick/Build>
+   <img alt=building src=https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml>
  </a>
  <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE">
     <img alt="npm" src="https://img.shields.io/github/license/rubickCenter/rubick" />

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/public/package.json

@@ -3,7 +3,7 @@
   "pluginName": "系统菜单",
   "description": "系统菜单",
   "main": "index.html",
-  "logo": "https://pic1.zhimg.com/80/v2-c09780808301668a82e6646cb42f0806_720w.png",
+  "logo": "https://pic1.zhimg.com/80/v2-29152fe716010751db835adf591421f8_720w.png",
   "version": "0.0.0",
   "preload":"preload.js",
   "pluginType": "ui",

feature/src/views/settings/index.vue

@@ -283,14 +283,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.1.6",
+  "version": "4.2.1",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {

public/feature/package.json

@@ -3,7 +3,7 @@
   "pluginName": "系统菜单",
   "description": "系统菜单",
   "main": "index.html",
-  "logo": "https://pic1.zhimg.com/80/v2-c09780808301668a82e6646cb42f0806_720w.png",
+  "logo": "https://pic1.zhimg.com/80/v2-29152fe716010751db835adf591421f8_720w.png",
   "version": "0.0.0",
   "preload":"preload.js",
   "pluginType": "ui",

src/common/constans/defaultConfig.ts

@@ -1,5 +1,5 @@
 export default {
-  version: 4,
+  version: 6,
   perf: {
     custom: {
       theme: 'SPRING',

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 { spawn } from 'child_process';
-import plist from "plist";
+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", [
+  const profileInstalledApps = spawn('/usr/sbin/system_profiler', [
-    "-xml",
+    '-xml',
-    "-detailLevel",
+    '-detailLevel',
-    "mini",
+    'mini',
-    "SPApplicationsDataType",
+    '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/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/main/common/tray.ts

@@ -9,7 +9,7 @@ function createTray(window: BrowserWindow): Promise<Tray> {
   return new Promise((resolve) => {
     let icon;
     if (commonConst.macOS()) {
-      icon = './icons/icon@3x.png';
+      icon = './icons/iconTemplate@2x.png';
     } else if (commonConst.windows()) {
       icon =
         parseInt(os.release()) < 10

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';
@@ -142,6 +143,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;

vue.config.js

@@ -33,10 +33,10 @@ module.exports = {
         productName: 'rubick',
         appId: 'com.muwoo.rubick',
         compression: 'maximum',
-        afterPack: './release.js',
+        // afterPack: './release.js',
-        afterAllArtifactBuild: () => {
+        // afterAllArtifactBuild: () => {
-          return ['./build/app.asar.gz'];
+        //   return ['./build/app.asar.gz'];
-        },
+        // },
         directories: {
           output: 'build',
         },