1.优化初始化加载插件信息

Author: xwintop

.gitignore

@@ -6,6 +6,7 @@
 logs/
 target/
 libs/
+devLibs
 
 system_plugin_list.json
 RUNNING_PID

src/main/java/com/xwintop/xJavaFxTool/controller/index/PluginManageController.java

@@ -4,7 +4,6 @@
 import com.xwintop.xJavaFxTool.event.AppEvents;
 import com.xwintop.xJavaFxTool.event.PluginEvent;
 import com.xwintop.xJavaFxTool.model.PluginJarInfo;
-import com.xwintop.xJavaFxTool.plugin.PluginClassLoader;
 import com.xwintop.xJavaFxTool.plugin.PluginManager;
 import com.xwintop.xJavaFxTool.plugin.PluginParser;
 import com.xwintop.xJavaFxTool.services.index.PluginManageService;
@@ -60,8 +59,6 @@ public void initialize(URL location, ResourceBundle resources) {
     }
 
     private void initView() {
-        addLocalPluginButton.setVisible(Boolean.parseBoolean(System.getProperty("localPluginEnabled", "false")));
-
         JavaFxViewUtil.setTableColumnMapValueFactory(nameTableColumn, "nameTableColumn");
         JavaFxViewUtil.setTableColumnMapValueFactory(synopsisTableColumn, "synopsisTableColumn");
         JavaFxViewUtil.setTableColumnMapValueFactory(versionTableColumn, "versionTableColumn");
@@ -121,14 +118,11 @@ private void afterDownload(Map<String, String> dataRow, PluginJarInfo pluginJarI
             }
             PluginManager.getInstance().getPluginList().remove(pluginJarInfoOld);
             PluginManager.getInstance().getPluginList().add(pluginJarInfo);
-            PluginManager.getInstance().saveToFile();
             TooltipUtil.showToast("插件 " + dataRow.get("nameTableColumn") + " 下载完成");
-            PluginClassLoader tempClassLoader = PluginClassLoader.create(pluginJarInfo.getFile());
-            PluginParser.parse(pluginJarInfo.getFile(), pluginJarInfo, tempClassLoader);
-
+            PluginParser.parse(pluginJarInfo.getFile(), pluginJarInfo);
+            PluginManager.getInstance().saveToFile();
             dataRow.put("isEnableTableColumn", "true");
             dataRow.put("isDownloadTableColumn", "已下载");
-
             pluginDataTableView.refresh();
             AppEvents.fire(new PluginEvent(PluginEvent.PLUGIN_DOWNLOADED, pluginJarInfo));
         } catch (IOException e) {
@@ -163,15 +157,4 @@ private void initService() {
     public void searchPlugin() {
         pluginManageService.searchPlugin(selectPluginTextField.getText());
     }
-
-    public void addLocalPlugin() {
-//        File jarFile = FileChooserUtil.chooseFile(new ExtensionFilter("打包插件(*.jar)", "*.jar"));
-//        if (jarFile != null) {
-//            AddPluginResult result = PluginManager.getInstance().addPluginJar(jarFile);
-//            if (result.isNewPlugin()) {
-//                pluginManageService.addDataRow(result.getPluginJarInfo());
-//            }
-//            AppEvents.fire(new PluginEvent(PluginEvent.PLUGIN_DOWNLOADED, result.getPluginJarInfo()));
-//        }
-    }
 }

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginManager.java

@@ -100,7 +100,7 @@ public void loadLocalPlugins() {
             File pluginFile = plugin.getFile();
             if (pluginFile.exists()) {
                 try {
-                    PluginParser.parse(pluginFile, plugin);
+                    PluginParser.initParse(pluginFile, plugin);
                 } catch (Exception e) {
                     log.error("解析失败", e);
                 }

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginParser.java

@@ -90,6 +90,27 @@ public static void parse(File pluginFile, PluginJarInfo pluginJarInfo, ClassLoad
         }
     }
 
+    //简单解析插件信息
+    public static void initParse(File pluginFile, PluginJarInfo pluginJarInfo) {
+        try (JarFile jarFile = new JarFile(pluginFile)) {
+            JarEntry entry = jarFile.getJarEntry(ENTRY_NAME);
+            if (entry == null) {
+                return;
+            }
+            Element root = createRootElement(jarFile, entry);
+            Element pluginElement = selectSingleElement(root, "/root/ToolFxmlLoaderConfiguration[not(@isMenu)]");
+            String title = getTitleFromResourceBundle(pluginFile, null, pluginElement, pluginJarInfo.getBundleName());
+            pluginJarInfo.setTitle(title);
+            if (StringUtils.isNotBlank(pluginJarInfo.getIconPath())) {
+                Image iconImage = new Image(jarFile.getInputStream(jarFile.getJarEntry(StringUtils.removeStart(pluginJarInfo.getIconPath(),"/"))));
+                pluginJarInfo.setIconImage(iconImage);
+            }
+            pluginJarInfo.setName(StringUtils.defaultString(pluginJarInfo.getName(), title));
+        } catch (IOException | DocumentException e) {
+            throw new AppException(e);
+        }
+    }
+
     private static String getTitleFromResourceBundle(File pluginFile, ClassLoader classLoader, Element pluginElement, String bundleName) {
         String titleResourceBundleKey = getChildNodeText(pluginElement, "title");
         ClassLoader tmpClassLoader = classLoader == null ? PluginClassLoader.create(pluginFile) : classLoader;

src/main/java/com/xwintop/xJavaFxTool/services/index/PluginManageService.java

@@ -149,19 +149,6 @@ private boolean isPluginDataMatch(Map<String, String> map, String keyword) {
         );
     }
 
-    /**
-     * 判断插件是否启用
-     */
-    public static boolean isPluginEnabled(String fileName) {
-        String jarName = StringUtils.substringBeforeLast(fileName, "-");
-        PluginJarInfo pluginJarInfo = PluginManager.getInstance().getPlugin(jarName);
-        if (pluginJarInfo == null) {
-            return false;
-        }
-        Boolean isEnable = pluginJarInfo.getIsEnable();
-        return isEnable != null && isEnable;
-    }
-
     public void loadServerPlugins() {
         try {
             String json = HttpUtil.get(SERVER_PLUGINS_URL);

src/main/java/com/xwintop/xJavaFxTool/view/index/PluginManageView.java

@@ -27,9 +27,6 @@ public abstract class PluginManageView implements Initializable {
     @FXML
     protected Button selectPluginButton;
 
-    @FXML
-    protected Button addLocalPluginButton;
-
     @FXML
     protected TableView<Map<String, String>> pluginDataTableView;
 

src/main/resources/com/xwintop/xJavaFxTool/fxmlView/index/PluginManage.fxml

@@ -16,7 +16,6 @@
         <Label text="插件名：" />
         <TextField fx:id="selectPluginTextField" promptText="输入插件相关内容" />
         <Button fx:id="selectPluginButton" onAction="#searchPlugin" text="查找" />
-        <Button fx:id="addLocalPluginButton" onAction="#addLocalPlugin" text="打开本地插件..." />
         <padding>
           <Insets bottom="10.0" />
         </padding>