Merge pull request #44 from TeamKun/develop

wip: chore: リリース v2.2.3

Author: PeyaPeyaPeyang

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.kunmc.lab</groupId>
     <artifactId>TeamKunPluginManager</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3</version>
     <packaging>jar</packaging>
 
     <name>TeamKunPluginManager</name>

src/main/java/net/kunmc/lab/teamkunpluginmanager/utils/URLUtils.java

@@ -1,13 +1,17 @@
 package net.kunmc.lab.teamkunpluginmanager.utils;
 
 import net.kunmc.lab.teamkunpluginmanager.TeamKunPluginManager;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.NoSuchFileException;
 
 public class URLUtils
 {
@@ -76,13 +80,20 @@ public static Pair<Boolean, String> downloadFile(String url, String fileName)
             duplicateFile = true;
         }
 
+        tryna = 0;
+
+        final int redirectLimit = TeamKunPluginManager.config.getInt("redirectLimit", 15);
+
         try
         {
             URL urlObj = new URL(url);
             HttpURLConnection connection = (HttpURLConnection) urlObj.openConnection();
-            boolean redir = false;
+            boolean redir;
             do
             {
+                if (tryna++ > redirectLimit)
+                    throw new IOException("Too many redirects.");
+
                 connection.setRequestMethod("GET");
                 connection.setInstanceFollowRedirects(false);
                 if (urlObj.getHost().equals("api.github.com"))
@@ -109,7 +120,25 @@ public static Pair<Boolean, String> downloadFile(String url, String fileName)
             }
             while(redir);
 
-            FileUtils.copyInputStreamToFile(connection.getInputStream(), new File("plugins/" + fileName));
+            connection.setRequestMethod("GET");
+            connection.setInstanceFollowRedirects(false);
+            if (urlObj.getHost().equals("api.github.com"))
+                connection.setRequestProperty("Authorization", "token " + TeamKunPluginManager.vault.getToken());
+            connection.setRequestProperty("User-Agent", "Mozilla/8.10; Safari/Chrome/Opera/Edge/KungleBot-Peyang; Mobile-Desktop");
+
+            File file = new File("plugins/" + fileName);
+
+            if (!file.createNewFile())
+                throw new NoSuchFileException("ファイルの作成に失敗しました。");
+
+            try(InputStream is = connection.getInputStream();
+                OutputStream os = new FileOutputStream(file))
+            {
+                IOUtils.copy(is, os);
+            }
+
+
+            //FileUtils.copyInputStreamToFile(connection.getInputStream(), file);
             return new Pair<>(duplicateFile, fileName);
         }
         catch (Exception e)

src/main/java/net/kunmc/lab/teamkunpluginmanager/utils/rdmarker/DevBukkit.java

@@ -15,7 +15,9 @@
 public class DevBukkit
 {
 
-    private static final Pattern PATTERN = Pattern.compile("^/projects/(?<slug>\\w+)(/?$|/files(/(?<id>\\d+)((/files/(?<version>\\d+))?/download)?)?)/?$");
+    private static final String basePatterns = "^/projects/(?<slug>\\w+)(/(files|/screenshots|relations/(dependencies|dependents)|)/?$)?(/?$|/files(/(?<id>\\d+)((/files/(?<version>\\d+))?/download)?)?)/?$";
+    private static final Pattern BUKKIT_PATTERN = Pattern.compile("^/projects/" + basePatterns);
+    private static final Pattern CURSE_PATTERN = Pattern.compile("^/minecraft/bukkit-plugins/" + basePatterns);
 
     public static boolean isMatch(String urlName)
     {
@@ -29,10 +31,12 @@ public static boolean isMatch(String urlName)
             return false;
         }
 
-        if (!url.getHost().equals("dev.bukkit.org"))
+        boolean isBukkit;
+
+        if (!(isBukkit = url.getHost().equals("dev.bukkit.org")) && !url.getHost().equals("curseforge.com"))
             return false;
 
-        Matcher matcher = PATTERN.matcher(url.getPath());
+        Matcher matcher = (isBukkit ? BUKKIT_PATTERN: CURSE_PATTERN).matcher(url.getPath());
 
         while(matcher.find())
             if (matcher.group("slug") != null && !matcher.group("slug").equals(""))
@@ -55,7 +59,7 @@ public static String toDownloadUrl(String urlName)
         if (!url.getHost().equals("dev.bukkit.org"))
             return urlName;
 
-        Matcher matcher = PATTERN.matcher(url.getPath());
+        Matcher matcher = BUKKIT_PATTERN.matcher(url.getPath());
 
         String slug = null;
         String version = null;

src/main/resources/config.yml

@@ -3,10 +3,11 @@ gitHubName: [TeamKUN]
 
 #DBへのパス
 dependPath: "/depend.db"
-
 #名前解決へのパス
 resolvePath: "/resolve.db"
 
+redirectLimit: 15
+
 # エイリアス定義ファイル
 # 形式: JSON
 # 書き方:  { "ExamplePlugin": "https://example.com/download/ExamplePlugin.jar"