Apple-2-Tools/AppleCommander
1
0 Fork 0
mirror of https://github.com/AppleCommander/AppleCommander.git synced 2026-10-24 23:02:27 +00:00
Code Issues Projects Releases Wiki Activity

There were three lists of the subcommands: The flags (ex: "--checkit"), the dynamically added hidden subcommands, and the case statement setting up the proper checker in the dynamic subcommand. This combines the last two.

Browse Source
This commit is contained in:
a2geek committed 2026-07-31 22:22:22 -05:00
1 parent 117108fc63
commit b708e71209
2 files changed
+16 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/cli-acx/src/main/java/io/github/applecommander/acx/Main.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class Main {
public static void main(String[] args) {
CommandLine cmd = new CommandLine(new Main());
for (var name : HiddenProofCommand.PROOF_READERS) {
for (var name : HiddenProofCommand.PROOF_READER_FNS.keySet()) {
cmd.addSubcommand(name, new AbstractProofCommand.HiddenProofCommand());
}
cmd.setUsageHelpAutoWidth(true);
app/cli-acx/src/main/java/io/github/applecommander/acx/command/AbstractProofCommand.java
+15 -17
View File
@@ -37,6 +37,7 @@ import picocli.CommandLine.Model.CommandSpec;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Queue;
import java.util.concurrent.Callable;
@@ -121,14 +122,17 @@ public abstract class AbstractProofCommand extends ReusableCommandOptions {
@Command(hidden = true, name = "proof")
public static class HiddenProofCommand extends AbstractProofCommand implements Callable<Integer> {
public static final String[] PROOF_READERS = {
"apple-checker",
"checkit",
"kp2", "key-perfect-2",
"kp4", "key-perfect-4",
"kp5", "key-perfect-5",
"proofreader"
};
public static final Map<String,Function<Configuration,Object>> PROOF_READER_FNS = Map.of(
"apple-checker", NibbleAppleChecker::new,
"checkit", NibbleCheckit::new,
"kp2", MicrosparcKeyPerfect2::new,
"key-perfect-2", MicrosparcKeyPerfect2::new,
"kp4", MicrosparcKeyPerfect4::new,
"key-perfect-4", MicrosparcKeyPerfect4::new,
"kp5", MicrosparcKeyPerfect5::new,
"key-perfect-5", MicrosparcKeyPerfect5::new,
"proofreader", ComputeAutomaticProofreader::new
);
@Spec
private CommandSpec spec;
@@ -136,15 +140,9 @@ public abstract class AbstractProofCommand extends ReusableCommandOptions {
@Override
public int handleCommand() throws Exception {
String commandName = spec.commandLine().getCommandName();
Function<Configuration,Object> proofReaderFn = switch (commandName) {
case "apple-checker" -> NibbleAppleChecker::new;
case "checkit" -> NibbleCheckit::new;
case "kp2", "key-perfect-2" -> MicrosparcKeyPerfect2::new;
case "kp4", "key-perfect-4" -> MicrosparcKeyPerfect4::new;
case "kp5", "key-perfect-5" -> MicrosparcKeyPerfect5::new;
case "proofreader" -> ComputeAutomaticProofreader::new;
default -> throw new UnmatchedArgumentException(spec.commandLine(), "Unknown subcommand: " + commandName);
};
Function<Configuration,Object> proofReaderFn = PROOF_READER_FNS.getOrDefault(commandName, key -> {
throw new UnmatchedArgumentException(spec.commandLine(), "Unknown subcommand: " + key);
});
return handle(proofReaderFn);
}
}