Removed Saving top ten list message

tastybento · Apr 4, 2018 · 8f751fd · 8f751fd · tastybento · Apr 4, 2018
1 parent de04058
commit 8f751fd
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 7 deletions.
diff --git a/src/com/wasteofplastic/askyblock/AsyncBackup.java b/src/com/wasteofplastic/askyblock/AsyncBackup.java
@@ -14,6 +14,9 @@ public AsyncBackup(final ASkyBlock plugin) {
             public void run() {
                 plugin.getGrid().saveGrid();
                 plugin.getTinyDB().asyncSaveDB();
+                if (plugin.getTopTen() != null) {
+                    plugin.getTopTen().topTenSave();
+                }
             }}, Settings.backupDuration, Settings.backupDuration);
     }
 

diff --git a/src/com/wasteofplastic/askyblock/TopTen.java b/src/com/wasteofplastic/askyblock/TopTen.java
@@ -69,6 +69,7 @@ public class TopTen implements Listener, Requester {
 
     public TopTen(ASkyBlock plugin) {
         this.plugin = plugin;
+        topTenLoad();
     }
 
     /**
@@ -99,8 +100,7 @@ public void topTenAddEntry(UUID ownerUUID, long l) {
             }
         }
         topTenList.put(ownerUUID, l);
-        topTenList = topTenList.entrySet().stream()
-        .sorted(Collections.reverseOrder(Map.Entry.comparingByValue())).limit(10)
+        topTenList = topTenList.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue())).limit(10)
         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
         // Add head to cache
         if (topTenList.containsKey(ownerUUID) && !topTenHeads.containsKey(ownerUUID)) {
@@ -203,13 +203,12 @@ public void topTenSave() {
         if (topTenList == null) {
             return;
         }
-        plugin.getLogger().info("Saving top ten list");
+        //plugin.getLogger().info("Saving top ten list");
         // Make file
         File topTenFile = new File(plugin.getDataFolder(), "topten.yml");
         // Make configuration
         YamlConfiguration config = new YamlConfiguration();
         // Save config
-
         int rank = 0;
         for (Map.Entry<UUID, Long> m : topTenList.entrySet()) {
             if (rank++ == 10) {
@@ -231,6 +230,7 @@ public void topTenSave() {
      * then the top ten is created
      */
     public void topTenLoad() {
+        plugin.getLogger().info("Loading Top Ten");
         topTenList.clear();
         // Check to see if the top ten list exists
         File topTenFile = new File(plugin.getDataFolder(), "topten.yml");
@@ -243,12 +243,9 @@ public void topTenLoad() {
             // Load the values
             if (topTenConfig.isSet("topten")) {
                 for (String playerUUID : topTenConfig.getConfigurationSection("topten").getKeys(false)) {
-                    // getLogger().info(playerUUID);
                     try {
                         UUID uuid = UUID.fromString(playerUUID);
-                        // getLogger().info(uuid.toString());
                         int level = topTenConfig.getInt("topten." + playerUUID);
-                        // getLogger().info("Level = " + level);
                         topTenAddEntry(uuid, level);
                     } catch (Exception e) {
                         e.printStackTrace();

diff --git a/src/com/wasteofplastic/askyblock/commands/AdminCmd.java b/src/com/wasteofplastic/askyblock/commands/AdminCmd.java
@@ -22,6 +22,9 @@
 import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -49,6 +52,7 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -1361,6 +1365,11 @@ else if (split[0].equalsIgnoreCase("deleteisland")) {
                     countUnowned(sender);
                     return true;
                 }
+
+                if (split[1].equalsIgnoreCase("players")) {
+                    purgePlayers(sender);
+                    return true;
+                }
                 // Set the flag
                 purgeFlag = true;
                 // See if this purge unowned
@@ -2131,6 +2140,53 @@ else if (split[0].equalsIgnoreCase("purge")) {
         }
     }
 
+    private void purgePlayers(CommandSender sender) {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+         // This map is a list of owner and island level
+            YamlConfiguration player = new YamlConfiguration();
+            File oldPlayers = new File(plugin.getPlayersFolder(), "oldplayers");
+            if (!oldPlayers.exists()) {
+                oldPlayers.mkdirs();
+            }
+            Path targetPath = oldPlayers.toPath();
+            int index = 0;
+            for (final File f : plugin.getPlayersFolder().listFiles()) {
+                // Need to remove the .yml suffix
+                String fileName = f.getName();
+                if (fileName.endsWith(".yml")) {
+                    try {
+                        player.load(f);
+                        index++;
+                        if (index % 1000 == 0) {
+                            plugin.getLogger().info("Processed " + index + " players");
+                        }
+                        if (!player.getBoolean("hasIsland") && !player.getBoolean("hasTeam")) {
+                            Path fileToMovePath = f.toPath();
+                            Files.move(fileToMovePath, targetPath.resolve(fileToMovePath.getFileName()));
+                        }
+                    } catch (Exception e) {
+                        plugin.getLogger().severe("Error when moving player file. File is " + fileName);
+                        plugin.getLogger().severe("Look at the stack trace and edit the file - it probably has broken YAML in it for some reason.");
+                        e.printStackTrace();
+                    }
+                }
+            }
+            plugin.getLogger().info("Processed " + index + " players for top ten");
+
+            plugin.getServer().getScheduler().runTask(plugin, new Runnable() {
+                @Override
+                public void run() {
+                    if (sender != null) {
+                        Util.sendMessage(sender, ChatColor.GREEN + plugin.myLocale().generalSuccess);
+                    } else {
+                        plugin.getLogger().warning("Completed player purge.");
+                    }
+
+                }});
+        });
+
+    }
+
     /**
      * Deletes the overworld and nether islands together
      * @param island