worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove console only commands - closes #137

Browse Source
This commit is contained in:
Luck
2017-01-19 20:39:09 +00:00
Unverified
parent a152cc47c7
commit 2e16844141
15 changed files with 173 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java
+14 -9
View File
@@ -22,13 +22,13 @@
package me.lucko.luckperms.sponge.migration;
import me.lucko.luckperms.api.Logger;
import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.common.commands.CommandException;
import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.common.commands.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.User;
@@ -44,6 +44,7 @@ import java.lang.reflect.Method;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.function.Consumer;
import static me.lucko.luckperms.sponge.migration.MigrationUtils.migrateSubject;
@@ -54,11 +55,15 @@ public class MigrationPermissionManager extends SubCommand<Object> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List<String> args, String label) throws CommandException {
final Logger log = plugin.getLog();
Consumer<String> log = s -> {
Message.MIGRATION_LOG.send(sender, s);
Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s);
};
log.accept("Starting PermissionManager migration.");
Optional<PluginContainer> pm = Sponge.getPluginManager().getPlugin("permissionmanager");
if (!pm.isPresent()) {
log.severe("PermissionManager Migration: Error -> PermissionManager is not loaded.");
log.accept("Error -> PermissionManager is not loaded.");
return CommandResult.STATE_ERROR;
}
@@ -75,7 +80,7 @@ public class MigrationPermissionManager extends SubCommand<Object> {
}
// Migrate groups
log.info("PermissionManager Migration: Starting group migration.");
log.accept("Starting group migration.");
// Forcefully load all groups.
try {
@@ -97,10 +102,10 @@ public class MigrationPermissionManager extends SubCommand<Object> {
migrateSubject(pmGroup, group);
plugin.getStorage().saveGroup(group);
}
log.info("PermissionManager Migration: Migrated " + groupCount + " groups");
log.accept("Migrated " + groupCount + " groups");
// Migrate users
log.info("PermissionManager Migration: Starting user migration.");
log.accept("Starting user migration.");
// Forcefully load all users.
try {
@@ -115,7 +120,7 @@ public class MigrationPermissionManager extends SubCommand<Object> {
userCount++;
UUID uuid = Util.parseUuid(pmUser.getIdentifier());
if (uuid == null) {
log.severe("PermissionManager Migration: Error -> Could not parse UUID for user: " + pmUser.getIdentifier());
log.accept("Error -> Could not parse UUID for user: " + pmUser.getIdentifier());
continue;
}
@@ -127,8 +132,8 @@ public class MigrationPermissionManager extends SubCommand<Object> {
plugin.getUserManager().cleanup(user);
}
log.info("PermissionManager Migration: Migrated " + userCount + " users.");
log.info("PermissionManager Migration: Success! Completed without any errors.");
log.accept("Migrated " + userCount + " users.");
log.accept("Success! Completed without any errors.");
return CommandResult.SUCCESS;
}
}
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java
+17 -11
View File
@@ -22,13 +22,13 @@
package me.lucko.luckperms.sponge.migration;
import me.lucko.luckperms.api.Logger;
import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.common.commands.CommandException;
import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.common.commands.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.Track;
@@ -51,6 +51,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.TreeMap;
import java.util.UUID;
import java.util.function.Consumer;
import static me.lucko.luckperms.sponge.migration.MigrationUtils.migrateSubject;
@@ -61,12 +62,17 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List<String> args, String label) throws CommandException {
final Logger log = plugin.getLog();
Consumer<String> log = s -> {
Message.MIGRATION_LOG.send(sender, s);
Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s);
};
log.accept("Starting PermissionsEx migration.");
final LuckPermsService lpService = ((LPSpongePlugin) plugin).getService();
Optional<PluginContainer> pex = Sponge.getPluginManager().getPlugin("permissionsex");
if (!pex.isPresent()) {
log.severe("PermissionsEx Migration: Error -> PermissionsEx is not loaded.");
log.accept("Error -> PermissionsEx is not loaded.");
return CommandResult.STATE_ERROR;
}
@@ -86,7 +92,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
Map<String, TreeMap<Integer, String>> tracks = new HashMap<>();
// Migrate groups
log.info("PermissionsEx Migration: Starting group migration.");
log.accept("Starting group migration.");
int groupCount = 0;
for (Subject pexGroup : pexService.getGroupSubjects().getAllSubjects()) {
groupCount++;
@@ -115,10 +121,10 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
}
}
log.info("PermissionsEx Migration: Migrated " + groupCount + " groups");
log.accept("Migrated " + groupCount + " groups");
// Migrate tracks
log.info("PermissionsEx Migration: Starting track migration.");
log.accept("Starting track migration.");
for (Map.Entry<String, TreeMap<Integer, String>> e : tracks.entrySet()) {
plugin.getStorage().createAndLoadTrack(e.getKey()).join();
Track track = plugin.getTrackManager().getIfLoaded(e.getKey());
@@ -131,16 +137,16 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
}
}
}
log.info("PermissionsEx Migration: Migrated " + tracks.size() + " tracks");
log.accept("Migrated " + tracks.size() + " tracks");
// Migrate users
log.info("PermissionsEx Migration: Starting user migration.");
log.accept("Starting user migration.");
int userCount = 0;
for (Subject pexUser : pexService.getUserSubjects().getAllSubjects()) {
userCount++;
UUID uuid = Util.parseUuid(pexUser.getIdentifier());
if (uuid == null) {
log.severe("PermissionsEx Migration: Error -> Could not parse UUID for user: " + pexUser.getIdentifier());
log.accept("Error -> Could not parse UUID for user: " + pexUser.getIdentifier());
continue;
}
@@ -152,8 +158,8 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
plugin.getUserManager().cleanup(user);
}
log.info("PermissionsEx Migration: Migrated " + userCount + " users.");
log.info("PermissionsEx Migration: Success! Completed without any errors.");
log.accept("Migrated " + userCount + " users.");
log.accept("Success! Completed without any errors.");
return CommandResult.SUCCESS;
}
}