* Methods can be called from Asynchronous task and are thread safe unless * otherwise stated. @@ -94,8 +93,7 @@ public class API { */ @Deprecated public boolean isPlayersDataInspectCached(UUID uuid) { - // TODO Check PageCache - return false; + return plugin.getInfoManager().isCached(uuid); } /** @@ -120,12 +118,7 @@ public class API { * @return player.html with all placeholders replaced. */ public String getPlayerHtmlAsString(UUID uuid) { - WebServer server = plugin.getUiServer(); - if (Verify.notNull(server)) { - return server.getDataReqHandler().getInspectHtml(uuid); - } - DataRequestHandler reqH = new DataRequestHandler(plugin); - return reqH.getInspectHtml(uuid); + return plugin.getInfoManager().getPlayerHtml(uuid); } /** @@ -134,18 +127,23 @@ public class API { * @return true/false */ public boolean isAnalysisCached() { - // TODO Check PageCache - return false; + return plugin.getInfoManager().isAnalysisCached(); } /** - * Run's the analysis with the current data in the cache and fetches rest - * from the database. - *
- * Starts a new Asynchronous task to run the analysis.
+ * Run the analysis.
*/
public void updateAnalysisCache() {
- // TODO Run analysis
+ plugin.getInfoManager().refreshAnalysis();
+ }
+
+ /**
+ * Run the analysis and call the given processor.
+ *
+ * @param processor Processor to call after analysis has finished.
+ */
+ public void updateAnalysisCache(Processor processor) {
+ plugin.getInfoManager().refreshAnalysis();
}
/**
@@ -156,12 +154,7 @@ public class API {
* @return server.html with all placeholders replaced.
*/
public String getAnalysisHtmlAsString() {
- WebServer server = plugin.getUiServer();
- if (Verify.notNull(server)) {
- return server.getDataReqHandler().getServerHtml();
- }
- DataRequestHandler reqH = new DataRequestHandler(plugin);
- return reqH.getServerHtml();
+ return plugin.getInfoManager().getAnalysisHtml();
}
/**
@@ -173,23 +166,26 @@ public class API {
* @see AnalysisData
*/
public AnalysisData getAnalysisDataFromCache() {
- // TODO Fix
- return null;
+ return plugin.getInfoManager().getAnalysisData();
}
/**
* Used to get the PlayerName of a player who has played on the server.
+ * Should be called from an Async thread.
*
* @param uuid UUID of the player.
* @return PlayerName, eg "Rsl1122"
* @throws IllegalArgumentException If uuid is null.
- * @throws IllegalStateException If the player has not played on the server
- * before.
+ * @throws IllegalStateException If the player has not played on the server before.
*/
- public String getPlayerName(UUID uuid) {
+ public String getPlayerName(UUID uuid) throws SQLException {
Verify.nullCheck(uuid);
+ String playerName = plugin.getDB().getUsersTable().getPlayerName(uuid);
+ if (playerName != null) {
+ return playerName;
+ }
IOfflinePlayer offlinePlayer = Fetch.getIOfflinePlayer(uuid);
- if (Verify.notNull(offlinePlayer)) {
+ if (offlinePlayer != null) {
return offlinePlayer.getName();
}
throw new IllegalStateException("Player has not played on this server before.");
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java
index 7ab536f53..d8761edab 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java
@@ -5,11 +5,14 @@
package main.java.com.djrapitops.plan.systems.info;
import main.java.com.djrapitops.plan.Plan;
+import main.java.com.djrapitops.plan.data.AnalysisData;
import main.java.com.djrapitops.plan.database.Database;
import main.java.com.djrapitops.plan.systems.cache.DataCache;
import main.java.com.djrapitops.plan.systems.cache.SessionCache;
import main.java.com.djrapitops.plan.systems.info.parsing.UrlParser;
+import main.java.com.djrapitops.plan.utilities.MiscUtils;
+import java.util.Optional;
import java.util.UUID;
/**
@@ -27,6 +30,9 @@ public class InformationManager {
private boolean usingBungeeWebServer;
private String webServerAddress;
+ private AnalysisData analysisData;
+ private Long refreshDate;
+
public InformationManager(Plan plugin) {
this.plugin = plugin;
db = plugin.getDB();
@@ -69,4 +75,37 @@ public class InformationManager {
public SessionCache getSessionCache() {
return dataCache;
}
+
+ public boolean isCached(UUID uuid) {
+ // TODO
+ return false;
+ }
+
+ public String getPlayerHtml(UUID uuid) {
+ // TODO
+ return "";
+ }
+
+ public boolean isAnalysisCached() {
+ // TODO
+ return false;
+ }
+
+ public String getAnalysisHtml() {
+ // TODO
+ return "";
+ }
+
+ public void cacheAnalysisdata(AnalysisData analysisData) {
+ this.analysisData = analysisData;
+ refreshDate = MiscUtils.getTime();
+ }
+
+ public AnalysisData getAnalysisData() {
+ return analysisData;
+ }
+
+ public Optional