From c7eb2660025392d47ef7ac4c2a65e9376b74a871 Mon Sep 17 00:00:00 2001
From: muwoo <2424880409@qq.com>
Date: Sat, 16 Sep 2023 10:16:22 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=94=AF=E6=8C=81=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E8=AE=B0=E5=BF=86#216=EF=BC=9B=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=90=AF=E5=8A=A8=EF=BC=9B=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/src/views/settings/local-start.vue | 50 +++++++++++++++++++---
 src/main/common/api.ts                     |  7 ++-
 src/main/common/getWinPosition.ts          | 34 +++++++++++++++
 src/main/common/registerHotKey.ts          | 16 +------
 src/renderer/plugins-manager/index.ts      |  7 ++-
 5 files changed, 92 insertions(+), 22 deletions(-)
 create mode 100644 src/main/common/getWinPosition.ts

diff --git a/feature/src/views/settings/local-start.vue b/feature/src/views/settings/local-start.vue
index 382d584..0821872 100644
--- a/feature/src/views/settings/local-start.vue
+++ b/feature/src/views/settings/local-start.vue
@@ -9,7 +9,10 @@
           </template>
           <a-list-item-meta :description="item.desc">
             <template #title>
-              <div>{{item.name}}</div>
+              <div>
+                <span :class="item.del ? 'del-title' : ''">{{item.name}}</span>
+                <span v-if="item.del" class="has-del">文件不存在</span>
+              </div>
             </template>
             <template #avatar>
               <a-avatar shape="square" :src="item.icon" />
@@ -23,19 +26,39 @@
 
 <script setup>
 import { ref } from 'vue';
+const fs = window.require('fs');
+
 const dbId = 'rubick-local-start-app';
 
 const localStartList = ref(window.rubick.dbStorage.getItem(dbId) || []);
 
+const checkFileExists = () => {
+  localStartList.value = localStartList.value.map((plugin) => {
+    if (!fs.existsSync(plugin.desc)) {
+      return {
+        ...plugin,
+        del: true,
+      };
+    }
+    return plugin;
+  });
+};
+
+checkFileExists();
+
 const dropFile = (e) => {
   const files = Array.from(e.dataTransfer.files).map((file) => {
+    const action =
+      process.platform === 'win32'
+        ? `start "dummyclient" "${file.path}"`
+        : `open ${file.path.replace(/ /g, '\\ ')}`;
     const plugin = {
       icon: window.rubick.getFileIcon(file.path),
       value: 'plugin',
       desc: file.path,
       pluginType: 'app',
       name: file.name,
-      action: `open ${file.path.replace(/ /g, '\\ ')}`,
+      action,
       keyWords: [file.name],
       names: [file.name],
     };
@@ -46,12 +69,20 @@ const dropFile = (e) => {
     ...localStartList.value,
     ...files,
   ];
-  window.rubick.dbStorage.setItem(dbId, JSON.parse(JSON.stringify(localStartList.value)));
+  window.rubick.dbStorage.setItem(
+    dbId,
+    JSON.parse(JSON.stringify(localStartList.value))
+  );
 };
 
 const remove = (item) => {
-  localStartList.value = localStartList.value.filter(app => app.desc !== item.desc);
-  window.rubick.dbStorage.setItem(dbId, JSON.parse(JSON.stringify(localStartList.value)));
+  localStartList.value = localStartList.value.filter(
+    (app) => app.desc !== item.desc
+  );
+  window.rubick.dbStorage.setItem(
+    dbId,
+    JSON.parse(JSON.stringify(localStartList.value))
+  );
   window.market.removeLocalStartPlugin(JSON.parse(JSON.stringify(item)));
 };
 
@@ -67,5 +98,14 @@ const checkDrop = (e) => {
   overflow-x: hidden;
   background: var(--color-body-bg);
   height: calc(~'100vh - 106px');
+  .del-title {
+    text-decoration-line: line-through;
+    text-decoration-color: var(--ant-error-color);
+  }
+  .has-del {
+    color: var(--ant-error-color);
+    font-size: 12px;
+    margin-left: 6px;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/main/common/api.ts b/src/main/common/api.ts
index 6b49e84..0df7484 100644
--- a/src/main/common/api.ts
+++ b/src/main/common/api.ts
@@ -9,8 +9,6 @@ import {
   screen,
   shell,
 } from 'electron';
-import { runner, detach } from '../browsers';
-import DBInstance from './db';
 import fs from 'fs';
 import { screenCapture } from '@/core';
 import plist from 'plist';
@@ -20,6 +18,10 @@ import { DECODE_KEY } from '@/common/constans/main';
 import getCopyFiles from '@/common/utils/getCopyFiles';
 
 import mainInstance from '../index';
+import { runner, detach } from '../browsers';
+import DBInstance from './db';
+import getWinPosition from './getWinPosition';
+
 const runnerInstance = runner();
 const detachInstance = detach();
 
@@ -65,6 +67,7 @@ class API extends DBInstance {
     const originWindow = this.getCurrentWindow(window, e);
     if (!originWindow) return;
     originWindow.setBounds({ x: x - mouseX, y: y - mouseY, width, height });
+    getWinPosition.setPosition(x - mouseX, y - mouseY);
   }
 
   public loadPlugin({ data: plugin }, window) {
diff --git a/src/main/common/getWinPosition.ts b/src/main/common/getWinPosition.ts
new file mode 100644
index 0000000..0cd6d11
--- /dev/null
+++ b/src/main/common/getWinPosition.ts
@@ -0,0 +1,34 @@
+import { screen } from 'electron';
+
+const winPosition = {
+  x: 0,
+  y: 0,
+  id: -1,
+  getPosition(): { x: number; y: number } {
+    const { x, y } = screen.getCursorScreenPoint();
+    const currentDisplay = screen.getDisplayNearestPoint({ x, y });
+    if (winPosition.id !== currentDisplay.id) {
+      winPosition.id = currentDisplay.id;
+      winPosition.x = parseInt(
+        String(
+          currentDisplay.workArea.x + currentDisplay.workArea.width / 2 - 400
+        )
+      );
+      winPosition.y = parseInt(
+        String(
+          currentDisplay.workArea.y + currentDisplay.workArea.height / 2 - 200
+        )
+      );
+    }
+    return {
+      x: winPosition.x,
+      y: winPosition.y,
+    };
+  },
+  setPosition(x: number, y: number): void {
+    winPosition.x = x;
+    winPosition.y = y;
+  },
+};
+
+export default winPosition;
diff --git a/src/main/common/registerHotKey.ts b/src/main/common/registerHotKey.ts
index 4c4968d..1aa841e 100644
--- a/src/main/common/registerHotKey.ts
+++ b/src/main/common/registerHotKey.ts
@@ -10,6 +10,7 @@ import {
 } from 'electron';
 import screenCapture from '@/core/screen-capture';
 import localConfig from '@/main/common/initLocalConfig';
+import winPosition from './getWinPosition';
 
 const registerHotKey = (mainWindow: BrowserWindow): void => {
   // 设置开机启动
@@ -56,20 +57,7 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
     globalShortcut.register(config.perf.shortCut.showAndHidden, () => {
       const currentShow = mainWindow.isVisible() && mainWindow.isFocused();
       if (currentShow) return mainWindow.hide();
-
-      const { x, y } = screen.getCursorScreenPoint();
-      const currentDisplay = screen.getDisplayNearestPoint({ x, y });
-      const wx = parseInt(
-        String(
-          currentDisplay.workArea.x + currentDisplay.workArea.width / 2 - 400
-        )
-      );
-      const wy = parseInt(
-        String(
-          currentDisplay.workArea.y + currentDisplay.workArea.height / 2 - 200
-        )
-      );
-
+      const { x: wx, y: wy } = winPosition.getPosition();
       mainWindow.setAlwaysOnTop(false);
       mainWindow.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
       mainWindow.focus();
diff --git a/src/renderer/plugins-manager/index.ts b/src/renderer/plugins-manager/index.ts
index fc2598a..3748af2 100644
--- a/src/renderer/plugins-manager/index.ts
+++ b/src/renderer/plugins-manager/index.ts
@@ -9,6 +9,7 @@ import { execSync } from 'child_process';
 import searchManager from './search';
 import optionsManager from './options';
 import { PLUGIN_INSTALL_DIR as baseDir } from '@/common/constans/renderer';
+import { message } from 'ant-design-vue';
 
 const createPluginManager = (): any => {
   const pluginInstance = new PluginHandler({
@@ -87,7 +88,11 @@ const createPluginManager = (): any => {
       });
     }
     if (plugin.pluginType === 'app') {
-      execSync(plugin.action);
+      try {
+        execSync(plugin.action);
+      } catch (e) {
+        message.error('启动应用出错，请确保启动应用存在！');
+      }
     }
     window.initRubick();
     changePluginHistory({