Skip to content

feat(cli): support chaining multiple commands with ; #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bouclem wants to merge 1 commit into
base: main
Choose a base branch
from
+93 −29
Open

feat(cli): support chaining multiple commands with ; #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 93 additions & 29 deletions cli/src/main/java/org/mcphackers/mcp/main/MainCLI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,35 +94,27 @@ public MainCLI(String[] args) {
if (version != null) log(version);
log(new Ansi().fgDefault().a("Enter a command to execute:").toString());
}
int executeTimes = 0;
while (startedWithNoParams && !exit || !startedWithNoParams && executeTimes < 1) {
while (args.length < 1) {
System.out.print(new Ansi().fgBrightCyan().a("> ").fgDefault());
String str = null;
try {
if (consoleInput.hasNextLine()) {
str = consoleInput.nextLine();
} else {
// Only seems to occur during EOF, might occur in other cases?
System.exit(0);
}
} catch (NoSuchElementException ignored) {
List<String[]> pendingCommands = splitCommands(args);
while (true) {
if (pendingCommands.isEmpty()) {
if (!startedWithNoParams || exit) {
break;
}
if (str == null) {
mode = TaskMode.EXIT;
} else {
str = str.trim();
if (str.isEmpty()) {
continue;
}
System.out.print(new Ansi().fgDefault());
args = str.split(" ");
List<String[]> read = readInteractiveCommands();
if (read == null) {
break;
}
pendingCommands.addAll(read);
continue;
}
String[] cmdArgs = pendingCommands.remove(0);
if (cmdArgs.length == 0) {
continue;
}
boolean taskMode = setMode(args[0]);
boolean taskMode = setMode(cmdArgs[0]);
Map<String, Object> parsedArgs = new HashMap<>();
for (int index = 1; index < args.length; index++) {
parseArg(args[index], parsedArgs);
for (int index = 1; index < cmdArgs.length; index++) {
parseArg(cmdArgs[index], parsedArgs);
}
setParams(parsedArgs, mode);
if (mode == TaskMode.SETUP && versions != null) {
Expand All @@ -132,8 +124,9 @@ public MainCLI(String[] args) {
log(new Ansi().fgMagenta().a("==================================================").fgDefault().toString());
}
}
boolean commandOk = true;
if (taskMode) {
performTask(mode, side);
commandOk = performTask(mode, side);
} else if (mode == TaskMode.HELP) {
if (helpCommand == null) {
for (TaskMode mode : TaskMode.registeredTasks) {
Expand All @@ -150,13 +143,18 @@ public MainCLI(String[] args) {
}
} else if (mode != TaskMode.EXIT) {
log("Unknown command. Type 'help' for list of available commands");
commandOk = false;
}
args = new String[]{};
if (!startedWithNoParams || mode == TaskMode.EXIT)
if (mode == TaskMode.EXIT) {
exit = true;
break;
}
if (!commandOk && !pendingCommands.isEmpty()) {
warning("Aborting remaining queued commands.");
pendingCommands.clear();
}
mode = null;
helpCommand = null;
executeTimes++;
}
}

Expand All @@ -165,6 +163,72 @@ public static void main(String[] args) {
new MainCLI(args);
}

/**
* Splits a flat argument array into a list of commands separated by `;` tokens.
* Supports both standalone separators ("setup", "1.2.5", ";", "decompile") and
* trailing/leading separators on tokens ("setup", "1.2.5;", "decompile").
*/
private static List<String[]> splitCommands(String[] args) {
List<String[]> commands = new ArrayList<>();
List<String> current = new ArrayList<>();
for (String raw : args) {
if (raw == null || raw.isEmpty()) {
continue;
}
int start = 0;
for (int i = 0; i < raw.length(); i++) {
if (raw.charAt(i) == ';') {
if (i > start) {
current.add(raw.substring(start, i));
}
if (!current.isEmpty()) {
commands.add(current.toArray(new String[0]));
current = new ArrayList<>();
}
start = i + 1;
}
}
if (start < raw.length()) {
current.add(raw.substring(start));
}
}
if (!current.isEmpty()) {
commands.add(current.toArray(new String[0]));
}
return commands;
}

private List<String[]> readInteractiveCommands() {
while (true) {
System.out.print(new Ansi().fgBrightCyan().a("> ").fgDefault());
String str = null;
try {
if (consoleInput.hasNextLine()) {
str = consoleInput.nextLine();
} else {
// EOF
return null;
}
} catch (NoSuchElementException ignored) {
}
if (str == null) {
List<String[]> exitCmd = new ArrayList<>();
exitCmd.add(new String[]{TaskMode.EXIT.getName()});
return exitCmd;
}
str = str.trim();
if (str.isEmpty()) {
continue;
}
System.out.print(new Ansi().fgDefault());
List<String[]> parsed = splitCommands(str.split(" "));
if (parsed.isEmpty()) {
continue;
}
return parsed;
}
}

private static void parseArg(String arg, Map<String, Object> map) {
int equalSign = arg.indexOf('=');
if (arg.startsWith("-") && equalSign > 0) {
Expand Down