Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-07 10:57:38 +02:00
Code Issues Projects Releases Wiki Activity

Moved the export paths out of Exporter constructors

Browse Source
This commit is contained in:
Rsl1122 2019-09-26 18:59:45 +03:00
parent c928979f70
commit 618adadfd2
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java
View File

@ -69,10 +69,10 @@ public class NetworkPageExporter extends FileExporter {
this.theme = theme; this.theme = theme;
exportPaths = new ExportPaths(); exportPaths = new ExportPaths();
exportPaths.put("./players", toRelativePathFromRoot("players"));
} }
public void export(Path toDirectory, Server server) throws IOException, NotFoundException, ParseException { public void export(Path toDirectory, Server server) throws IOException, NotFoundException, ParseException {
exportPaths.put("./players", toRelativePathFromRoot("players"));
exportRequiredResources(toDirectory); exportRequiredResources(toDirectory);
exportJSON(toDirectory, server); exportJSON(toDirectory, server);
exportHtml(toDirectory); exportHtml(toDirectory);

4
Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java
View File

@ -69,11 +69,11 @@ public class PlayerPageExporter extends FileExporter {
this.theme = theme; this.theme = theme;
exportPaths = new ExportPaths(); exportPaths = new ExportPaths();
exportPaths.put("../network", toRelativePathFromRoot("network"));
exportPaths.put("../server", toRelativePathFromRoot("server"));
} }
public void export(Path toDirectory, UUID playerUUID, String playerName) throws IOException, NotFoundException, ParseException { public void export(Path toDirectory, UUID playerUUID, String playerName) throws IOException, NotFoundException, ParseException {
exportPaths.put("../network", toRelativePathFromRoot("network"));
exportPaths.put("../server", toRelativePathFromRoot("server"));
exportRequiredResources(toDirectory); exportRequiredResources(toDirectory);
Path playerDirectory = toDirectory.resolve("player/" + toFileName(playerName)); Path playerDirectory = toDirectory.resolve("player/" + toFileName(playerName));

4
Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java
View File

@ -51,6 +51,7 @@ public class PlayersPageExporter extends FileExporter {
private final RootJSONHandler jsonHandler; private final RootJSONHandler jsonHandler;
private final Locale locale; private final Locale locale;
private final Theme theme; private final Theme theme;
private final ServerInfo serverInfo;
private final ExportPaths exportPaths; private final ExportPaths exportPaths;
@ -68,12 +69,13 @@ public class PlayersPageExporter extends FileExporter {
this.jsonHandler = jsonHandler; this.jsonHandler = jsonHandler;
this.locale = locale; this.locale = locale;
this.theme = theme; this.theme = theme;
this.serverInfo = serverInfo;
exportPaths = new ExportPaths(); exportPaths = new ExportPaths();
exportPaths.put("/", toRelativePathFromRoot(serverInfo.getServer().isProxy() ? "network" : "server"));
} }
public void export(Path toDirectory) throws IOException, NotFoundException, ParseException { public void export(Path toDirectory) throws IOException, NotFoundException, ParseException {
exportPaths.put("/", toRelativePathFromRoot(serverInfo.getServer().isProxy() ? "network" : "server"));
exportRequiredResources(toDirectory); exportRequiredResources(toDirectory);
exportJSON(toDirectory); exportJSON(toDirectory);
exportHtml(toDirectory); exportHtml(toDirectory);

2
Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java
View File

@ -74,10 +74,10 @@ public class ServerPageExporter extends FileExporter {
this.serverInfo = serverInfo; this.serverInfo = serverInfo;
exportPaths = new ExportPaths(); exportPaths = new ExportPaths();
exportPaths.put("../network", toRelativePathFromRoot("network"));
} }
public void export(Path toDirectory, Server server) throws IOException, NotFoundException, ParseException { public void export(Path toDirectory, Server server) throws IOException, NotFoundException, ParseException {
exportPaths.put("../network", toRelativePathFromRoot("network"));
exportRequiredResources(toDirectory); exportRequiredResources(toDirectory);
exportJSON(toDirectory, server); exportJSON(toDirectory, server);
exportHtml(toDirectory, server); exportHtml(toDirectory, server);