From 57504ab1ebc3803b75c9661c22ef138adbdf8b4e Mon Sep 17 00:00:00 2001
From: muwoo <2424880409@qq.com>
Date: Tue, 31 Aug 2021 20:53:20 +0800
Subject: [PATCH] bugfix: #32,#31

---
 src/main/common/listener.js        |  1 +
 src/renderer/App.vue               | 15 ++++++++++++++-
 src/renderer/store/modules/main.js |  6 +++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/common/listener.js b/src/main/common/listener.js
index d6aada4..d10485e 100644
--- a/src/main/common/listener.js
+++ b/src/main/common/listener.js
@@ -194,6 +194,7 @@ class Listener {
   }
 
   initTouchBar(mainWindow) {
+    if (!commonConst.macOS()) return;
     const { TouchBarButton, TouchBarGroup, TouchBarPopover } = TouchBar;
     let items = [];
     let system = [];
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 4d8fc88..f1d99de 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -22,6 +22,7 @@
         "
           class="main-input"
           @change="(e) => search({ value: e.target.value })"
+          @keydown.ctrl.86="shouldPaste"
           :value="searchValue"
           :maxLength="selected && selected.key !== 'plugin-container' ? 0 : 1000"
           @keydown.down="(e) => changeCurrent(1)"
@@ -113,7 +114,7 @@
 </template>
 <script>
 import { mapActions, mapMutations, mapState } from "vuex";
-import { ipcRenderer, remote } from "electron";
+import { ipcRenderer, remote, clipboard } from "electron";
 import {
   getWindowHeight,
   debounce,
@@ -208,6 +209,18 @@ export default {
   methods: {
     ...mapActions("main", ["onSearch", "showMainUI", "openPlugin"]),
     ...mapMutations("main", ["commonUpdate"]),
+    shouldPaste(e) {
+      let filePath = '';
+      if (process.platform === 'win32') {
+        const rawFilePath = clipboard.read('FileNameW');
+        filePath = rawFilePath.replace(new RegExp(String.fromCharCode(0), 'g'), '');      } else {
+        if (filePath.indexOf('plugin.json') >= 0) {
+          this.search({
+            filePath,
+          });
+        }
+      }
+    },
     search(v) {
       if (!this.searchFn) {
         this.searchFn = debounce(this.onSearch, 200);
diff --git a/src/renderer/store/modules/main.js b/src/renderer/store/modules/main.js
index c55eb81..7e78338 100644
--- a/src/renderer/store/modules/main.js
+++ b/src/renderer/store/modules/main.js
@@ -107,10 +107,10 @@ const actions = {
       commit('commonUpdate', { searchValue: value });
       return;
     }
-    const fileUrl = clipboard.read('public.file-url').replace('file://', '');
+    const fileUrl = paylpad.filePath || clipboard.read('public.file-url').replace('file://', '');
     commit('commonUpdate', { searchValue: value });
     // 复制文件
-    if (fileUrl && value === 'plugin.json') {
+    if (paylpad.filePath || (fileUrl && value === 'plugin.json')) {
       const config = JSON.parse(fs.readFileSync(fileUrl, 'utf-8'));
 
       const pluginConfig = {
@@ -132,7 +132,6 @@ const actions = {
           name: 'plugin.json'
         },
         searchValue: '',
-        devPlugins: [pluginConfig, ...state.devPlugins],
         options: [
           {
             name: '新建rubick开发插件',
@@ -142,6 +141,7 @@ const actions = {
             click: (router) => {
               commit('commonUpdate', {
                 showMain: true,
+                devPlugins: [pluginConfig, ...state.devPlugins],
                 selected: {
                   key: 'plugin',
                   name: '新建rubick开发插件'