Mirrors/HeadDB
3
0
Fork 1
Mirror von https://github.com/TheSilentPro/HeadDB.git synchronisiert 2024-12-27 03:12:40 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität

fallback archive

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Silent 2022-03-07 22:32:31 +01:00
Ursprung 47afd36dd7
Commit 417036e518
4 geänderte Dateien mit 97 neuen und 46 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
pom.xml
Datei anzeigen

@ -6,7 +6,7 @@
<groupId>tsp.headdb</groupId> <groupId>tsp.headdb</groupId>
<artifactId>HeadDB</artifactId> <artifactId>HeadDB</artifactId>
<version>4.1.0</version> <version>4.2.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HeadDB</name> <name>HeadDB</name>

82
src/main/java/tsp/headdb/implementation/HeadDatabase.java
Datei anzeigen

@ -7,6 +7,7 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
import tsp.headdb.HeadDB;
import tsp.headdb.api.event.DatabaseUpdateEvent; import tsp.headdb.api.event.DatabaseUpdateEvent;
import tsp.headdb.util.Log; import tsp.headdb.util.Log;
import tsp.headdb.util.Utils; import tsp.headdb.util.Utils;
@ -25,7 +26,6 @@ import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
/** /**
@ -40,6 +40,7 @@ public class HeadDatabase {
private long refresh; private long refresh;
private int timeout; private int timeout;
private long updated; private long updated;
private int nextId; // Internal only
public HeadDatabase(JavaPlugin plugin) { public HeadDatabase(JavaPlugin plugin) {
this.plugin = plugin; this.plugin = plugin;
@ -142,25 +143,51 @@ public class HeadDatabase {
Map<Category, List<Head>> result = new HashMap<>(); Map<Category, List<Head>> result = new HashMap<>();
Category[] categories = Category.cache; Category[] categories = Category.cache;
int id = 1;
for (Category category : categories) { for (Category category : categories) {
Log.debug("Caching heads from: " + category.getName()); Log.debug("Caching heads from: " + category.getName());
long start = System.currentTimeMillis();
List<Head> heads = new ArrayList<>(); List<Head> heads = new ArrayList<>();
try { try {
String line; // First the original api is fetched
StringBuilder response = new StringBuilder(); heads = gather("https://minecraft-heads.com/scripts/api.php?cat=" + category.getName() + "&tags=true", category);
} catch (ParseException | IOException e) {
Log.debug("[" + plugin.getName() + "] Failed to fetch heads (no-cache) from category " + category.getName() + " | Stack Trace:");
Log.debug(e);
Log.warning("Failed to fetch heads for " + category.getName());
if (HeadDB.getInstance().getConfig().getBoolean("fallback", true)) {
Log.info("Attempting fallback provider for: " + category.getName());
try {
// If the original fails and fallback is enabled, fetch from static archive
heads = gather("https://heads.pages.dev/archive/" + category.getName() + ".json", category);
} catch (IOException | ParseException ex) {
Log.error("Failed to fetch heads for " + category.getName() + "! (OF)"); // OF = Original-Fallback, both failed
ex.printStackTrace();
}
}
}
URLConnection connection = new URL("https://minecraft-heads.com/scripts/api.php?cat=" + category.getName() + "&tags=true").openConnection(); updated = System.nanoTime();
connection.setConnectTimeout(timeout); result.put(category, heads);
connection.setRequestProperty("User-Agent", plugin.getName() + "-DatabaseUpdater");
try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
while ((line = in.readLine()) != null) {
response.append(line);
} }
resultSet.accept(result);
});
} }
/**
* Fetches and gathers the heads from the url.
* For internal use only!
*
* @param url The url
* @param category The category of the heads
* @return List of heads for that category
* @throws IOException error
* @throws ParseException error
*/
private List<Head> gather(String url, Category category) throws IOException, ParseException {
long start = System.currentTimeMillis();
List<Head> heads = new ArrayList<>();
JSONParser parser = new JSONParser(); JSONParser parser = new JSONParser();
JSONArray array = (JSONArray) parser.parse(response.toString()); JSONArray array = (JSONArray) parser.parse(fetch(url));
for (Object o : array) { for (Object o : array) {
JSONObject obj = (JSONObject) o; JSONObject obj = (JSONObject) o;
String rawUUID = obj.get("uuid").toString(); String rawUUID = obj.get("uuid").toString();
@ -172,30 +199,43 @@ public class HeadDatabase {
uuid = UUID.randomUUID(); uuid = UUID.randomUUID();
} }
Head head = new Head(id) Head head = new Head(nextId)
.name(obj.get("name").toString()) .name(obj.get("name").toString())
.uniqueId(uuid) .uniqueId(uuid)
.value(obj.get("value").toString()) .value(obj.get("value").toString())
.tags(obj.get("tags") != null ? obj.get("tags").toString() : "None") .tags(obj.get("tags") != null ? obj.get("tags").toString() : "None")
.category(category); .category(category);
id++; nextId++;
heads.add(head); heads.add(head);
} }
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 (ParseException | IOException e) { return heads;
Log.error("[" + plugin.getName() + "] Failed to fetch heads (no-cache) | Stack Trace:");
e.printStackTrace();
} }
updated = System.nanoTime(); /**
result.put(category, heads); * Fetches heads from the url.
* For internal use only!
*
* @param url The url
* @return JSON-string response
* @throws IOException error
*/
private String fetch(String url) throws IOException {
String line;
StringBuilder response = new StringBuilder();
URLConnection connection = new URL(url).openConnection();
connection.setConnectTimeout(timeout);
connection.setRequestProperty("User-Agent", plugin.getName() + "-DatabaseUpdater");
BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
while ((line = in.readLine()) != null) {
response.append(line);
} }
resultSet.accept(result); return response.toString();
});
} }
public void update(Consumer<Map<Category, List<Head>>> result) { public void update(Consumer<Map<Category, List<Head>>> result) {

13
src/main/java/tsp/headdb/util/Log.java
Datei anzeigen

@ -27,13 +27,17 @@ public class Log {
} }
public static void error(Throwable ex) { public static void error(Throwable ex) {
log(ex); log(LogLevel.ERROR, ex);
} }
public static void debug(String message) { public static void debug(String message) {
log(LogLevel.DEBUG, message); log(LogLevel.DEBUG, message);
} }
public static void debug(Throwable ex) {
log(LogLevel.DEBUG, ex);
}
public static void log(LogLevel level, String message) { public static void log(LogLevel level, String message) {
if (level == LogLevel.DEBUG && !HeadDB.getInstance().getConfig().getBoolean("debug")) { if (level == LogLevel.DEBUG && !HeadDB.getInstance().getConfig().getBoolean("debug")) {
return; return;
@ -41,8 +45,11 @@ public class Log {
Bukkit.getConsoleSender().sendMessage(Utils.colorize("&7[&9&l" + name + "&7] " + level.getColor() + "[" + level.name() + "]: " + message)); Bukkit.getConsoleSender().sendMessage(Utils.colorize("&7[&9&l" + name + "&7] " + level.getColor() + "[" + level.name() + "]: " + message));
} }
public static void log(Throwable ex) { public static void log(LogLevel level, Throwable ex) {
Bukkit.getConsoleSender().sendMessage(Utils.colorize("&7[" + name + "&7] " + "&4&l[EXCEPTION]: " + ex.getMessage())); if (level == LogLevel.DEBUG && !HeadDB.getInstance().getConfig().getBoolean("debug")) {
return;
}
Bukkit.getConsoleSender().sendMessage(Utils.colorize("&7[" + name + "&7] " + level.getColor() + "[" + level.name() + "]: " + "&4&l[EXCEPTION]: " + ex.getMessage()));
Bukkit.getConsoleSender().sendMessage(Utils.colorize("&4&l[StackTrace]: " + getStackTrace(ex))); Bukkit.getConsoleSender().sendMessage(Utils.colorize("&4&l[StackTrace]: " + getStackTrace(ex)));
} }

4
src/main/resources/config.yml
Datei anzeigen

@ -124,5 +124,9 @@ ui:
volume: 1 volume: 1
pitch: 1 pitch: 1
# If the original fetching fails and this is enabled,
# the plugin will attempt to fetch the heads from an archive.
fallback: true
# Debug Mode # Debug Mode
debug: false debug: false