From 7900ee71e053566d4fce9cdeba8a9a9556a4dc47 Mon Sep 17 00:00:00 2001 From: extendedclip Date: Fri, 20 Apr 2018 22:22:03 -0400 Subject: [PATCH] Check and filter unverified expansions --- .../expansion/cloud/CloudExpansion.java | 2 - .../cloud/ExpansionCloudManager.java | 548 +++++++++--------- 2 files changed, 275 insertions(+), 275 deletions(-) diff --git a/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java b/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java index 5416a11..4479223 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java +++ b/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java @@ -22,8 +22,6 @@ package me.clip.placeholderapi.expansion.cloud; import me.clip.placeholderapi.util.TimeUtil; -import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java b/src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java index 734a383..1377737 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java @@ -42,289 +42,291 @@ import java.util.stream.IntStream; public class ExpansionCloudManager { - private PlaceholderAPIPlugin plugin; - private final String API = "http://api.extendedclip.com/v2/"; - private final File dir; - private final TreeMap remote = new TreeMap<>(); - private final List downloading = new ArrayList<>(); - private Gson gson; + private PlaceholderAPIPlugin plugin; + private final String API = "http://api.extendedclip.com/v2/"; + private final File dir; + private final TreeMap remote = new TreeMap<>(); + private final List downloading = new ArrayList<>(); + private Gson gson; - public ExpansionCloudManager(PlaceholderAPIPlugin instance) { - plugin = instance; - gson = new Gson(); - dir = new File(instance.getDataFolder() + File.separator + "expansions"); - if (!dir.exists()) { - try { - dir.mkdirs(); - } catch (Exception ex) { - ex.printStackTrace(); + public ExpansionCloudManager(PlaceholderAPIPlugin instance) { + plugin = instance; + gson = new Gson(); + dir = new File(instance.getDataFolder() + File.separator + "expansions"); + if (!dir.exists()) { + try { + dir.mkdirs(); + } catch (Exception ex) { + ex.printStackTrace(); + } } - } - } - - public void clean() { - remote.clear(); - downloading.clear(); - - } - - public boolean isDownloading(String expansion) { - return downloading.contains(expansion); - } - - public Map getCloudExpansions() { - return remote; - } - - public CloudExpansion getCloudExpansion(String name) { - return remote.values().stream().filter(ex -> ex.getName().equalsIgnoreCase(name)).findFirst().orElse(null); - } - - public int getCloudAuthorCount() { + } + + public void clean() { + remote.clear(); + downloading.clear(); + } + + public boolean isDownloading(String expansion) { + return downloading.contains(expansion); + } + + public Map getCloudExpansions() { + return remote; + } + + public CloudExpansion getCloudExpansion(String name) { + return remote.values().stream().filter(ex -> ex.getName().equalsIgnoreCase(name)).findFirst().orElse(null); + } + + public int getCloudAuthorCount() { return remote.values().stream().collect(Collectors.groupingBy(CloudExpansion::getAuthor, Collectors.counting())).size(); - } - - public long getToUpdateCount() { + } + + public long getToUpdateCount() { return PlaceholderAPI.getExpansions().stream().filter(ex -> getCloudExpansion(ex.getName()) != null && getCloudExpansion(ex.getName()).shouldUpdate()).count(); } - public Map getAllByAuthor(String author) { - if (remote.isEmpty()) { - return null; - } - TreeMap byAuthor = new TreeMap<>(); - boolean first = true; - for (CloudExpansion ex : remote.values()) { - if (ex.getAuthor().equalsIgnoreCase(author)) { - if (first) { - first = false; - byAuthor.put(0, ex); - } else { - byAuthor.put(byAuthor.lastKey()+1, ex); - } - } - } - - if (byAuthor.isEmpty()) { - return null; - } - return byAuthor; - } - - public Map getAllInstalled() { - if (remote.isEmpty()) { - return null; - } - TreeMap has = new TreeMap<>(); - boolean first = true; - for (CloudExpansion ex : remote.values()) { - if (ex.hasExpansion()) { - if (first) { - first = false; - has.put(1, ex); - } else { - has.put(has.lastKey()+1, ex); - } - } - } - - if (has.isEmpty()) { - return null; - } - return has; - } - - public int getPagesAvailable(Map map, int amount) { - if (map == null) { - return 0; - } - int pages = map.size() > 0 ? 1 : 0; - if (pages == 0) { - return pages; - } - if (map.size() > amount) { - pages = map.size()/amount; - if (map.size() % amount > 0) { - pages++; - } - } - return pages; - } - - public Map getPage(Map map, int page, int size) { - if (map == null || map.size() == 0 || page > getPagesAvailable(map, size)) { - return null; - } - int end = size*page; - int start = end-size; - TreeMap ex = new TreeMap<>(); - IntStream.range(start, end).forEach(n -> ex.put(n, map.get(n))); - return ex; - } + public Map getAllByAuthor(String author) { + if (remote.isEmpty()) { + return null; + } + TreeMap byAuthor = new TreeMap<>(); + boolean first = true; + for (CloudExpansion ex : remote.values()) { + if (ex.getAuthor().equalsIgnoreCase(author)) { + if (first) { + first = false; + byAuthor.put(0, ex); + } else { + byAuthor.put(byAuthor.lastKey() + 1, ex); + } + } + } - public void fetch() { - - plugin.getLogger().info("Fetching available expansion information..."); - - new BukkitRunnable() { - - @Override - public void run() { - - StringBuilder sb; - - try { - - URL site = new URL(API); - - HttpURLConnection connection = (HttpURLConnection) site.openConnection(); - - connection.setRequestMethod("GET"); - - connection.connect(); - - BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream())); - - sb = new StringBuilder(); - - String line; - - while ((line = br.readLine()) != null) { - sb.append(line); - } - - br.close(); - connection.disconnect(); - - } catch (Exception e) { - return; - } - - String json = sb.toString(); - JSONParser parser = new JSONParser(); - Object obj = null; - - try { - obj = parser.parse(json); - } catch (ParseException e) { - e.printStackTrace(); - } - - if (obj == null) { - return; - } - - List unsorted = new ArrayList<>(); - - if (obj instanceof JSONObject) { - - JSONObject jo = (JSONObject) obj; - - for (Object o : jo.keySet()) { - - JSONObject sub = (JSONObject) jo.get(o); - - CloudExpansion ce = gson.fromJson(sub.toJSONString(), CloudExpansion.class); - - if (ce.getLatestVersion() == null || ce.getVersion(ce.getLatestVersion()) == null) { - continue; - } - - ce.setName(o.toString()); - - PlaceholderExpansion ex = plugin.getExpansionManager().getRegisteredExpansion(ce.getName()); - - if (ex != null && ex.isRegistered()) { - ce.setHasExpansion(true); - if (!ex.getVersion().equals(ce.getLatestVersion())) { - ce.setShouldUpdate(true); - } - } - - unsorted.add(ce); - } - - int count = 0; - - unsorted.sort(Comparator.comparing(CloudExpansion::getLastUpdate).reversed()); - - for (CloudExpansion e : unsorted) { - remote.put(count, e); - count++; - } - - plugin.getLogger().info(count + " placeholder expansions are available on the cloud."); - - long updates = getToUpdateCount(); - - if (updates > 0) { - plugin.getLogger().info(updates + " installed expansions have updates available."); - } - } - } - }.runTaskAsynchronously(plugin); - } - - private void download(URL url, String name) throws IOException { - - InputStream is = null; - - FileOutputStream fos = null; - - try { - - URLConnection urlConn = url.openConnection(); - - is = urlConn.getInputStream(); - - fos = new FileOutputStream(dir.getAbsolutePath() + File.separator + "Expansion-" + name + ".jar"); - - byte[] buffer = new byte[is.available()]; - - int l; - - while ((l = is.read(buffer)) > 0) { - fos.write(buffer, 0, l); - } - } finally { - try { - if (is != null) { - is.close(); - } - } finally { - if (fos != null) { - fos.close(); - } - } - } - } - - public void downloadExpansion(final String player, final CloudExpansion ex) { - downloadExpansion(player, ex, ex.getLatestVersion()); + if (byAuthor.isEmpty()) { + return null; + } + return byAuthor; } - - public void downloadExpansion(final String player, final CloudExpansion ex, final String version) { - - if (downloading.contains(ex.getName())) { - return; - } - final CloudExpansion.Version ver = ex.getVersions() - .stream() - .filter(v -> v.getVersion().equals(version)) - .findFirst() - .orElse(null); + public Map getAllInstalled() { + if (remote.isEmpty()) { + return null; + } + TreeMap has = new TreeMap<>(); + boolean first = true; + for (CloudExpansion ex : remote.values()) { + if (ex.hasExpansion()) { + if (first) { + first = false; + has.put(1, ex); + } else { + has.put(has.lastKey() + 1, ex); + } + } + } - - if (ver == null) { - return; - } - - downloading.add(ex.getName()); - - plugin.getLogger().info("Attempting download of expansion: " + ex.getName() + (player != null ? " by user: " + player : "") + " from url: " + ver.getUrl()); + if (has.isEmpty()) { + return null; + } + return has; + } - Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + public int getPagesAvailable(Map map, int amount) { + if (map == null) { + return 0; + } + int pages = map.size() > 0 ? 1 : 0; + if (pages == 0) { + return pages; + } + if (map.size() > amount) { + pages = map.size() / amount; + if (map.size() % amount > 0) { + pages++; + } + } + return pages; + } + + public Map getPage(Map map, int page, int size) { + if (map == null || map.size() == 0 || page > getPagesAvailable(map, size)) { + return null; + } + int end = size * page; + int start = end - size; + TreeMap ex = new TreeMap<>(); + IntStream.range(start, end).forEach(n -> ex.put(n, map.get(n))); + return ex; + } + + public void fetch(boolean allowUnverified) { + + plugin.getLogger().info("Fetching available expansion information..."); + + new BukkitRunnable() { + + @Override + public void run() { + + StringBuilder sb; + + try { + + URL site = new URL(API); + + HttpURLConnection connection = (HttpURLConnection) site.openConnection(); + + connection.setRequestMethod("GET"); + + connection.connect(); + + BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream())); + + sb = new StringBuilder(); + + String line; + + while ((line = br.readLine()) != null) { + sb.append(line); + } + + br.close(); + connection.disconnect(); + + } catch (Exception e) { + return; + } + + String json = sb.toString(); + JSONParser parser = new JSONParser(); + Object obj = null; + + try { + obj = parser.parse(json); + } catch (ParseException e) { + e.printStackTrace(); + } + + if (obj == null) { + return; + } + + List unsorted = new ArrayList<>(); + + if (obj instanceof JSONObject) { + + JSONObject jo = (JSONObject) obj; + + for (Object o : jo.keySet()) { + + JSONObject sub = (JSONObject) jo.get(o); + + CloudExpansion ce = gson.fromJson(sub.toJSONString(), CloudExpansion.class); + + if (!allowUnverified && !ce.isVerified()) { + continue; + } + + if (ce.getLatestVersion() == null || ce.getVersion(ce.getLatestVersion()) == null) { + continue; + } + + ce.setName(o.toString()); + + PlaceholderExpansion ex = plugin.getExpansionManager().getRegisteredExpansion(ce.getName()); + + if (ex != null && ex.isRegistered()) { + ce.setHasExpansion(true); + if (!ex.getVersion().equals(ce.getLatestVersion())) { + ce.setShouldUpdate(true); + } + } + + unsorted.add(ce); + } + + int count = 0; + + unsorted.sort(Comparator.comparing(CloudExpansion::getLastUpdate).reversed()); + + for (CloudExpansion e : unsorted) { + remote.put(count, e); + count++; + } + + plugin.getLogger().info(count + " placeholder expansions are available on the cloud."); + + long updates = getToUpdateCount(); + + if (updates > 0) { + plugin.getLogger().info(updates + " installed expansions have updates available."); + } + } + } + }.runTaskAsynchronously(plugin); + } + + private void download(URL url, String name) throws IOException { + + InputStream is = null; + + FileOutputStream fos = null; + + try { + + URLConnection urlConn = url.openConnection(); + + is = urlConn.getInputStream(); + + fos = new FileOutputStream(dir.getAbsolutePath() + File.separator + "Expansion-" + name + ".jar"); + + byte[] buffer = new byte[is.available()]; + + int l; + + while ((l = is.read(buffer)) > 0) { + fos.write(buffer, 0, l); + } + } finally { + try { + if (is != null) { + is.close(); + } + } finally { + if (fos != null) { + fos.close(); + } + } + } + } + + public void downloadExpansion(final String player, final CloudExpansion ex) { + downloadExpansion(player, ex, ex.getLatestVersion()); + } + + public void downloadExpansion(final String player, final CloudExpansion ex, final String version) { + + if (downloading.contains(ex.getName())) { + return; + } + + final CloudExpansion.Version ver = ex.getVersions() + .stream() + .filter(v -> v.getVersion().equals(version)) + .findFirst() + .orElse(null); + + if (ver == null) { + return; + } + + downloading.add(ex.getName()); + + plugin.getLogger().info("Attempting download of expansion: " + ex.getName() + (player != null ? " by user: " + player : "") + " from url: " + ver.getUrl()); + + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { try { @@ -367,5 +369,5 @@ public class ExpansionCloudManager { }); }); - } + } }