Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-13 03:41:03 +01:00
Code Issues Projects Releases Wiki Activity

/players page now uses PlayerContainers

Browse Source
This commit is contained in:
Rsl1122 2018-06-24 12:53:39 +03:00
parent e65106382b
commit 6830a0ed9f
4 changed files with 82 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/PlayersPage.java Normal file
View File

@ -0,0 +1,48 @@
package com.djrapitops.plan.system.webserver.pages.parsing;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.api.exceptions.ParseException;
import com.djrapitops.plan.data.store.containers.PlayerContainer;
import com.djrapitops.plan.data.store.mutators.formatting.PlaceholderReplacer;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.utilities.file.FileUtil;
import com.djrapitops.plan.utilities.html.tables.PlayersTable;
import com.djrapitops.plugin.api.Benchmark;
import com.djrapitops.plugin.api.Check;
import com.djrapitops.plugin.api.utility.log.Log;
import java.util.List;
/**
* Html String parser for /players page.
*
* @author Rsl1122
*/
public class PlayersPage extends Page {
@Override
public String toHtml() throws ParseException {
try {
Database database = Database.getActive();
PlaceholderReplacer placeholderReplacer = new PlaceholderReplacer();
placeholderReplacer.put("version", PlanPlugin.getInstance().getVersion());
if (Check.isBukkitAvailable()) {
placeholderReplacer.put("networkName", ServerInfo.getServerName());
} else {
placeholderReplacer.put("networkName", Settings.BUNGEE_NETWORK_NAME.toString());
}
Benchmark.start("Players page players table parsing");
List<PlayerContainer> playerContainers = database.fetch().getAllPlayerContainers();
placeholderReplacer.put("playersTable", PlayersTable.forPlayersPage(playerContainers).parseHtml());
Log.debug(Benchmark.stopAndFormat("Players page players table parsing"));
return placeholderReplacer.apply(FileUtil.getStringFromResource("web/players.html"));
} catch (Exception e) {
throw new ParseException(e);
}
}
}

119
Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/PlayersPageResponse.java
View File

@ -1,31 +1,10 @@
package com.djrapitops.plan.system.webserver.response.pages;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.api.exceptions.database.DBOpException;
import com.djrapitops.plan.data.container.GeoInfo;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.data.container.UserInfo;
import com.djrapitops.plan.data.element.TableContainer;
import com.djrapitops.plan.data.store.mutators.formatting.Formatter;
import com.djrapitops.plan.data.store.mutators.formatting.Formatters;
import com.djrapitops.plan.data.store.objects.DateHolder;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.theme.Theme;
import com.djrapitops.plan.api.exceptions.ParseException;
import com.djrapitops.plan.system.webserver.pages.parsing.PlayersPage;
import com.djrapitops.plan.system.webserver.response.Response;
import com.djrapitops.plan.system.webserver.response.errors.InternalErrorResponse;
import com.djrapitops.plan.utilities.analysis.AnalysisUtils;
import com.djrapitops.plan.utilities.comparators.GeoInfoComparator;
import com.djrapitops.plan.utilities.comparators.UserInfoLastPlayedComparator;
import com.djrapitops.plan.utilities.file.FileUtil;
import com.djrapitops.plan.utilities.html.Html;
import com.djrapitops.plugin.api.Check;
import com.djrapitops.plugin.api.utility.log.Log;
import org.apache.commons.text.StringSubstitutor;
import java.io.IOException;
import java.util.*;
/**
* @author Rsl1122
@ -36,100 +15,10 @@ public class PlayersPageResponse extends Response {
public PlayersPageResponse() {
super.setHeader("HTTP/1.1 200 OK");
try {
PlanSystem system = PlanSystem.getInstance();
PlanPlugin plugin = PlanPlugin.getInstance();
Database db = system.getDatabaseSystem().getActiveDatabase();
Map<String, String> replace = new HashMap<>();
if (Check.isBukkitAvailable()) {
replace.put("networkName", Settings.SERVER_NAME.toString().replaceAll("[^a-zA-Z0-9_\\s]", "_"));
} else {
replace.put("networkName", Settings.BUNGEE_NETWORK_NAME.toString());
}
replace.put("playersTable", buildPlayersTable(db));
replace.put("version", plugin.getVersion());
super.setContent(Theme.replaceColors(StringSubstitutor.replace(FileUtil.getStringFromResource("web/players.html"), replace)));
} catch (IOException e) {
super.setContent(new PlayersPage().toHtml());
} catch (ParseException e) {
Log.toLog(this.getClass(), e);
setContent(new InternalErrorResponse("/players", e).getContent());
}
}
private String buildPlayersTable(Database db) {
try {
List<UserInfo> users = new ArrayList<>(db.fetch().getUsers().values());
Map<UUID, Long> lastSeenForAllPlayers = db.fetch().getLastSeenForAllPlayers();
users.forEach(user -> user.setLastSeen(lastSeenForAllPlayers.getOrDefault(user.getUuid(), 0L)));
users.sort(new UserInfoLastPlayedComparator());
Map<UUID, List<Session>> sessionsByUser = AnalysisUtils.sortSessionsByUser(db.fetch().getSessionsWithNoExtras());
Map<UUID, List<GeoInfo>> geoInfos = db.fetch().getAllGeoInfo();
String userS = Html.FONT_AWESOME_ICON.parse("user") + " Player";
String playtimeS = Html.FONT_AWESOME_ICON.parse("clock-o") + " Playtime";
String sessionsS = Html.FONT_AWESOME_ICON.parse("calendar-plus-o") + " Sessions";
String registeredS = Html.FONT_AWESOME_ICON.parse("user-plus") + " Registered";
String lastSeenS = Html.FONT_AWESOME_ICON.parse("calendar-check-o") + " Last Seen";
String geolocationS = Html.FONT_AWESOME_ICON.parse("globe") + " Geolocation";
StringBuilder html = new StringBuilder("<table class=\"table table-bordered table-striped table-hover player-table dataTable\">");
TableContainer tableContainer = new TableContainer(userS, playtimeS, sessionsS, registeredS, lastSeenS, geolocationS);
String header = tableContainer.parseHeader();
html.append(header);
if (Settings.PLAYERTABLE_FOOTER.isTrue()) {
html.append(header.replace("thead", "tfoot"));
}
try {
if (users.isEmpty()) {
tableContainer.addRow("<b>No Players</b>");
throw new IllegalArgumentException("No players");
}
Formatter<Long> timeFormatter = Formatters.timeAmount();
Formatter<DateHolder> timeStampFormatter = Formatters.year();
int i = 0;
int maxPlayers = Settings.MAX_PLAYERS_PLAYERS_PAGE.getNumber();
if (maxPlayers <= 0) {
maxPlayers = 25000;
}
for (UserInfo userInfo : users) {
if (i >= maxPlayers) {
break;
}
UUID uuid = userInfo.getUuid();
String playerName = userInfo.getName();
String link = Html.LINK_EXTERNAL.parse("../player/" + playerName, playerName);
List<Session> sessions = sessionsByUser.getOrDefault(uuid, new ArrayList<>());
int sessionCount = sessions.size();
long playtime = sessionCount != 0 ? sessions.stream()
.mapToLong(Session::getLength)
.sum() : 0L;
List<GeoInfo> geoInfoList = geoInfos.getOrDefault(uuid, new ArrayList<>());
geoInfoList.sort(new GeoInfoComparator());
String geolocation = geoInfoList.isEmpty() ? "Not Known" : geoInfoList.get(0).getGeolocation();
html.append(Html.TABLELINE_PLAYERS_PLAYERS_PAGE.parse(
link,
playtime, timeFormatter.apply(playtime),
sessionCount + "",
timeStampFormatter.apply(userInfo::getRegistered),
timeStampFormatter.apply(userInfo::getLastSeen),
geolocation
));
i++;
}
} catch (IllegalArgumentException ignored) {
}
return html.append("</tbody></table>").toString();
} catch (DBOpException e) {
Log.toLog(PlayersPageResponse.class, e);
return new InternalErrorResponse("/players", e).getContent();
}
}
}

27
Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerContainerLastPlayedComparator.java Normal file
View File

@ -0,0 +1,27 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.djrapitops.plan.utilities.comparators;
import com.djrapitops.plan.data.store.containers.PlayerContainer;
import com.djrapitops.plan.data.store.keys.PlayerKeys;
import java.util.Comparator;
/**
* Comparator for PlayerContainer so that most recently seen is first.
*
* @author Rsl1122
*/
public class PlayerContainerLastPlayedComparator implements Comparator<PlayerContainer> {
@Override
public int compare(PlayerContainer playerOne, PlayerContainer playerTwo) {
return Long.compare(
playerTwo.getValue(PlayerKeys.LAST_SEEN).orElse(0L),
playerOne.getValue(PlayerKeys.LAST_SEEN).orElse(0L)
);
}
}

3
Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayersTable.java
View File

@ -10,6 +10,7 @@ import com.djrapitops.plan.data.store.mutators.GeoInfoMutator;
import com.djrapitops.plan.data.store.mutators.SessionsMutator;
import com.djrapitops.plan.data.store.mutators.formatting.Formatters;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.utilities.comparators.PlayerContainerLastPlayedComparator;
import com.djrapitops.plan.utilities.html.Html;
import java.util.List;
@ -56,6 +57,8 @@ public class PlayersTable extends TableContainer {
PlanAPI planAPI = PlanAPI.getInstance();
long now = System.currentTimeMillis();
players.sort(new PlayerContainerLastPlayedComparator());
int i = 0;
for (PlayerContainer player : players) {
if (i >= maxPlayers) {