diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java index 2ad44ba20..b3f63f18c 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java @@ -39,6 +39,7 @@ import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.commands.migration.MigrationUtils; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; +import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.User; @@ -77,7 +78,7 @@ public class MigrationBPermissions extends SubCommand { @Override public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) { - ProgressLogger log = new ProgressLogger("bPermissions"); + ProgressLogger log = new ProgressLogger(Message.MIGRATION_LOG, Message.MIGRATION_LOG_PROGRESS, "bPermissions"); log.addListener(plugin.getConsoleSender()); log.addListener(sender); @@ -117,7 +118,7 @@ public class MigrationBPermissions extends SubCommand { AtomicInteger userLoadCount = new AtomicInteger(0); for (String user : users) { world.loadOne(user, CalculableType.USER); - log.logProgress("Forcefully loaded {} users so far.", userLoadCount.incrementAndGet()); + log.logProgress("Forcefully loaded {} users so far.", userLoadCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); } } log.log("Forcefully loaded all users."); @@ -168,7 +169,7 @@ public class MigrationBPermissions extends SubCommand { plugin.getStorage().saveUser(lpUser); plugin.getUserManager().cleanup(lpUser); - log.logProgress("Migrated {} users so far.", userCount.incrementAndGet()); + log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); }); log.log("Migrated " + userCount.get() + " users in world " + world.getName() + "."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java index 94a469902..1d79516d6 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java @@ -34,6 +34,7 @@ import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.commands.migration.MigrationUtils; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; +import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.UserIdentifier; @@ -70,7 +71,7 @@ public class MigrationGroupManager extends SubCommand { @Override public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) { - ProgressLogger log = new ProgressLogger("GroupManager"); + ProgressLogger log = new ProgressLogger(Message.MIGRATION_LOG, Message.MIGRATION_LOG_PROGRESS, "GroupManager"); log.addListener(plugin.getConsoleSender()); log.addListener(sender); @@ -210,7 +211,7 @@ public class MigrationGroupManager extends SubCommand { } } - log.logProgress("Migrated {} users so far in world " + world, userWorldCount.incrementAndGet()); + log.logProgress("Migrated {} users so far in world " + world, userWorldCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); }); log.log("Migrated " + userWorldCount.get() + " users in world " + world); }); @@ -250,7 +251,7 @@ public class MigrationGroupManager extends SubCommand { plugin.getStorage().saveUser(user); plugin.getUserManager().cleanup(user); - log.logProgress("Migrated {} users so far.", userCount.incrementAndGet()); + log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); }); log.log("Migrated " + userCount.get() + " users."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsBukkit.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsBukkit.java index b04298d98..a32436c18 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsBukkit.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsBukkit.java @@ -34,6 +34,7 @@ import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.commands.migration.MigrationUtils; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; +import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.User; @@ -59,7 +60,7 @@ public class MigrationPermissionsBukkit extends SubCommand { @Override public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) { - ProgressLogger log = new ProgressLogger("PermissionsBukkit"); + ProgressLogger log = new ProgressLogger(Message.MIGRATION_LOG, Message.MIGRATION_LOG_PROGRESS, "PermissionsBukkit"); log.addListener(plugin.getConsoleSender()); log.addListener(sender); @@ -114,7 +115,7 @@ public class MigrationPermissionsBukkit extends SubCommand { plugin.getUserManager().cleanup(lpUser); plugin.getStorage().saveUser(lpUser); - log.logProgress("Migrated {} users so far.", userCount.incrementAndGet()); + log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); }); log.log("Migrated " + userCount.get() + " users."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java index 2fd5c8f80..76312e8b6 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java @@ -34,6 +34,7 @@ import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.commands.migration.MigrationUtils; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; +import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.Track; @@ -93,7 +94,7 @@ public class MigrationPermissionsEx extends SubCommand { @SuppressWarnings("deprecation") @Override public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) { - ProgressLogger log = new ProgressLogger("PermissionsEx"); + ProgressLogger log = new ProgressLogger(Message.MIGRATION_LOG, Message.MIGRATION_LOG_PROGRESS, "PermissionsEx"); log.addListener(plugin.getConsoleSender()); log.addListener(sender); @@ -176,7 +177,7 @@ public class MigrationPermissionsEx extends SubCommand { plugin.getUserManager().cleanup(lpUser); plugin.getStorage().saveUser(lpUser); - log.logProgress("Migrated {} users so far.", userCount.incrementAndGet()); + log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); }); log.log("Migrated " + userCount.get() + " users."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java index d9d10e78e..510f91a46 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java @@ -42,6 +42,7 @@ import me.lucko.luckperms.common.commands.migration.MigrationUtils; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; +import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; @@ -77,7 +78,7 @@ public class MigrationPowerfulPerms extends SubCommand { @Override public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) { - ProgressLogger log = new ProgressLogger("PowerfulPerms"); + ProgressLogger log = new ProgressLogger(Message.MIGRATION_LOG, Message.MIGRATION_LOG_PROGRESS, "PowerfulPerms"); log.addListener(plugin.getConsoleSender()); log.addListener(sender); @@ -264,7 +265,7 @@ public class MigrationPowerfulPerms extends SubCommand { plugin.getUserManager().cleanup(user); plugin.getStorage().saveUser(user); - log.logProgress("Migrated {} users so far.", userCount.incrementAndGet()); + log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); }); log.log("Migrated " + userCount.get() + " users."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java index 07ef6f822..e966b41bd 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java @@ -34,6 +34,7 @@ import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.commands.migration.MigrationUtils; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; +import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.Track; @@ -70,7 +71,7 @@ public class MigrationZPermissions extends SubCommand { @Override public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) { - ProgressLogger log = new ProgressLogger("zPermissions"); + ProgressLogger log = new ProgressLogger(Message.MIGRATION_LOG, Message.MIGRATION_LOG_PROGRESS, "zPermissions"); log.addListener(plugin.getConsoleSender()); log.addListener(sender); @@ -182,7 +183,7 @@ public class MigrationZPermissions extends SubCommand { plugin.getUserManager().cleanup(user); plugin.getStorage().saveUser(user); - log.logProgress("Migrated {} users so far.", userCount.incrementAndGet()); + log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); }); log.log("Migrated " + userCount.get() + " users."); diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java b/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java index 88c831390..71a205a5b 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java @@ -32,6 +32,7 @@ import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.commands.migration.MigrationUtils; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; +import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; @@ -57,7 +58,7 @@ public class MigrationBungeePerms extends SubCommand { @Override public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) { - ProgressLogger log = new ProgressLogger("BungeePerms"); + ProgressLogger log = new ProgressLogger(Message.MIGRATION_LOG, Message.MIGRATION_LOG_PROGRESS, "BungeePerms"); log.addListener(plugin.getConsoleSender()); log.addListener(sender); @@ -118,7 +119,7 @@ public class MigrationBungeePerms extends SubCommand { plugin.getStorage().saveUser(user); plugin.getUserManager().cleanup(user); - log.logProgress("Migrated {} users so far.", userCount.incrementAndGet()); + log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); }); log.log("Migrated " + userCount.get() + " users."); diff --git a/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java b/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java index 530381c8e..6cac495fb 100644 --- a/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java +++ b/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java @@ -88,7 +88,7 @@ public class Exporter implements Runnable { this.filePath = filePath; this.includeUsers = includeUsers; - this.log = new ProgressLogger(null, Message.EXPORT_LOG, Message.EXPORT_LOG_PROGRESS); + this.log = new ProgressLogger(Message.EXPORT_LOG, Message.EXPORT_LOG_PROGRESS, null); this.log.addListener(plugin.getConsoleSender()); this.log.addListener(executor); } diff --git a/common/src/main/java/me/lucko/luckperms/common/util/ProgressLogger.java b/common/src/main/java/me/lucko/luckperms/common/util/ProgressLogger.java index 740be15bd..43201e559 100644 --- a/common/src/main/java/me/lucko/luckperms/common/util/ProgressLogger.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/ProgressLogger.java @@ -32,59 +32,58 @@ import java.util.HashSet; import java.util.Set; public class ProgressLogger { - private static final int NOTIFY_FREQUENCY = 500; + public static final int DEFAULT_NOTIFY_FREQUENCY = 500; - private final String pluginName; private final Message logMessage; private final Message logProgressMessage; + private final String logPrefixParam; private final Set listeners = new HashSet<>(); - public ProgressLogger(String pluginName) { - this(pluginName, Message.MIGRATION_LOG, Message.MIGRATION_LOG_PROGRESS); - } - - public ProgressLogger(String pluginName, Message logMessage, Message logProgressMessage) { - this.pluginName = pluginName; + public ProgressLogger(Message logMessage, Message logProgressMessage, String logPrefixParam) { this.logMessage = logMessage; this.logProgressMessage = logProgressMessage; + this.logPrefixParam = logPrefixParam; } public void addListener(Sender sender) { this.listeners.add(sender); } + public Set getListeners() { + return this.listeners; + } + public void log(String msg) { - if (this.pluginName == null) { - this.listeners.forEach(s -> this.logMessage.send(s, msg)); - } else { - this.listeners.forEach(s -> this.logMessage.send(s, this.pluginName, msg)); - } + dispatchMessage(this.logMessage, msg); } public void logError(String msg) { - if (this.pluginName == null) { - this.listeners.forEach(s -> this.logMessage.send(s, "Error -> " + msg)); - } else { - this.listeners.forEach(s -> this.logMessage.send(s, this.pluginName, "Error -> " + msg)); - } + dispatchMessage(this.logMessage, "Error -> " + msg); } public void logAllProgress(String msg, int amount) { - if (this.pluginName == null) { - this.listeners.forEach(s -> this.logProgressMessage.send(s, msg.replace("{}", Integer.toString(amount)))); - } else { - this.listeners.forEach(s -> this.logProgressMessage.send(s, this.pluginName, msg.replace("{}", Integer.toString(amount)))); - } + dispatchMessage(this.logProgressMessage, msg.replace("{}", Integer.toString(amount))); } - public void logProgress(String msg, int amount) { - if (amount % NOTIFY_FREQUENCY == 0) { + public void logProgress(String msg, int amount, int notifyFrequency) { + if (amount % notifyFrequency == 0) { logAllProgress(msg, amount); } } - public Set getListeners() { - return this.listeners; + private Object[] formParams(String content) { + if (this.logPrefixParam != null) { + return new Object[]{this.logPrefixParam, content}; + } else { + return new Object[]{content}; + } + } + + private void dispatchMessage(Message messageType, String content) { + Object[] params = formParams(content); + for (Sender s : this.listeners) { + messageType.send(s, params); + } } }