fix: plugin loader

Author: easepan

src/main/java/org/code4everything/wetool/controller/MainController.java

@@ -171,7 +171,6 @@ public void handleEvent0(String s, Date date) {
         // 监听鼠标位置
         EventCenter.subscribeEvent(EventCenter.EVENT_MOUSE_MOTION, new MouseMotionEventHandler());
         multiDesktopOnWindows();
-        WeUtils.execute(PluginLoader::loadPlugins);
 
         // 注册搜索动作
         registerAction("退出-exit", actionEvent -> WeUtils.exitSystem());
@@ -194,6 +193,8 @@ public void handleEvent0(String s, Date date) {
             String name = StrUtil.removePrefix(a.getSource().toString(), "env").trim();
             FxDialogs.showInformation(StrUtil.format("{} 的环境变量", name), System.getenv(name));
         });
+
+        WeUtils.execute(PluginLoader::loadPlugins);
     }
 
     private void runHutoolCmd(ActionEvent actionEvent) {

src/main/java/org/code4everything/wetool/plugin/PluginLoader.java

@@ -93,7 +93,7 @@ public static void loadPlugins() {
         }
     }
 
-    public static void addPluginForSearch(String prefix, Menu menu) {
+    private static void addPluginForSearch(String prefix, Menu menu) {
         if (Objects.isNull(menu)) {
             menu = FxUtils.getPluginMenu();
         }
@@ -127,11 +127,12 @@ public static void loadPlugins(Collection<File> plugins, final boolean checkDisa
         loadPluginFromPrepared();
     }
 
-    public static void registerPlugin(WePluginInfo info, WePluginSupporter supporter) {
-        registerPlugin(info, supporter, true);
+    public static void loadPluginForTest(WePluginInfo info) {
+        preparePlugin(FileUtil.file(FileUtils.currentWorkDir()), info, true);
+        loadPluginFromPrepared();
     }
 
-    private void preparePlugin(File file, boolean checkDisable) {
+    private static void preparePlugin(File file, boolean checkDisable) {
         if (file.exists() && file.isFile()) {
             // 包装成 JarFile
             try (JarFile jar = new JarFile(file)) {
@@ -145,35 +146,38 @@ private void preparePlugin(File file, boolean checkDisable) {
                 String json = IoUtil.read(jar.getInputStream(entry), "utf-8");
                 WePluginInfo info = JSON.parseObject(json, WePluginInfo.class);
                 BeanFactory.get(WePluginConfig.class).putInitBootIfNotExists(info, false);
-
-                if (checkDisable && isDisabled(info)) {
-                    // 插件被禁止加载
-                    log.info("plugin {}-{}-{} disabled", info.getAuthor(), info.getName(), info.getVersion());
-                    return;
-                }
-                // 兼容性检测
-                if (isIncompatible(info)) {
-                    return;
-                }
-                WePlugin plugin = new WePlugin(info, file);
-                // 检测插件是否已经加载
-                if (LOADED_PLUGINS.contains(plugin)) {
-                    // 插件已被加载
-                    log.info("plugin {}-{} already loaded", info.getAuthor(), info.getName());
-                    return;
-                }
-                if (info.getIsolated()) {
-                    // 隔离的插件使用单独的类加载器
-                    plugin.setLoaderName(info.getName());
-                }
-                replaceIfNewer(plugin);
+                preparePlugin(file, info, checkDisable);
             } catch (Exception e) {
                 FxDialogs.showException("plugin file load failed: " + file.getName(), e);
             }
         }
     }
 
-    private static boolean registerPlugin(WePluginInfo info, WePluginSupporter supporter, boolean checkCompatible) {
+    private static void preparePlugin(File jarFile, WePluginInfo info, boolean checkDisable) {
+        if (checkDisable && isDisabled(info)) {
+            // 插件被禁止加载
+            log.info("plugin {}-{}-{} disabled", info.getAuthor(), info.getName(), info.getVersion());
+            return;
+        }
+        // 兼容性检测
+        if (isIncompatible(info)) {
+            return;
+        }
+        WePlugin plugin = new WePlugin(info, jarFile);
+        // 检测插件是否已经加载
+        if (LOADED_PLUGINS.contains(plugin)) {
+            // 插件已被加载
+            log.info("plugin {}-{} already loaded", info.getAuthor(), info.getName());
+            return;
+        }
+        if (info.getIsolated()) {
+            // 隔离的插件使用单独的类加载器
+            plugin.setLoaderName(info.getName());
+        }
+        replaceIfNewer(plugin);
+    }
+
+    private static boolean registerPlugin(WePluginInfo info, WePluginSupporter supporter) {
         OsInfo osInfo = SystemUtil.getOsInfo();
 
         // @formatter:off
@@ -185,9 +189,6 @@ private static boolean registerPlugin(WePluginInfo info, WePluginSupporter suppo
             log.info("plugin {}-{}-{} not support this os", info.getAuthor(), info.getName(), info.getVersion());
             return false;
         }
-        if (checkCompatible && isIncompatible(info)) {
-            return false;
-        }
         // 初始化
         if (!supporter.initialize()) {
             log.info("plugin {}-{}-{} initialize failed", info.getAuthor(), info.getName(), info.getVersion());
@@ -261,7 +262,7 @@ private static void loadPluginFromPrepared() {
                 Class<?> clazz = plugin.getClassLoader().loadClass(plugin.getPluginInfo().getSupportedClass());
                 WePluginSupporter supporter = (WePluginSupporter) ReflectUtil.newInstance(clazz);
                 // 添加插件菜单
-                if (registerPlugin(plugin.getPluginInfo(), supporter, false)) {
+                if (registerPlugin(plugin.getPluginInfo(), supporter)) {
                     LOADED_PLUGINS.add(plugin);
                 }
             } catch (Exception e) {