From b1efb13b05188a36fb9475ab66c8a6d744e76a89 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 5 May 2020 15:04:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D1=83=20=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20System.properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/mc/server/Main.java | 41 ++++++++++++--- .../java/mc/server/shell/CommandStore.java | 50 +++++++++++++++++++ 2 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 src/main/java/mc/server/shell/CommandStore.java diff --git a/src/main/java/mc/server/Main.java b/src/main/java/mc/server/Main.java index 3e09185..4df4f29 100644 --- a/src/main/java/mc/server/Main.java +++ b/src/main/java/mc/server/Main.java @@ -1,19 +1,48 @@ package mc.server; -import org.jline.reader.LineReader; -import org.jline.reader.LineReaderBuilder; -import org.jline.reader.UserInterruptException; +import mc.server.shell.CommandStore; +import org.jline.builtins.Builtins; +import org.jline.builtins.CommandRegistry; +import org.jline.reader.*; +import org.jline.reader.impl.completer.NullCompleter; + +import java.io.PrintWriter; +import java.util.Collections; public class Main { public static void main(String[] args) { - LineReader reader = LineReaderBuilder.builder().build(); + CommandStore commandStore = new CommandStore(); + commandStore.register("system-properties", new Builtins.CommandMethods( + commandInput -> { + final PrintWriter writer = commandInput.terminal().writer(); + System.getProperties().forEach((key, value) -> + writer.println(String.format("%s = %s", key, value.toString()))); + }, + commandName -> Collections.singletonList(NullCompleter.INSTANCE) + )); + + final Completer completer = CommandRegistry.compileCompleters(commandStore); + + final LineReader reader = LineReaderBuilder.builder() + .completer(completer) + .build(); try { + final CommandRegistry.CommandSession session = new CommandRegistry.CommandSession(reader.getTerminal()); + final PrintWriter terminalWriter = reader.getTerminal().writer(); //noinspection InfiniteLoopStatement while (true) { - String line = reader.readLine(); - System.out.println("line = '" + line + "'"); + final String line = reader.readLine().trim(); + + final ParsedLine parsedLine = reader.getParser().parse(line, 0); + final String commandName = parsedLine.word(); + + if (commandStore.hasCommand(commandName)) { + commandStore.execute(session, commandName); + } + + terminalWriter.println("line = " + String.join(", ", parsedLine.words())); } } catch (UserInterruptException ignore) { // ignore diff --git a/src/main/java/mc/server/shell/CommandStore.java b/src/main/java/mc/server/shell/CommandStore.java new file mode 100644 index 0000000..c0a8c1f --- /dev/null +++ b/src/main/java/mc/server/shell/CommandStore.java @@ -0,0 +1,50 @@ +package mc.server.shell; + +import org.jline.builtins.Builtins.CommandInput; +import org.jline.builtins.Builtins.CommandMethods; +import org.jline.builtins.CommandRegistry; +import org.jline.builtins.Completers.SystemCompleter; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +public class CommandStore implements CommandRegistry { + + private final Map commandExecutors = new HashMap<>(); + + public void register(String name, CommandMethods commandMethods) { + commandExecutors.put(name, commandMethods); + } + + public void execute(CommandSession session, String command) { + commandExecutors.get(command).execute().accept(new CommandInput(command, new Object[0], session)); + } + + @Override + public Set commandNames() { + return commandExecutors.keySet(); + } + + @Override + public Map commandAliases() { + return Collections.emptyMap(); + } + + @Override + public boolean hasCommand(String command) { + return commandExecutors.containsKey(command); + } + + @Override + public SystemCompleter compileCompleters() { + SystemCompleter systemCompleter = new SystemCompleter(); + + commandExecutors.forEach((name, commandMethods) -> + systemCompleter.add(name, commandMethods.compileCompleter().apply(name))); + systemCompleter.addAliases(commandAliases()); + + return systemCompleter; + } +}