Skip to content

Commit

Permalink
Parameter expansion & refactoring...
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattirn
mattirn committed Jan 11, 2020
1 parent 57c9a61 commit 1cc42a4
Show file tree
Hide file tree
Showing 13 changed files with 458 additions and 383 deletions.
13 changes: 0 additions & 13 deletions builtins/src/main/java/org/jline/builtins/CommandRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

public interface CommandRegistry {

enum Type {BASE, CONSOLE, SYSTEM}

/**
* Aggregate SystemCompleters of commandRegisteries
* @return uncompiled SystemCompleter
Expand Down Expand Up @@ -83,19 +81,8 @@ static Completers.SystemCompleter compileCompleters(CommandRegistry ... commandR
*/
Widgets.CmdDesc commandDescription(String command);

default Type getType() {
return Type.BASE;
}

default void setMasterRegistry(CommandRegistry masterRegistry) {
throw new IllegalAccessError("Not implemented!");
}

default Object execute(String command, String[] args) throws Exception {
throw new IllegalAccessError("Not implemented!");
}

default Object execute(ParsedLine parsedLine) throws Exception {
throw new IllegalAccessError("Not implemented!");
}
}
221 changes: 7 additions & 214 deletions builtins/src/main/java/org/jline/builtins/ConsoleEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,222 +8,15 @@
*/
package org.jline.builtins;

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.jline.builtins.CommandRegistry;
import org.jline.reader.ParsedLine;

import org.jline.builtins.Builtins;
import org.jline.builtins.Builtins.Command;
import org.jline.builtins.Builtins.CommandInput;
import org.jline.builtins.Builtins.CommandMethods;
import org.jline.builtins.Completers.SystemCompleter;
import org.jline.reader.*;
import org.jline.reader.Parser.ParseContext;
import org.jline.reader.impl.completer.NullCompleter;
import org.jline.utils.AttributedStringBuilder;
import org.jline.utils.AttributedStyle;
public interface ConsoleEngine extends CommandRegistry {

/**
* Console commands and script execution.
*
* @author <a href="mailto:matti.rintanikkola@gmail.com">Matti Rinta-Nikkola</a>
*/
public class ConsoleEngine implements CommandRegistry {
public enum Command {SHOW
, DEL
, ENGINES};
private final ScriptEngine engine;
private Map<Command,String> commandName = new HashMap<>();
private Map<String,Command> nameCommand = new HashMap<>();
private Map<String,String> aliasCommand = new HashMap<>();
private final Map<Command,CommandMethods> commandExecute = new HashMap<>();
private Map<Command,List<String>> commandInfo = new HashMap<>();
private Exception exception;
private CommandRegistry masterRegistry;
private String scriptExtension = "jline";
private Parser parser;

public ConsoleEngine(ScriptEngine engine, Parser parser) {
this.engine = engine;
this.parser = parser;
Set<Command> cmds = new HashSet<>(EnumSet.allOf(Command.class));
for (Command c: cmds) {
commandName.put(c, c.name().toLowerCase());
}
doNameCommand();
commandExecute.put(Command.ENGINES, new CommandMethods(this::engines, this::defaultCompleter));
commandExecute.put(Command.DEL, new CommandMethods(this::del, this::defaultCompleter));
commandExecute.put(Command.SHOW, new CommandMethods(this::show, this::defaultCompleter));
}

@Override
public CommandRegistry.Type getType() {
return CommandRegistry.Type.CONSOLE;
}

public void setMasterRegistry(CommandRegistry masterRegistry) {
if (masterRegistry.getType() != CommandRegistry.Type.SYSTEM) {
throw new IllegalArgumentException();
}
this.masterRegistry = masterRegistry;
}
void setMasterRegistry(SystemRegistry masterRegistry);

public ConsoleEngine scriptExtension(String extension) {
this.scriptExtension = extension;
return this;
}

public Set<String> commandNames() {
return nameCommand.keySet();
}

public Map<String, String> commandAliases() {
return aliasCommand;
}

public boolean hasCommand(String name) {
if (nameCommand.containsKey(name) || aliasCommand.containsKey(name)) {
return true;
}
return false;
}

private void doNameCommand() {
nameCommand = commandName.entrySet()
.stream()
.collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
}

private Command command(String name) {
Command out = null;
if (!hasCommand(name)) {
throw new IllegalArgumentException("Command does not exists!");
}
if (aliasCommand.containsKey(name)) {
name = aliasCommand.get(name);
}
if (nameCommand.containsKey(name)) {
out = nameCommand.get(name);
} else {
throw new IllegalArgumentException("Command does not exists!");
}
return out;
}

public void rename(Command command, String newName) {
if (nameCommand.containsKey(newName)) {
throw new IllegalArgumentException("Duplicate command name!");
} else if (!commandName.containsKey(command)) {
throw new IllegalArgumentException("Command does not exists!");
}
commandName.put(command, newName);
doNameCommand();
}

public void alias(String alias, String command) {
if (!nameCommand.keySet().contains(command)) {
throw new IllegalArgumentException("Command does not exists!");
}
aliasCommand.put(alias, command);
}

public List<String> commandInfo(String command) {
return new ArrayList<>();
}

public Completers.SystemCompleter compileCompleters() {
SystemCompleter out = new SystemCompleter();
for (Map.Entry<Command, String> entry: commandName.entrySet()) {
out.add(entry.getValue(), commandExecute.get(entry.getKey()).compileCompleter().apply(entry.getValue()));
}
out.addAliases(aliasCommand);
return out;
}

public Widgets.CmdDesc commandDescription(String command) {
return null;
}

private List<String> slurp(String path) throws IOException{
List<String> out = new ArrayList<>();
byte[] encoded = Files.readAllBytes(Paths.get(path));
out.addAll(Arrays.asList(new String(encoded, StandardCharsets.UTF_8).split("\n|\n\r")));
return out;
}

public Object execute(ParsedLine pl) throws Exception {
String[] args = pl.words().subList(1, pl.words().size()).toArray(new String[0]);
String cmd = Parser.getCommand(pl.word());
Object out = null;
if (new File(cmd).exists()) {
File file = new File(cmd);
String name = file.getName();
String ext = name.contains(".") ? name.substring(name.lastIndexOf(".") + 1) : "";
if(engine.getExtensions().contains(ext)) {
out = engine.execute(file, args);
} else if (scriptExtension.equals(ext)) {
List<String> commandsBuffer = slurp(cmd);
String line = "";
boolean done = false;
while (!commandsBuffer.isEmpty()) {
try {
line += commandsBuffer.remove(0);
parser.parse(line, line.length() + 1, ParseContext.ACCEPT_LINE);
masterRegistry.execute(parser.parse(line, 0, ParseContext.ACCEPT_LINE));
line = "";
} catch (EOFError e) {
if (commandsBuffer.isEmpty()) {
throw new IllegalArgumentException("Incompleted command: \n" + line);
}
line += "\n";
} catch (SyntaxError e) {
commandsBuffer.clear();
throw e;
} catch (Exception e) {
commandsBuffer.clear();
throw new IllegalArgumentException(e.getMessage());
}
}
} else {
throw new IllegalArgumentException("Command not found: " + cmd);
}
} else {
out = engine.execute(pl.line());
}
return out;
}

public Object execute(String command, String[] args) throws Exception {
exception = null;
Object out = commandExecute.get(command(command)).executeFunction().apply(new Builtins.CommandInput(args));
if (exception != null) {
throw exception;
}
return out;
}

public Object engines(Builtins.CommandInput input) {
return ScriptEngine.listEngines();
}

public Object show(Builtins.CommandInput input) {
return engine.get();
}
Object[] expandVariables(String[] args) throws Exception;

public Object del(Builtins.CommandInput input) {
engine.del(input.args());
return null;
}
Object execute(ParsedLine parsedLine) throws Exception;

private List<Completer> defaultCompleter(String command) {
return Arrays.asList(NullCompleter.INSTANCE);
}
}
}

0 comments on commit 1cc42a4

Please sign in to comment.