Make the purge progress run more balanced (Fixes #696)

2016-05-09 13:09:40 +02:00
parent b728b297b8
commit 0bd6ac5cc8
10 changed files with 255 additions and 115 deletions
@@ -0,0 +1,151 @@
+package fr.xephi.authme.task;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.properties.PurgeSettings;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class PurgeTask extends BukkitRunnable {
+
+    //how many players we should check for each tick
+    private static final int INTERVALL_CHECK = 5;
+
+    private final AuthMe plugin;
+    private final NewSetting newSetting;
+
+    private final UUID sender;
+    private final Set<String> toPurge;
+
+    private final boolean autoPurging;
+    private final int totalPurgeCount;
+
+    private int currentPage = 0;
+
+    public PurgeTask(AuthMe plugin, NewSetting newSetting, CommandSender sender, Set<String> purged) {
+        this(plugin, newSetting, sender, purged, false);
+    }
+
+    public PurgeTask(AuthMe plugin, NewSetting newSetting, CommandSender sender, Set<String> purged
+            , boolean autoPurging) {
+        this.plugin = plugin;
+        this.newSetting = newSetting;
+
+        if (sender instanceof Player) {
+            this.sender = ((Player) sender).getUniqueId();
+        } else {
+            this.sender = null;
+        }
+
+        this.toPurge = purged;
+        this.totalPurgeCount = purged.size();
+        this.autoPurging = autoPurging;
+
+        //this is commented out because I assume all players in the database already have an lowercase name
+//        toPurge = new HashSet<>(purged.size());
+        //make a new list with lowercase names to make the username test based on a hash
+//        for (String username : purged) {
+//            toPurge.add(username.toLowerCase());
+//        }
+    }
+
+    @Override
+    public void run() {
+        if (toPurge.isEmpty()) {
+            //everything was removed
+            finish();
+            return;
+        }
+
+        Set<OfflinePlayer> playerPortion = new HashSet<OfflinePlayer>(INTERVALL_CHECK);
+        Set<String> namePortion = new HashSet<String>(INTERVALL_CHECK);
+        OfflinePlayer[] offlinePlayers = Bukkit.getOfflinePlayers();
+        for (int i = 0; i < INTERVALL_CHECK; i++) {
+            int nextPosition = (currentPage * INTERVALL_CHECK) + i;
+            if (offlinePlayers.length >= nextPosition) {
+                //no more offline players on this page
+                break;
+            }
+
+            OfflinePlayer offlinePlayer = offlinePlayers[nextPosition];
+            String offlineName = offlinePlayer.getName();
+            //remove to speed up later lookups
+            if (toPurge.remove(offlineName.toLowerCase())) {
+                playerPortion.add(offlinePlayer);
+                namePortion.add(offlinePlayer.getName());
+            }
+        }
+
+        if (!toPurge.isEmpty() && playerPortion.isEmpty()) {
+            ConsoleLogger.info("Finished lookup up offlinePlayers. Begin looking purging player names only");
+
+            //we went through all offlineplayers but there are still names remaining
+            namePortion.addAll(toPurge);
+            toPurge.clear();
+        }
+
+        currentPage++;
+        purgeData(playerPortion, namePortion);
+        if (currentPage % 20 == 0) {
+            int completed = totalPurgeCount - toPurge.size();
+            sendMessage("[AuthMe] Purge progress " + completed + '/' + totalPurgeCount);
+        }
+    }
+
+    private void purgeData(Set<OfflinePlayer> playerPortion, Set<String> namePortion) {
+        // Purge other data
+        if (newSetting.getProperty(PurgeSettings.REMOVE_ESSENTIALS_FILES)
+                && plugin.getPluginHooks().isEssentialsAvailable()) {
+            plugin.dataManager.purgeEssentials(playerPortion);
+        }
+
+        if (newSetting.getProperty(PurgeSettings.REMOVE_PLAYER_DAT)) {
+            plugin.dataManager.purgeDat(playerPortion);
+        }
+
+        if (newSetting.getProperty(PurgeSettings.REMOVE_LIMITED_CREATIVE_INVENTORIES)) {
+            plugin.dataManager.purgeLimitedCreative(namePortion);
+        }
+
+        if (newSetting.getProperty(PurgeSettings.REMOVE_ANTI_XRAY_FILE)) {
+            plugin.dataManager.purgeAntiXray(namePortion);
+        }
+
+        if (newSetting.getProperty(PurgeSettings.REMOVE_PERMISSIONS)) {
+            plugin.dataManager.purgePermissions(playerPortion);
+        }
+    }
+
+    private void finish() {
+        cancel();
+
+        // Show a status message
+        sendMessage(ChatColor.GREEN + "[AuthMe] Database has been purged correctly");
+
+        ConsoleLogger.info("AutoPurge Finished!");
+        if (autoPurging) {
+            plugin.notifyAutoPurgeEnd();
+        }
+    }
+
+    private void sendMessage(String message) {
+        if (sender == null) {
+            Bukkit.getConsoleSender().sendMessage(message);
+        } else {
+            Player player = Bukkit.getPlayer(sender);
+            if (player != null) {
+                player.sendMessage(message);
+            }
+        }
+    }
+}