SpigotMC-Mirrors
/
PlaceholderAPI
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated cloud manager to not be weird

This commit is contained in:
Sxtanna 2020-07-24 08:24:07 -04:00
parent 7d091f3cf4
commit 4c586d1803
1 changed files with 59 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java
View File

@ -22,6 +22,7 @@ package me.clip.placeholderapi.expansion.cloud;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
@ -30,26 +31,22 @@ import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Unmodifiable; import org.jetbrains.annotations.Unmodifiable;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.lang.reflect.Type;
import java.net.URL; import java.net.URL;
import java.nio.channels.Channels; import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel; import java.nio.channels.ReadableByteChannel;
import java.util.ArrayList; import java.nio.charset.StandardCharsets;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function; import java.util.function.Function;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -58,7 +55,9 @@ public final class ExpansionCloudManager
{ {
private static final String API_URL = "http://api.extendedclip.com/v2/"; private static final String API_URL = "http://api.extendedclip.com/v2/";
private static final Gson GSON = new Gson();
private static final Gson GSON = new Gson();
private static final Type TYPE = new TypeToken<Map<String, CloudExpansion>>() {}.getType();
@NotNull @NotNull
@ -68,7 +67,7 @@ public final class ExpansionCloudManager
@NotNull @NotNull
private final Map<Integer, CloudExpansion> expansions = new TreeMap<>(); private final Map<String, CloudExpansion> expansions = new TreeMap<>();
@NotNull @NotNull
private final Map<CloudExpansion, CompletableFuture<File>> downloading = new HashMap<>(); private final Map<CloudExpansion, CompletableFuture<File>> downloading = new HashMap<>();
@ -87,7 +86,7 @@ public final class ExpansionCloudManager
@NotNull @NotNull
@Unmodifiable @Unmodifiable
public Map<Integer, CloudExpansion> getCloudExpansions() public Map<String, CloudExpansion> getCloudExpansions()
{ {
return ImmutableMap.copyOf(expansions); return ImmutableMap.copyOf(expansions);
} }
@ -127,36 +126,32 @@ public final class ExpansionCloudManager
@NotNull @NotNull
@Unmodifiable @Unmodifiable
public Map<Integer, CloudExpansion> getAllByAuthor(@NotNull final String author) public Map<String, CloudExpansion> getAllByAuthor(@NotNull final String author)
{ {
if (expansions.isEmpty()) if (expansions.isEmpty())
{ {
return Collections.emptyMap(); return Collections.emptyMap();
} }
final AtomicInteger index = new AtomicInteger();
return expansions.values() return expansions.values()
.stream() .stream()
.filter(expansion -> author.equalsIgnoreCase(expansion.getAuthor())) .filter(expansion -> author.equalsIgnoreCase(expansion.getAuthor()))
.collect(Collectors.toMap(($) -> index.incrementAndGet(), Function.identity())); .collect(Collectors.toMap(CloudExpansion::getName, Function.identity()));
} }
@NotNull @NotNull
@Unmodifiable @Unmodifiable
public Map<Integer, CloudExpansion> getAllInstalled() public Map<String, CloudExpansion> getAllInstalled()
{ {
if (expansions.isEmpty()) if (expansions.isEmpty())
{ {
return Collections.emptyMap(); return Collections.emptyMap();
} }
final AtomicInteger index = new AtomicInteger();
return expansions.values() return expansions.values()
.stream() .stream()
.filter(CloudExpansion::hasExpansion) .filter(CloudExpansion::hasExpansion)
.collect(Collectors.toMap(($) -> index.incrementAndGet(), Function.identity())); .collect(Collectors.toMap(CloudExpansion::getName, Function.identity()));
} }
@ -168,70 +163,68 @@ public final class ExpansionCloudManager
downloading.clear(); downloading.clear();
} }
public void fetch(boolean allowUnverified) @NotNull
public CompletableFuture<Map<String, CloudExpansion>> fetch(boolean allowUnverified)
{ {
plugin.getLogger().info("Fetching available expansion information..."); plugin.getLogger().info("Fetching available expansion information...");
plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> { CompletableFuture<Map<String, CloudExpansion>> future = CompletableFuture.supplyAsync(() -> {
final Map<String, CloudExpansion> data = new HashMap<>(); final Map<String, CloudExpansion> values = new HashMap<>();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(new URL(API_URL).openStream()))) try
{ {
data.putAll(GSON.fromJson(reader, new TypeToken<Map<String, CloudExpansion>>() //noinspection UnstableApiUsage
{ final String json = Resources.toString(new URL(API_URL), StandardCharsets.UTF_8);
}.getType())); values.putAll(GSON.fromJson(json, TYPE));
} }
catch (Exception ex) catch (final IOException ex)
{ {
if (plugin.getPlaceholderAPIConfig().isDebugMode()) throw new CompletionException(ex);
{
ex.printStackTrace();
}
else
{
plugin.getLogger().warning("Unable to fetch expansions!\nThere was an error with the server host connecting to the PlaceholderAPI eCloud (https://api.extendedclip.com/v2/)");
}
} }
final List<CloudExpansion> unsorted = new ArrayList<>(); values.values().removeIf(value -> value.getLatestVersion() == null || value.getVersion(value.getLatestVersion()) == null);
data.forEach((name, cexp) -> { return values;
if ((allowUnverified || cexp.isVerified()) && cexp.getLatestVersion() != null && cexp.getVersion(cexp.getLatestVersion()) != null) });
if (!allowUnverified)
{
future = future.thenApplyAsync((values) -> {
values.values().removeIf(expansion -> !expansion.isVerified());
return values;
});
}
future = future.thenApplyAsync((values) -> {
values.forEach((name, expansion) -> {
expansion.setName(name);
final PlaceholderExpansion local = plugin.getExpansionManager().getRegisteredExpansion(name);
if (local != null && local.isRegistered())
{ {
cexp.setName(name); expansion.setHasExpansion(true);
expansion.setShouldUpdate(!local.getVersion().equals(expansion.getLatestVersion()));
PlaceholderExpansion ex = plugin.getExpansionManager().getRegisteredExpansion(cexp.getName());
if (ex != null && ex.isRegistered())
{
cexp.setHasExpansion(true);
if (!ex.getVersion().equals(cexp.getLatestVersion()))
{
cexp.setShouldUpdate(true);
}
}
unsorted.add(cexp);
} }
}); });
unsorted.sort(Comparator.comparing(CloudExpansion::getLastUpdate).reversed()); return values;
int count = 0;
for (CloudExpansion e : unsorted)
{
expansions.put(count++, e);
}
plugin.getLogger().info(count + " placeholder expansions are available on the cloud.");
long updates = getCloudUpdateCount();
if (updates > 0)
{
plugin.getLogger().info(updates + " installed expansions have updates available.");
}
}); });
future.whenComplete((expansions, exception) -> {
if (exception != null)
{
plugin.getLogger().log(Level.WARNING, "failed to download expansion information", exception);
return;
}
this.expansions.putAll(expansions);
});
return future;
} }