FancyInnovations/FancyPlugins
1
0
Fork 0
mirror of https://github.com/FancyInnovations/FancyPlugins.git synced 2025-12-06 07:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

quick-e2e: Refactor PaperDownloadService to use Context for server file downloads

Browse Source
This commit is contained in:
Oliver
2025-03-16 18:19:45 +01:00
parent 780d418c2a
commit 4afc1bcf80
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java
View File

@@ -22,11 +22,11 @@ public class Main {
Context context = new Context(config); Context context = new Context(config);
PaperDownloadService paper = new PaperDownloadService(); PaperDownloadService paper = new PaperDownloadService();
// paper.downloadServerFile(config.type(), config.version(), config.build()); paper.downloadServerFile(context);
EulaService eula = new EulaService(); EulaService eula = new EulaService();
if (config.eula()) { if (config.eula()) {
eula.setEulaToTrue(String.format("servers/%s_%s_%s/eula.txt", config.type(), config.version(), config.build())); eula.setEulaToTrue(String.format("%s/eula.txt", context.serverEnvPath().toString()));
} }
StartScriptService startScript = new StartScriptService(); StartScriptService startScript = new StartScriptService();

22
tools/quick-e2e/src/main/java/de/oliver/quicke2e/paper/PaperDownloadService.java
View File

@@ -1,6 +1,7 @@
package de.oliver.quicke2e.paper; package de.oliver.quicke2e.paper;
import com.google.gson.Gson; import com.google.gson.Gson;
import de.oliver.quicke2e.config.Context;
import java.net.URI; import java.net.URI;
import java.net.http.HttpClient; import java.net.http.HttpClient;
@@ -21,23 +22,26 @@ public class PaperDownloadService {
this.client = HttpClient.newHttpClient(); this.client = HttpClient.newHttpClient();
} }
public void downloadServerFile( public void downloadServerFile(Context context) {
String project, final String type = context.configuration().type();
String version, final String version = context.configuration().version();
String build final String build = context.configuration().build();
) {
Path folderPath = Paths.get(String.format("%s/%s_%s_%s/", destination, project, version, build)); Path folderPath = Paths.get(String.format("%s/%s_%s_%s/", destination, type, version, build));
if (!folderPath.toFile().exists()) { if (!folderPath.toFile().exists()) {
folderPath.toFile().mkdirs(); folderPath.toFile().mkdirs();
} }
context.setServerEnvPath(folderPath);
String buildNumber = build.equals("latest") ? getLatestBuildNumber(project, version) : build; String buildNumber = build.equals("latest") ? getLatestBuildNumber(type, version) : build;
context.setActualBuildNumber(buildNumber);
Path filePath = Paths.get(String.format("%s/%s_%s_%s/%s-%s-%s.jar", destination, project, version, build, project, version, buildNumber)); Path filePath = Paths.get(String.format("%s/%s_%s_%s/%s-%s-%s.jar", destination, type, version, build, type, version, buildNumber));
context.setServerJarPath(filePath);
HttpRequest req = HttpRequest.newBuilder() HttpRequest req = HttpRequest.newBuilder()
.GET() .GET()
.uri(URI.create(String.format("%s/projects/%s/versions/%s/builds/%s/downloads/%s-%s-%s.jar", BASE_URL, project, version, buildNumber, project, version, buildNumber))) .uri(URI.create(String.format("%s/projects/%s/versions/%s/builds/%s/downloads/%s-%s-%s.jar", BASE_URL, type, version, buildNumber, type, version, buildNumber)))
.build(); .build();
client.sendAsync(req, HttpResponse.BodyHandlers.ofFile(filePath)) client.sendAsync(req, HttpResponse.BodyHandlers.ofFile(filePath))