SteamWar/HeadDB
12
0
Fork 0
geforkt von Mirrors/HeadDB
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Revert "switch to gson and DatabaseUpdateEvent"

Quellcode durchsuchen 
This reverts commit caab1e97
Dieser Commit ist enthalten in:
Silent 2022-02-18 02:01:05 +01:00
Ursprung f5ddfdf167
Commit 5bbf862e59
1 geänderte Dateien mit 18 neuen und 13 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

31
src/main/java/tsp/headdb/database/HeadDatabase.java
Datei anzeigen

@ -1,14 +1,13 @@
package tsp.headdb.database; package tsp.headdb.database;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import tsp.headdb.api.Head; import tsp.headdb.api.Head;
import tsp.headdb.event.DatabaseUpdateEvent;
import tsp.headdb.util.Log; import tsp.headdb.util.Log;
import tsp.headdb.util.Utils; import tsp.headdb.util.Utils;
@ -18,7 +17,6 @@ import java.io.InputStreamReader;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -158,13 +156,21 @@ public class HeadDatabase {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
List<Head> heads = new ArrayList<>(); List<Head> heads = new ArrayList<>();
try { try {
String line;
StringBuilder response = new StringBuilder();
URLConnection connection = new URL("https://minecraft-heads.com/scripts/api.php?cat=" + category.getName() + "&tags=true").openConnection(); URLConnection connection = new URL("https://minecraft-heads.com/scripts/api.php?cat=" + category.getName() + "&tags=true").openConnection();
connection.setConnectTimeout(timeout); connection.setConnectTimeout(timeout);
connection.setRequestProperty("User-Agent", plugin.getName() + "-DatabaseUpdater"); connection.setRequestProperty("User-Agent", plugin.getName() + "-DatabaseUpdater");
try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
JsonArray array = JsonParser.parseReader(new BufferedReader(new InputStreamReader(connection.getInputStream()))).getAsJsonArray(); while ((line = in.readLine()) != null) {
for (JsonElement entry : array) { response.append(line);
JsonObject obj = entry.getAsJsonObject(); }
}
JSONParser parser = new JSONParser();
JSONArray array = (JSONArray) parser.parse(response.toString());
for (Object o : array) {
JSONObject obj = (JSONObject) o;
String rawUUID = obj.get("uuid").toString(); String rawUUID = obj.get("uuid").toString();
UUID uuid; UUID uuid;
@ -187,7 +193,7 @@ public class HeadDatabase {
long elapsed = (System.currentTimeMillis() - start); long elapsed = (System.currentTimeMillis() - start);
Log.debug(category.getName() + " -> Done! Time: " + elapsed + "ms (" + TimeUnit.MILLISECONDS.toSeconds(elapsed) + "s)"); Log.debug(category.getName() + " -> Done! Time: " + elapsed + "ms (" + TimeUnit.MILLISECONDS.toSeconds(elapsed) + "s)");
} catch (IOException e) { } catch (ParseException | IOException e) {
Log.error("[" + plugin.getName() + "] Failed to fetch heads (no-cache) | Stack Trace:"); Log.error("[" + plugin.getName() + "] Failed to fetch heads (no-cache) | Stack Trace:");
e.printStackTrace(); e.printStackTrace();
} }
@ -204,14 +210,13 @@ public class HeadDatabase {
Bukkit.getScheduler().runTaskAsynchronously(plugin, task -> getHeadsNoCacheAsync(heads -> { Bukkit.getScheduler().runTaskAsynchronously(plugin, task -> getHeadsNoCacheAsync(heads -> {
if (heads == null) { if (heads == null) {
Log.error("[" + plugin.getName() + "] Failed to update database! Check above for any errors."); Log.error("[" + plugin.getName() + "] Failed to update database! Check above for any errors.");
result.accept(Collections.emptyMap()); result.accept(null);
return; return;
} }
HEADS.clear(); HEADS.clear();
HEADS.putAll(heads); HEADS.putAll(heads);
result.accept(heads); result.accept(heads);
Bukkit.getPluginManager().callEvent(new DatabaseUpdateEvent(this, heads));
})); }));
} }