Merge pull request #56 from TeamKun/develop

chore(deps): bump commons-io from 2.9.0 to 2.10.0

Author: PeyaPeyaPeyang

.github/dependabot.yml

@@ -1,4 +1,5 @@
 version: 2
+
 updates:
   - package-ecosystem: maven
     directory: "/"

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.kunmc.lab</groupId>
     <artifactId>TeamKunPluginManager</artifactId>
-    <version>2.5</version>
+    <version>2.6</version>
     <packaging>jar</packaging>
 
     <name>TeamKunPluginManager</name>
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.G00fY2</groupId>

src/main/java/net/kunmc/lab/teamkunpluginmanager/commands/CommandImport.java

@@ -108,7 +108,7 @@ public static void onCommand(CommandSender sender, String[] args)
 
         container.stream().parallel()
                 .forEach(pluginContainer -> {
-                    InstallResult result = Installer.install(null, pluginContainer.downloadUrl, true, true, true);
+                    InstallResult result = Installer.install(null, pluginContainer.downloadUrl, true, true, true, false);
                     add.addAndGet(result.add);
                     remove.addAndGet(result.remove);
                     modify.addAndGet(result.modify);

src/main/java/net/kunmc/lab/teamkunpluginmanager/commands/CommandInstall.java

@@ -44,7 +44,7 @@ public static void onCommand(CommandSender sender, String[] args)
             @Override
             public void run()
             {
-                Installer.install(sender, args[0], false, false, false);
+                Installer.install(sender, args[0], false, false, false, false);
                 TeamKunPluginManager.session.unlock();
             }
         }.runTaskAsynchronously(TeamKunPluginManager.plugin);

src/main/java/net/kunmc/lab/teamkunpluginmanager/plugin/DependencyTree.java

@@ -218,7 +218,6 @@ public static void crawlPlugin(Plugin plugin)
                             throwable.printStackTrace();
                         }
                     });
-
         }
         catch (Exception e)
         {
@@ -252,6 +251,13 @@ public static ArrayList<String> unusedPlugins()
     }
 
     public static boolean isErrors()
+    {
+        if (checkError())
+            DependencyTree.fix();
+        return checkError();
+    }
+
+    private static boolean checkError()
     {
         ArrayList<String> plugin = Arrays.stream(Bukkit.getPluginManager().getPlugins()).parallel().map(Plugin::getName).collect(Collectors.toCollection(ArrayList::new));
 

src/main/java/net/kunmc/lab/teamkunpluginmanager/plugin/Installer.java

@@ -17,7 +17,7 @@ public void onEnable(PluginEnableEvent e)
     {
         if (!TeamKunPluginManager.enableBuildTree)
             return;
-        TeamKunPluginManager.plugin.getLogger().info("依存関係ツリーを構築中...");
+        TeamKunPluginManager.plugin.getLogger().info("依存関係ツリーを構築中(ADD:" + e.getPlugin().getName() + ")...");
         DependencyTree.crawlPlugin(e.getPlugin());
         TeamKunPluginManager.plugin.getLogger().info("依存関係ツリーの構築完了");
     }
@@ -36,11 +36,11 @@ public void run()
                 File f = PluginUtil.getFile(e.getPlugin());
                 if (f == null || !f.exists())
                 {
-                    TeamKunPluginManager.plugin.getLogger().info("依存関係ツリーを構築中...");
+                    TeamKunPluginManager.plugin.getLogger().info("依存関係ツリーを構築中(RMV:" + e.getPlugin().getName() + ")...");
                     DependencyTree.wipePlugin(e.getPlugin());
                     TeamKunPluginManager.plugin.getLogger().info("依存関係ツリーの構築完了");
                 }
             }
-        }.runTaskLater(TeamKunPluginManager.plugin, 15L);
+        }.runTaskLater(TeamKunPluginManager.plugin, 2L);
     }
 }

src/main/java/net/kunmc/lab/teamkunpluginmanager/plugin/PluginEventListener.java

@@ -0,0 +1,53 @@
+package net.kunmc.lab.teamkunpluginmanager.utils;
+
+import javax.xml.bind.DatatypeConverter;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class HashLib
+{
+    public static String genSha1(File file, int length)
+    {
+        String digest;
+        if ((digest = genSha1(file)).length() <= length)
+            return digest;
+        return digest.substring(0, length);
+    }
+
+    public static String genSha1(File file)
+    {
+        if (!file.exists())
+            return "";
+
+
+        try(DigestInputStream di =
+                    new DigestInputStream(
+                            new BufferedInputStream(new FileInputStream(file)),
+                            MessageDigest.getInstance("SHA-1")))
+        {
+            int count = 0;
+            while(di.read() != -1 && count++ < Integer.MAX_VALUE);
+
+            char[] HEX_ARRAY = "0123456789abcdef".toCharArray();
+            byte[] bytes = di.getMessageDigest().digest();
+            char[] hexChars = new char[bytes.length * 2];
+            for (int j = 0; j < bytes.length; j++) {
+                int v = bytes[j] & 0xFF;
+                hexChars[j * 2] = HEX_ARRAY[v >>> 4];
+                hexChars[j * 2 + 1] = HEX_ARRAY[v & 0x0F];
+            }
+
+            return new String(hexChars);
+        }
+        catch (IOException | NoSuchAlgorithmException e)
+        {
+            e.printStackTrace();
+            return "";
+        }
+    }
+}