插件加载初始化bug修改

zhang-pc · Mar 28, 2018 · c7f61e4 · c7f61e4
1 parent ce4dad9
commit c7f61e4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 99 deletions.
diff --git a/common/src/main/java/lee/study/down/io/LargeMappedByteBuffer.java b/common/src/main/java/lee/study/down/io/LargeMappedByteBuffer.java
diff --git a/sniff/src/main/java/lee/study/down/plug/PluginContent.java b/sniff/src/main/java/lee/study/down/plug/PluginContent.java
@@ -13,6 +13,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import lee.study.down.model.PluginBean;
+import lee.study.down.util.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,7 +52,9 @@ public static void init() {
   }
 
   public static void set(String key, PluginBean value) {
-    content.put(key, value);
+    if (value != null) {
+      content.put(key, value);
+    }
   }
 
   public static PluginBean get(String key) {

diff --git a/sniff/src/main/java/lee/study/down/plug/PluginUtil.java b/sniff/src/main/java/lee/study/down/plug/PluginUtil.java
@@ -13,12 +13,11 @@
 
 public class PluginUtil {
 
-  private static final String PLUG_PATH = PathUtil.ROOT_PATH + "plugs";
+  public static final String PLUG_PATH = PathUtil.ROOT_PATH + "plugs";
 
-  public static PluginBean getPluginBean(String key, InputStream inputStream, float currentVersion)
+  public static PluginBean getPluginBean(InputStream inputStream)
       throws IOException {
     PluginBean pluginBean = new PluginBean();
-    FileOutputStream outputStream = null;
     try (
         BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"))
     ) {
@@ -29,34 +28,17 @@ public static PluginBean getPluginBean(String key, InputStream inputStream, floa
         if (num == 1) {
           //版本号
           float newVersion = Float.parseFloat(line.substring(2));
-          if (newVersion > currentVersion) {
-            pluginBean.setVersion(newVersion);
-            String localFile = PLUG_PATH + File.separator + key;
-            FileUtil.createFileSmart(localFile);
-            outputStream = new FileOutputStream(localFile);
-          } else {
-            return null;
-          }
+          pluginBean.setVersion(newVersion);
           num++;
         }
         String temp = line + "\r\n";
         sb.append(temp);
-        outputStream.write(temp.getBytes("UTF-8"));
       }
       pluginBean.setContent(sb.toString());
-    } finally {
-      if (outputStream != null) {
-        outputStream.close();
-      }
     }
     return pluginBean;
   }
 
-  private static PluginBean getPluginBean(InputStream inputStream)
-      throws IOException {
-    return getPluginBean(null, inputStream, -1F);
-  }
-
   public static PluginBean checkAndUpdateLocalPlugin(String key, InputStream inputStream)
       throws IOException {
     String localFile = PLUG_PATH + File.separator + key;
@@ -80,16 +62,24 @@ public static PluginBean checkAndUpdateLocalPlugin(String key, InputStream input
       float targetVersion = Float.parseFloat(str.substring(2));
       //plug需要更新
       if (targetVersion > localVersion) {
-        FileUtil.createFileSmart(localFile);
+        if (!FileUtil.exists(PLUG_PATH)) {
+          FileUtil.createDirSmart(PLUG_PATH);
+        }
+        if (FileUtil.exists(localFile)) {
+          new File(localFile).delete();
+        }
+        new File(localFile).createNewFile();
         try (
-            FileOutputStream outputStream = new FileOutputStream(localFile);
+            FileOutputStream outputStream = new FileOutputStream(localFile)
         ) {
           outputStream.write((str + "\r\n").getBytes("UTF-8"));
           String line;
           while ((line = reader.readLine()) != null) {
             outputStream.write((line + "\r\n").getBytes("UTF-8"));
           }
         }
+      } else {
+        return null;
       }
     }
     return getPluginBean(new FileInputStream(localFile));

diff --git a/ui/src/main/java/lee/study/down/task/PluginUpdateCheckTask.java b/ui/src/main/java/lee/study/down/task/PluginUpdateCheckTask.java
@@ -28,7 +28,7 @@ public void run() {
         URL url = new URL(HOST + name);
         URLConnection connection = url.openConnection();
         PluginBean pluginBean = PluginUtil
-            .getPluginBean(name, connection.getInputStream(), PluginContent.get(name).getVersion());
+            .checkAndUpdateLocalPlugin(name, connection.getInputStream());
         if (pluginBean != null) {
           PluginContent.set(name, pluginBean);
         }