Improve AutoPurge feature, #627

src/main/java/fr/xephi/authme/DataManager.java

@@ -2,18 +2,15 @@ package fr.xephi.authme;
 
 import fr.xephi.authme.hooks.PluginHooks;
 import fr.xephi.authme.permission.PermissionsManager;
-import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.PurgeSettings;
 import fr.xephi.authme.util.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 /**
  */
@@ -25,7 +22,7 @@ public class DataManager {
     /**
      * Constructor for DataManager.
      *
-     * @param plugin The plugin instance
+     * @param plugin      The plugin instance
      * @param pluginHooks Plugin hooks instance
      */
     public DataManager(AuthMe plugin, PluginHooks pluginHooks) {
@@ -33,126 +30,83 @@ public class DataManager {
         this.pluginHooks = pluginHooks;
     }
 
-    /**
+    private List<OfflinePlayer> getOfflinePlayers(List<String> names) {
-     * Method getOfflinePlayer.
+        List<OfflinePlayer> result = new ArrayList<>();
-     *
+        for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
-     * @param name String
+            for (String name : names) {
-     *
+                if (name.equalsIgnoreCase(op.getName())) {
-     * @return OfflinePlayer
+                    result.add(op);
-     */
-    private synchronized OfflinePlayer getOfflinePlayer(final String name) {
-        ExecutorService executor = Executors.newSingleThreadExecutor();
-        Future<OfflinePlayer> result = executor.submit(new Callable<OfflinePlayer>() {
-
-            public synchronized OfflinePlayer call() throws Exception {
-                OfflinePlayer result = null;
-                try {
-                    for (OfflinePlayer op : Bukkit.getOfflinePlayers())
-                        if (op.getName().equalsIgnoreCase(name)) {
-                            result = op;
-                            break;
-                        }
-                } catch (Exception ignored) {
                 }
-                return result;
             }
-        });
-        try {
-            return result.get();
-        } catch (Exception e) {
-            return null;
-        } finally {
-            executor.shutdown();
         }
+        return result;
     }
 
-    /**
+    public void purgeAntiXray(List<String> cleared) {
-     * Method purgeAntiXray.
-     *
-     * @param cleared List of String
-     */
-    public synchronized void purgeAntiXray(List<String> cleared) {
         int i = 0;
-        for (String name : cleared) {
+        File dataFolder = new File("." + File.separator + "plugins" + File.separator + "AntiXRayData"
-            try {
+            + File.separator + "PlayerData");
-                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
+        if (!dataFolder.exists() || !dataFolder.isDirectory()) {
-                if (player == null)
+            return;
-                    continue;
+        }
-                String playerName = player.getName();
+        for (String file : dataFolder.list()) {
-                File playerFile = new File("." + File.separator + "plugins" + File.separator + "AntiXRayData" + File.separator + "PlayerData" + File.separator + playerName);
+            if (cleared.contains(file.toLowerCase())) {
-                if (playerFile.exists()) {
+                File playerFile = new File(dataFolder, file);
-                    playerFile.delete();
+                if (playerFile.exists() && playerFile.delete()) {
                     i++;
                 }
-            } catch (Exception ignored) {
             }
         }
-        ConsoleLogger.info("AutoPurgeDatabase: Removed " + i + " AntiXRayData Files");
+        ConsoleLogger.info("AutoPurge: Removed " + i + " AntiXRayData Files");
     }
 
-    /**
-     * Method purgeLimitedCreative.
-     *
-     * @param cleared List of String
-     */
     public synchronized void purgeLimitedCreative(List<String> cleared) {
         int i = 0;
-        for (String name : cleared) {
+        File dataFolder = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative"
-            try {
+            + File.separator + "inventories");
-                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
+        for (String file : dataFolder.list()) {
-                if (player == null)
+            String name = file;
-                    continue;
+            int idx;
-                String playerName = player.getName();
+            idx = file.lastIndexOf("_creative.yml");
-                File playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + ".yml");
+            if (idx != -1) {
-                if (playerFile.exists()) {
+                name = name.substring(0, idx);
-                    playerFile.delete();
+            } else {
-                    i++;
+                idx = file.lastIndexOf("_adventure.yml");
-                }
+                if (idx != -1) {
-                playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_creative.yml");
+                    name = name.substring(0, idx);
-                if (playerFile.exists()) {
+                } else {
-                    playerFile.delete();
+                    idx = file.lastIndexOf(".yml");
-                    i++;
+                    if (idx != -1) {
-                }
+                        name = name.substring(0, idx);
-                playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_adventure.yml");
-                if (playerFile.exists()) {
-                    playerFile.delete();
-                    i++;
-                }
-            } catch (Exception ignored) {
-            }
-        }
-        ConsoleLogger.info("AutoPurgeDatabase: Removed " + i + " LimitedCreative Survival, Creative and Adventure files");
-    }
-
-    /**
-     * Method purgeDat.
-     *
-     * @param cleared List of String
-     */
-    public synchronized void purgeDat(List<String> cleared) {
-        int i = 0;
-        for (String name : cleared) {
-            try {
-                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
-                if (player == null) {
-                    continue;
-                }
-
-                try {
-                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getUniqueId() + ".dat");
-                    playerFile.delete();
-                    i++;
-                } catch (Exception ignore) {
-                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getName() + ".dat");
-                    if (playerFile.exists()) {
-                        playerFile.delete();
-                        i++;
                     }
                 }
-            } catch (Exception ignore) {
+            }
+            if (name.equals(file)) {
+                continue;
+            }
+            if (cleared.contains(name.toLowerCase())) {
+                File dataFile = new File(dataFolder, file);
+                if (dataFile.exists() && dataFile.delete()) {
+                    i++;
+                }
             }
         }
-        ConsoleLogger.info("AutoPurgeDatabase: Removed " + i + " .dat Files");
+        ConsoleLogger.info("AutoPurge: Removed " + i + " LimitedCreative Survival, Creative and Adventure files");
+    }
+
+    public synchronized void purgeDat(List<String> cleared) {
+        int i = 0;
+        File dataFolder = new File(plugin.getServer().getWorldContainer()
+            + File.separator + plugin.getSettings().getProperty(PurgeSettings.DEFAULT_WORLD)
+            + File.separator + "players");
+        List<OfflinePlayer> offlinePlayers = getOfflinePlayers(cleared);
+        for (OfflinePlayer player : offlinePlayers) {
+            File playerFile = new File(dataFolder, Utils.getUUIDorName(player) + ".dat");
+            if (playerFile.delete()) {
+                i++;
+            }
+        }
+        ConsoleLogger.info("AutoPurge: Removed " + i + " .dat Files");
     }
 
     /**
@@ -169,66 +123,34 @@ public class DataManager {
         }
 
         final File userDataFolder = new File(essentialsDataFolder, "userdata");
-        for (String name : cleared) {
+        List<OfflinePlayer> offlinePlayers = getOfflinePlayers(cleared);
-            try {
+        for (OfflinePlayer player : offlinePlayers) {
-                File playerFile = new File(userDataFolder, plugin.getServer().getOfflinePlayer(name).getUniqueId() + ".yml");
+            File playerFile = new File(userDataFolder, Utils.getUUIDorName(player) + ".yml");
-                playerFile.delete();
+            if (playerFile.exists() && playerFile.delete()) {
                 i++;
-            } catch (Exception e) {
-                File playerFile = new File(userDataFolder, name + ".yml");
-                if (playerFile.exists()) {
-                    playerFile.delete();
-                    i++;
-                }
             }
         }
-        ConsoleLogger.info("AutoPurgeDatabase: Removed " + i + " EssentialsFiles");
+
+        ConsoleLogger.info("AutoPurge: Removed " + i + " EssentialsFiles");
     }
 
     // TODO: What is this method for? Is it correct?
-
+    // TODO: Make it work with OfflinePlayers group data.
-    /**
-     * @param cleared Cleared players.
-     */
     public synchronized void purgePermissions(List<String> cleared) {
         // Get the permissions manager, and make sure it's valid
-        PermissionsManager permsMan = this.plugin.getPermissionsManager();
+        PermissionsManager permsMan = plugin.getPermissionsManager();
         if (permsMan == null) {
             ConsoleLogger.showError("Unable to access permissions manager instance!");
             return;
         }
-
         int i = 0;
         for (String name : cleared) {
-            try {
+            permsMan.removeAllGroups(getOnlinePlayerLower(name));
-                permsMan.removeAllGroups(this.getOnlinePlayerLower(name.toLowerCase()));
+            i++;
-                i++;
-            } catch (Exception ignored) {
-            }
         }
-        ConsoleLogger.info("AutoPurgeDatabase: Removed " + i + "permissions");
+        ConsoleLogger.info("AutoPurge: Removed permissions from " + i + " player(s).");
-
-        /*int i = 0;
-        for (String name : cleared) {
-            try {
-                OfflinePlayer p = this.getOfflinePlayer(name);
-                for (String group : permission.getPlayerGroups((Player) p)) {
-                    permission.playerRemoveGroup(null, p, group);
-                }
-                i++;
-            } catch (Exception e) {
-            }
-        }
-        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " Permissions");*/
     }
 
-    /**
-     * Method getOnlinePlayerLower.
-     *
-     * @param name String
-     *
-     * @return Player
-     */
     private Player getOnlinePlayerLower(String name) {
         name = name.toLowerCase();
         for (Player player : Utils.getOnlinePlayers()) {

src/main/java/fr/xephi/authme/util/Utils.java

@@ -9,10 +9,10 @@ import fr.xephi.authme.events.AuthMeTeleportEvent;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.settings.NewSetting;
 import fr.xephi.authme.settings.Settings;
-
 import fr.xephi.authme.settings.properties.EmailSettings;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
@@ -278,8 +278,16 @@ public final class Utils {
         return false;
     }
 
-    /**
+    public static String getUUIDorName(OfflinePlayer player) {
-     */
+        String uuidOrName;
+        try {
+            uuidOrName = player.getUniqueId().toString();
+        } catch (Exception ignore) {
+            uuidOrName = player.getName();
+        }
+        return uuidOrName;
+    }
+
     public enum GroupType {
         UNREGISTERED,
         REGISTERED,