1.添加下载插件时删除老版插件包方法;2.优化插件信息记录方式

Author: xwintop

src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java

@@ -169,15 +169,8 @@ private void addMenu(PluginJarInfo jarInfo) {
             moreToolsMenu.getItems().add(menu);
         }
         MenuItem menuItem = new MenuItem(jarInfo.getTitle());
-        if (jarInfo.getIconImage() == null) {
-            if (StringUtils.isNotEmpty(jarInfo.getIconPath())) {
-                ImageView imageView = new ImageView(new Image(jarInfo.getIconPath()));
-                imageView.setFitHeight(18);
-                imageView.setFitWidth(18);
-                menuItem.setGraphic(imageView);
-            }
-        } else {
-            ImageView imageView = new ImageView(jarInfo.getIconImage());
+        if (jarInfo.getIconImage() != null || StringUtils.isNotEmpty(jarInfo.getIconPath())) {
+            ImageView imageView = new ImageView(jarInfo.getIconImage() == null ? new Image(jarInfo.getIconPath()) : jarInfo.getIconImage());
             imageView.setFitHeight(18);
             imageView.setFitWidth(18);
             menuItem.setGraphic(imageView);

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

@@ -21,11 +21,11 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.*;
 import javafx.stage.FileChooser.ExtensionFilter;
-import javafx.stage.Window;
 import javafx.util.Callback;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -63,10 +63,6 @@ public void initialize(URL location, ResourceBundle resources) {
         initService();
     }
 
-    public Window getWindow() {
-        return this.pluginDataTableView.getScene().getWindow();
-    }
-
     private void initView() {
         addLocalPluginButton.setVisible(Boolean.parseBoolean(System.getProperty("localPluginEnabled", "false")));
 
@@ -95,7 +91,7 @@ protected void updateItem(String item, boolean empty) {
                                     downloadButton.setDisable(true);
                                 }
                                 this.setContentDisplay(ContentDisplay.CENTER);
-                                downloadButton.setOnMouseClicked(event -> downloadPlugin(dataRow, downloadButton));
+                                downloadButton.setOnMouseClicked(event -> downloadPlugin(dataRow));
                                 this.setGraphic(downloadButton);
                             }
                         }
@@ -106,36 +102,37 @@ protected void updateItem(String item, boolean empty) {
         pluginDataTableView.setItems(pluginDataTableData);
     }
 
-    private void downloadPlugin(Map<String, String> dataRow, Button downloadButton) {
+    private void downloadPlugin(Map<String, String> dataRow) {
         try {
             pluginManageService.downloadPluginJar(dataRow, pluginJarInfo ->
-                Platform.runLater(() -> afterDownload(dataRow, downloadButton, pluginJarInfo))
+                Platform.runLater(() -> afterDownload(dataRow, pluginJarInfo))
             );
         } catch (Exception e) {
             log.error("下载插件失败：", e);
             TooltipUtil.showToast("下载插件失败：" + e.getMessage());
         }
     }
 
-    private void afterDownload(Map<String, String> dataRow, Button downloadButton, PluginJarInfo pluginJarInfo) {
+    private void afterDownload(Map<String, String> dataRow, PluginJarInfo pluginJarInfo) {
         // 没有下载成功不做处理
         if (pluginJarInfo.getIsDownload() == null || !pluginJarInfo.getIsDownload()) {
             return;
         }
-
         try {
+            PluginJarInfo pluginJarInfoOld = PluginManager.getInstance().getPlugin(pluginJarInfo.getJarName());
+            if (pluginJarInfoOld != null) {
+                FileUtils.delete(pluginJarInfoOld.getFile());
+            }
+            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);
 
             dataRow.put("isEnableTableColumn", "true");
             dataRow.put("isDownloadTableColumn", "已下载");
 
-            downloadButton.setText("已下载");
-            downloadButton.setDisable(true);
-
             pluginDataTableView.refresh();
             AppEvents.fire(new PluginEvent(PluginEvent.PLUGIN_DOWNLOADED, pluginJarInfo));
         } catch (IOException e) {
@@ -147,15 +144,15 @@ private void afterDownload(Map<String, String> dataRow, Button downloadButton, P
     private void initEvent() {
         // 右键菜单
         ContextMenu contextMenu = new ContextMenu();
-        JavaFxViewUtil.addMenuItem(contextMenu,"保存配置", actionEvent -> {
+        JavaFxViewUtil.addMenuItem(contextMenu, "保存配置", actionEvent -> {
             try {
                 PluginManager.getInstance().saveToFile();
                 TooltipUtil.showToast("保存配置成功");
             } catch (Exception ex) {
                 log.error("保存插件配置失败", ex);
             }
         });
-        JavaFxViewUtil.addMenuItem(contextMenu,"删除插件", actionEvent -> {
+        JavaFxViewUtil.addMenuItem(contextMenu, "删除插件", actionEvent -> {
             pluginManageService.deletePlugin();
         });
         pluginDataTableView.setContextMenu(contextMenu);