mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add branch support to listings

Browse Source 
Took 1 hour 51 minutes
This commit is contained in:
Andrew Baker 2021-04-29 11:23:31 -07:00
parent ecaa388bbe
commit 866e0e3fa9
No known key found for this signature in database
GPG Key ID: 3FCE714EE83225D7
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/volmit/iris/manager/ProjectManager.java
View File

@ -17,6 +17,8 @@ import java.io.FileFilter;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Data @Data
public class ProjectManager public class ProjectManager
@ -190,33 +192,50 @@ public class ProjectManager
public void downloadSearch(MortarSender sender, String key, boolean trim, boolean forceOverwrite) public void downloadSearch(MortarSender sender, String key, boolean trim, boolean forceOverwrite)
{ {
String repo = getListing(false).get(key); /*
* Regex removes "/branch" from "IrisDimensions/repo/branch"
* Results in "IrisDimensions/repo"
*/
final Pattern pattern = Pattern.compile("^[^/]*(?:/[^/]*)", Pattern.MULTILINE);
final Matcher matcher = pattern.matcher(getListing(false).get(key));
while (matcher.find())
{
String repo = matcher.group(0);
/*
* Regex removes "IrisDimensions/repo" from "IrisDimensions/repo/branch"
* Results in "/branch"
*/
String branch = getListing(false).get(key).replaceAll("^[^/]*(?:/[^/]*)", "");
if(branch == null || branch.equals("")) {
branch = "/master";
}
if(repo == null) if(repo == null)
{ {
sender.sendMessage("Couldn't find the pack '" + key + "' in the iris repo listing."); sender.sendMessage("Couldn't find the pack '" + key + "' in the iris repo listing.");
return; return;
} }
sender.sendMessage("Found '" + key + "' in the Iris Listing as " + repo); sender.sendMessage("Found '" + key + "' in the Iris Listing as " + repo + ", branch " + branch);
try try
{ {
download(sender, repo, trim, forceOverwrite); download(sender, repo, branch, trim, forceOverwrite);
} }
catch(JsonSyntaxException | IOException e) catch(JsonSyntaxException | IOException e)
{ {
sender.sendMessage("Failed to download '" + key + "'."); sender.sendMessage("Failed to download '" + key + "'.");
} }
} }
public void download(MortarSender sender, String repo, boolean trim) throws JsonSyntaxException, IOException
{
download(sender, repo, trim, false);
} }
public void download(MortarSender sender, String repo, boolean trim, boolean forceOverwrite) throws JsonSyntaxException, IOException public void download(MortarSender sender, String repo, String branch, boolean trim) throws JsonSyntaxException, IOException
{ {
String url = "https://codeload.github.com/" + repo + "/zip/master"; download(sender, repo, branch, trim, false);
}
public void download(MortarSender sender, String repo, String branch, boolean trim, boolean forceOverwrite) throws JsonSyntaxException, IOException
{
String url = "https://codeload.github.com/" + repo + "/zip" + branch;
sender.sendMessage("Downloading " + url); sender.sendMessage("Downloading " + url);
File zip = Iris.getNonCachedFile("pack-" + trim + "-" + repo, url); File zip = Iris.getNonCachedFile("pack-" + trim + "-" + repo, url);
File temp = Iris.getTemp(); File temp = Iris.getTemp();