public class Console extends Thread {
private CakeLight cakelight;
private Configuration config;
- private BufferedReader reader;
private Map<String, Command> commands = new HashMap<>();
private List<Command> commandList = new ArrayList<>();
- public static void start(CakeLight cakelight, Configuration config) {
- new Console(cakelight, config).start();
+ public static Console start(CakeLight cakelight, Configuration config) {
+ Console console = new Console(cakelight, config);
+ console.start();
+ return console;
}
private Console(CakeLight cakelight, Configuration config) {
this.cakelight = cakelight;
this.config = config;
- reader = new BufferedReader(new InputStreamReader(System.in));
register(new HelpCommand());
register(Commands.quit());
register(Commands.video());
register(Commands.saturation());
register(Commands.ambientMode());
register(Commands.twoColorNoiseMode());
+ register(Commands.sunriseMode());
}
public CakeLight getCakelight() {
@Override
public void run() {
- while (true) {
- System.out.print("> ");
- try {
- String input = reader.readLine();
- String[] splitInput = input.split("\\s+", 2);
- String name = splitInput[0];
- String[] args = splitInput.length == 2
- ? splitInput[1].split("\\s+")
- : new String[]{};
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
+ while (true) {
+ System.out.print("> ");
+ String input = reader.readLine();
+ handleInput(input);
+ }
+ } catch (IOException e) {
+ System.out.println("Error reading from command line");
+ }
+ }
- Command cmd = commands.get(name);
- if (cmd != null) {
- cmd.activate(this, args);
- } else {
- out("no command named '" + name + "'");
- }
- } catch (IOException e) {
- System.out.println("Error reading from command line");
- break;
- }
- }
+ void handleInput(String input) {
+ String[] splitInput = input.split("\\s+", 2);
+ String name = splitInput[0];
+ String[] args = splitInput.length == 2
+ ? splitInput[1].split("\\s+")
+ : new String[]{};
+
+ Command cmd = commands.get(name);
+ if (cmd != null) {
+ cmd.activate(this, args);
+ } else {
+ out("no command named '" + name + "'");
+ }
}
void out(String text) {