Merge pull request #50 from TeamKun/develop

🔖chore: v2.3

Author: PeyaPeyaPeyang

pom.xml

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

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

@@ -15,7 +15,7 @@ public class GitHubURLBuilder
 {
     private static final String GITHUB_REPO_RELEASES_URL = "https://api.github.com/repos/%s/releases";
     private static final String GITHUB_REPO_RELEASE_NAME_URL = GITHUB_REPO_RELEASES_URL + "/tags/%s";
-    private static final Pattern GITHUB_REPO_PATTERN = Pattern.compile("^/(?<repo>[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9])){0,38}/[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9])){0,100})(/?|(?:/(?:releases/?|tag/?)(?:(?<tagNameNF>[.a-zA-Z0-9\\-+]+)|(?:download/(?<tagName>[.a-zA-Z0-9\\-+]+)/(?<file>[^/]+?\\.jar)))?)?)$");
+    private static final Pattern GITHUB_REPO_PATTERN = Pattern.compile("^/(?<repo>[a-zA-Z\\d](?:[a-zA-Z\\d]|-(?=[a-zA-Z\\d])){0,38}/[a-zA-Z\\d](?:[a-zA-Z\\d]|-(?=[a-zA-Z\\d])){0,100})(?:/?$|/(?:tag|release)s(?:/?$|/(?:tag/(?<tag>[^/]+)/?$|download/(?<dlTag>[^/]+)/(?<fileName>[^/]+))))/?$");
 
     /**
      * GitHubのリリースへのAPIのURlをビルドします。
@@ -45,7 +45,7 @@ private static Pair<String, String> buildAPIUrl(String repository, @Nullable Str
      * @param urlName 適当なURL
      * @return GitHubのURl
      */
-    public static String urlValidate(String urlName)
+    public static String urlValidate(String urlName, String version)
     {
         URL url;
         try
@@ -68,9 +68,9 @@ public static String urlValidate(String urlName)
         while (matcher.find())
         {
             String repository = matcher.group("repo");
-            String tag = matcher.group("tagName");
-            String tagNF = matcher.group("tagNameNF");
-            String file = matcher.group("file");
+            String tag = matcher.group("dlTag");
+            String tagNF = matcher.group("tag");
+            String file = matcher.group("fileName");
 
             if (file != null && !file.equals(""))
                 return urlName;
@@ -84,6 +84,9 @@ else if (tagNF != null && !tagNF.equals(""))
                 tagName = tagNF;
         }
 
+        if (tagName == null && version != null)
+            tagName = version;
+
         Pair<String, String> urlPair = buildAPIUrl(repoName, tagName);
 
         switch (urlPair.getKey())

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

@@ -20,27 +20,32 @@ public class PluginResolver
      */
     public static String asUrl(String query)
     {
+        String[] q = StringUtils.split(query, "@");
+
+        String s = q[0];
+        String ver = q.length > 1 ? q[1]: null;
+
         if (UrlValidator.getInstance().isValid(query))
         {
             if (DevBukkit.isMatch(query))
                 return DevBukkit.toDownloadUrl(query);
             else if (Spigotmc.isMatch(query))
                 return Spigotmc.toDownloadUrl(query);
-            return GitHubURLBuilder.urlValidate(query);
+            return GitHubURLBuilder.urlValidate(s, ver);
         }
 
         if (KnownPlugins.isKnown(query))
             return PluginResolver.asUrl(KnownPlugins.getKnown(query).url);
-        else if (StringUtils.split("/", query).length == 2)
-            return GitHubURLBuilder.urlValidate("https://github.com/" + query);
+        else if (StringUtils.split(query, "/").length == 2)
+            return GitHubURLBuilder.urlValidate("https://github.com/" + s, ver);
 
         //configのorgを順番にfetch
 
         Object obj = TeamKunPluginManager.plugin.getConfig().get("gitHubName");
 
         if (obj instanceof String)
-            if (GitHubURLBuilder.isRepoExists(obj + "/" + query))
-                return GitHubURLBuilder.urlValidate("https://github.com/" + obj + "/" + query);
+            if (GitHubURLBuilder.isRepoExists(obj + "/" + s))
+                return GitHubURLBuilder.urlValidate("https://github.com/" + obj + "/" + s, ver);
             else
                 return "ERROR " + query + "が見つかりませんでした。";
 
@@ -51,7 +56,7 @@ else if (StringUtils.split("/", query).length == 2)
         for (String str : TeamKunPluginManager.config.getStringList("gitHubName"))
         {
             if (GitHubURLBuilder.isRepoExists(str + "/" + query))
-                return GitHubURLBuilder.urlValidate("https://github.com/" + str + "/" + query);
+                return GitHubURLBuilder.urlValidate("https://github.com/" + str + "/" + s, ver);
         }
 
         return "ERROR " + query + "が見つかりませんでした。";