Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-03-02 11:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Refactor /lp import command, better handling when no file extension is provided

Browse Source
This commit is contained in:
Luck 2019-12-21 17:46:37 -05:00
parent 5eb8a262be
commit d80017ba7b
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java
View File

@ -48,6 +48,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
import java.util.zip.GZIPInputStream;
public class ImportCommand extends SingleCommand {
@ -65,10 +66,6 @@ public class ImportCommand extends SingleCommand {
}
String fileName = args.get(0);
if (!fileName.contains(".")) {
fileName += ".json.gz";
}
Path dataDirectory = plugin.getBootstrap().getDataDirectory();
Path path = dataDirectory.resolve(fileName);
@ -77,6 +74,14 @@ public class ImportCommand extends SingleCommand {
return CommandResult.INVALID_ARGS;
}
// try auto adding the '.json.gz' extension
if (!Files.exists(path) && !fileName.contains(".")) {
Path pathWithDefaultExtension = path.resolveSibling(fileName + ".json.gz");
if (Files.exists(pathWithDefaultExtension)) {
path = pathWithDefaultExtension;
}
}
if (!Files.exists(path)) {
Message.IMPORT_FILE_DOESNT_EXIST.send(sender, path.toString());
return CommandResult.INVALID_ARGS;
@ -87,59 +92,55 @@ public class ImportCommand extends SingleCommand {
return CommandResult.FAILURE;
}
if (!fileName.endsWith(".json.gz")) {
// legacy
List<String> commands;
try {
commands = Files.readAllLines(path, StandardCharsets.UTF_8);
} catch (IOException e) {
e.printStackTrace();
Message.IMPORT_FILE_READ_FAILURE.send(sender);
return CommandResult.FAILURE;
}
if (!this.running.compareAndSet(false, true)) {
Message.IMPORT_ALREADY_RUNNING.send(sender);
return CommandResult.STATE_ERROR;
}
LegacyImporter importer = new LegacyImporter(plugin.getCommandManager(), sender, commands);
// Run the importer in its own thread.
plugin.getBootstrap().getScheduler().executeAsync(() -> {
try {
importer.run();
} finally {
this.running.set(false);
}
});
if (path.getFileName().toString().endsWith(".json.gz")) {
return exportModern(plugin, sender, path);
} else {
// modern
JsonObject data;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(Files.newInputStream(path)), StandardCharsets.UTF_8))) {
data = GsonProvider.normal().fromJson(reader, JsonObject.class);;
} catch (IOException e) {
e.printStackTrace();
Message.IMPORT_FILE_READ_FAILURE.send(sender);
return CommandResult.FAILURE;
}
if (!this.running.compareAndSet(false, true)) {
Message.IMPORT_ALREADY_RUNNING.send(sender);
return CommandResult.STATE_ERROR;
}
Importer importer = new Importer(plugin, sender, data);
// Run the importer in its own thread.
plugin.getBootstrap().getScheduler().executeAsync(() -> {
try {
importer.run();
} finally {
this.running.set(false);
}
});
return exportLegacy(plugin, sender, path);
}
}
private CommandResult exportModern(LuckPermsPlugin plugin, Sender sender, Path path) {
JsonObject data;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(Files.newInputStream(path)), StandardCharsets.UTF_8))) {
data = GsonProvider.normal().fromJson(reader, JsonObject.class);;
} catch (IOException e) {
e.printStackTrace();
Message.IMPORT_FILE_READ_FAILURE.send(sender);
return CommandResult.FAILURE;
}
return runImporter(plugin, sender, () -> new Importer(plugin, sender, data));
}
private CommandResult exportLegacy(LuckPermsPlugin plugin, Sender sender, Path path) {
List<String> commands;
try {
commands = Files.readAllLines(path, StandardCharsets.UTF_8);
} catch (IOException e) {
e.printStackTrace();
Message.IMPORT_FILE_READ_FAILURE.send(sender);
return CommandResult.FAILURE;
}
return runImporter(plugin, sender, () -> new LegacyImporter(plugin.getCommandManager(), sender, commands));
}
private CommandResult runImporter(LuckPermsPlugin plugin, Sender sender, Supplier<Runnable> importerSupplier) {
if (!this.running.compareAndSet(false, true)) {
Message.IMPORT_ALREADY_RUNNING.send(sender);
return CommandResult.STATE_ERROR;
}
Runnable importer = importerSupplier.get();
// Run the importer in its own thread.
plugin.getBootstrap().getScheduler().executeAsync(() -> {
try {
importer.run();
} finally {
this.running.set(false);
}
});
return CommandResult.SUCCESS;
}