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

Cleanup all migration commands - closes #63

Browse Source
This commit is contained in:
Luck
2017-02-01 18:41:15 +00:00
Unverified
parent f7b281f655
commit 9cee319ed9
11 changed files with 576 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java
+35 -21
View File
@@ -25,26 +25,29 @@ package me.lucko.luckperms.sponge.migration;
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.migration.MigrationLogger;
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;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.service.LuckPermsService;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.plugin.PluginContainer;
import org.spongepowered.api.service.permission.PermissionService;
import org.spongepowered.api.service.permission.Subject;
import org.spongepowered.api.service.permission.SubjectCollection;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.function.Consumer;
import java.util.concurrent.atomic.AtomicInteger;
import static me.lucko.luckperms.sponge.migration.MigrationUtils.migrateSubject;
@@ -55,17 +58,17 @@ public class MigrationPermissionManager extends SubCommand<Object> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List<String> args, String label) throws CommandException {
Consumer<String> log = s -> {
Message.MIGRATION_LOG.send(sender, s);
if (!sender.isConsole()) {
Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s);
}
};
log.accept("Starting PermissionManager migration.");
MigrationLogger log = new MigrationLogger("PermissionManager");
log.addListener(plugin.getConsoleSender());
log.addListener(sender);
log.log("Starting.");
final LuckPermsService lpService = ((LPSpongePlugin) plugin).getService();
Optional<PluginContainer> pm = Sponge.getPluginManager().getPlugin("permissionmanager");
if (!pm.isPresent()) {
log.accept("Error -> PermissionManager is not loaded.");
log.logErr("Plugin not loaded.");
return CommandResult.STATE_ERROR;
}
@@ -81,8 +84,18 @@ public class MigrationPermissionManager extends SubCommand<Object> {
return CommandResult.FAILURE;
}
// Migrate defaults
log.log("Migrating default subjects.");
for (SubjectCollection collection : pmService.getKnownSubjects().values()) {
MigrationUtils.migrateSubjectData(
collection.getDefaults().getSubjectData(),
lpService.getSubjects("defaults").get(collection.getIdentifier()).getSubjectData()
);
}
MigrationUtils.migrateSubjectData(pmService.getDefaults().getSubjectData(), lpService.getDefaults().getSubjectData());
// Migrate groups
log.accept("Starting group migration.");
log.log("Starting group migration.");
// Forcefully load all groups.
try {
@@ -92,10 +105,8 @@ public class MigrationPermissionManager extends SubCommand<Object> {
t.printStackTrace();
}
int groupCount = 0;
AtomicInteger groupCount = new AtomicInteger(0);
for (Subject pmGroup : pmService.getGroupSubjects().getAllSubjects()) {
groupCount++;
String pmName = MigrationUtils.convertGroupName(pmGroup.getIdentifier().toLowerCase());
// Make a LuckPerms group for the one being migrated
@@ -103,11 +114,13 @@ public class MigrationPermissionManager extends SubCommand<Object> {
Group group = plugin.getGroupManager().getIfLoaded(pmName);
migrateSubject(pmGroup, group);
plugin.getStorage().saveGroup(group);
log.logAllProgress("Migrated {} groups so far.", groupCount.incrementAndGet());
}
log.accept("Migrated " + groupCount + " groups");
log.log("Migrated " + groupCount.get() + " groups");
// Migrate users
log.accept("Starting user migration.");
log.log("Starting user migration.");
// Forcefully load all users.
try {
@@ -117,12 +130,11 @@ public class MigrationPermissionManager extends SubCommand<Object> {
t.printStackTrace();
}
int userCount = 0;
AtomicInteger userCount = new AtomicInteger(0);
for (Subject pmUser : pmService.getUserSubjects().getAllSubjects()) {
userCount++;
UUID uuid = Util.parseUuid(pmUser.getIdentifier());
if (uuid == null) {
log.accept("Error -> Could not parse UUID for user: " + pmUser.getIdentifier());
log.logErr("Could not parse UUID for user: " + pmUser.getIdentifier());
continue;
}
@@ -135,10 +147,12 @@ public class MigrationPermissionManager extends SubCommand<Object> {
migrateSubject(pmUser, user);
plugin.getStorage().saveUser(user);
plugin.getUserManager().cleanup(user);
log.logProgress("Migrated {} users so far.", userCount.incrementAndGet());
}
log.accept("Migrated " + userCount + " users.");
log.accept("Success! Completed without any errors.");
log.log("Migrated " + userCount.get() + " users.");
log.log("Success! Migration complete.");
return CommandResult.SUCCESS;
}
}
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java
+22 -24
View File
@@ -25,9 +25,9 @@ package me.lucko.luckperms.sponge.migration;
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.migration.MigrationLogger;
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,7 +51,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.TreeMap;
import java.util.UUID;
import java.util.function.Consumer;
import java.util.concurrent.atomic.AtomicInteger;
import static me.lucko.luckperms.sponge.migration.MigrationUtils.migrateSubject;
@@ -62,19 +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 {
Consumer<String> log = s -> {
Message.MIGRATION_LOG.send(sender, s);
if (!sender.isConsole()) {
Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s);
}
};
log.accept("Starting PermissionsEx migration.");
MigrationLogger log = new MigrationLogger("PermissionsEx");
log.addListener(plugin.getConsoleSender());
log.addListener(sender);
log.log("Starting.");
final LuckPermsService lpService = ((LPSpongePlugin) plugin).getService();
Optional<PluginContainer> pex = Sponge.getPluginManager().getPlugin("permissionsex");
if (!pex.isPresent()) {
log.accept("Error -> PermissionsEx is not loaded.");
log.logErr("Plugin not loaded.");
return CommandResult.STATE_ERROR;
}
@@ -82,23 +80,21 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
PermissionService pexService = (PermissionService) pex.get().getInstance().get();
// Migrate defaults
log.log("Migrating default subjects.");
for (SubjectCollection collection : pexService.getKnownSubjects().values()) {
MigrationUtils.migrateSubjectData(
collection.getDefaults().getSubjectData(),
lpService.getSubjects("defaults").get(collection.getIdentifier()).getSubjectData()
);
}
MigrationUtils.migrateSubjectData(pexService.getDefaults().getSubjectData(), lpService.getDefaults().getSubjectData());
Map<String, TreeMap<Integer, String>> tracks = new HashMap<>();
// Migrate groups
log.accept("Starting group migration.");
int groupCount = 0;
log.log("Starting group migration.");
AtomicInteger groupCount = new AtomicInteger(0);
for (Subject pexGroup : pexService.getGroupSubjects().getAllSubjects()) {
groupCount++;
String pexName = MigrationUtils.convertGroupName(pexGroup.getIdentifier().toLowerCase());
// Make a LuckPerms group for the one being migrated
@@ -122,11 +118,12 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
} catch (NumberFormatException ignored) {}
}
log.logAllProgress("Migrated {} groups so far.", groupCount.incrementAndGet());
}
log.accept("Migrated " + groupCount + " groups");
log.log("Migrated " + groupCount.get() + " groups");
// Migrate tracks
log.accept("Starting track migration.");
log.log("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());
@@ -139,16 +136,15 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
}
}
}
log.accept("Migrated " + tracks.size() + " tracks");
log.log("Migrated " + tracks.size() + " tracks");
// Migrate users
log.accept("Starting user migration.");
int userCount = 0;
log.log("Starting user migration.");
AtomicInteger userCount = new AtomicInteger(0);
for (Subject pexUser : pexService.getUserSubjects().getAllSubjects()) {
userCount++;
UUID uuid = Util.parseUuid(pexUser.getIdentifier());
if (uuid == null) {
log.accept("Error -> Could not parse UUID for user: " + pexUser.getIdentifier());
log.logErr("Could not parse UUID for user: " + pexUser.getIdentifier());
continue;
}
@@ -161,10 +157,12 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
migrateSubject(pexUser, user);
plugin.getStorage().saveUser(user);
plugin.getUserManager().cleanup(user);
log.logProgress("Migrated {} users so far.", userCount.incrementAndGet());
}
log.accept("Migrated " + userCount + " users.");
log.accept("Success! Completed without any errors.");
log.log("Migrated " + userCount.get() + " users.");
log.log("Success! Migration complete.");
return CommandResult.SUCCESS;
}
}