Dolda2000 GitWeb
/
kaka
/
cakelight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move ListPosition inside VideoFrame
[kaka/cakelight.git]
/
src
/
kaka
/
cakelight
/
Console.java
diff --git
a/src/kaka/cakelight/Console.java
b/src/kaka/cakelight/Console.java
index
873dac1
..
89acbbd
100644
(file)
--- a/
src/kaka/cakelight/Console.java
+++ b/
src/kaka/cakelight/Console.java
@@
-1,5
+1,7
@@
package kaka.cakelight;
package kaka.cakelight;
+import kaka.cakelight.mode.Mode;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@
-9,6
+11,7
@@
import java.util.List;
import java.util.Map;
public class Console extends Thread {
import java.util.Map;
public class Console extends Thread {
+ private boolean running;
private CakeLight cakelight;
private Configuration config;
private Map<String, Command> commands = new HashMap<>();
private CakeLight cakelight;
private Configuration config;
private Map<String, Command> commands = new HashMap<>();
@@
-23,8
+26,10
@@
public class Console extends Thread {
private Console(CakeLight cakelight, Configuration config) {
this.cakelight = cakelight;
this.config = config;
private Console(CakeLight cakelight, Configuration config) {
this.cakelight = cakelight;
this.config = config;
- register(
new HelpCommand
());
+ register(
Commands.help
());
register(Commands.quit());
register(Commands.quit());
+ register(Commands.push());
+ register(Commands.pop());
register(Commands.video());
register(Commands.color());
register(Commands.brightness());
register(Commands.video());
register(Commands.color());
register(Commands.brightness());
@@
-43,18
+48,13
@@
public class Console extends Thread {
return config;
}
return config;
}
- private class HelpCommand implements Command {
- @Override
- public String[] getNames() {
- return new String[] {"?", "h", "help"};
- }
+ List<Command> getCommands() {
+ return commandList;
+ }
- @Override
- public void activate(Console console, String[] args) {
- for (Command c : commandList) {
- System.out.println(String.join("|", c.getNames()));
- }
- }
+ void quit() {
+ cakelight.turnOff();
+ running = false;
}
private void register(Command cmd) {
}
private void register(Command cmd) {
@@
-70,8
+70,9
@@
public class Console extends Thread {
@Override
public void run() {
@Override
public void run() {
+ running = true;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
- while (
true
) {
+ while (
running
) {
System.out.print("> ");
String input = reader.readLine();
handleInput(input);
System.out.print("> ");
String input = reader.readLine();
handleInput(input);
@@
-82,6
+83,13
@@
public class Console extends Thread {
}
void handleInput(String input) {
}
void handleInput(String input) {
+ Object obj = internalHandleInput(input);
+ if (obj instanceof Mode) {
+ cakelight.setMode((Mode) obj);
+ }
+ }
+
+ Object internalHandleInput(String input) {
String[] splitInput = input.split("\\s+", 2);
String name = splitInput[0];
String[] args = splitInput.length == 2
String[] splitInput = input.split("\\s+", 2);
String name = splitInput[0];
String[] args = splitInput.length == 2
@@
-90,10
+98,11
@@
public class Console extends Thread {
Command cmd = commands.get(name);
if (cmd != null) {
Command cmd = commands.get(name);
if (cmd != null) {
- cmd.activate(this, args);
+
return
cmd.activate(this, args);
} else {
out("no command named '" + name + "'");
}
} else {
out("no command named '" + name + "'");
}
+ return null;
}
void out(String text) {
}
void out(String text) {
@@
-129,6
+138,6
@@
public class Console extends Thread {
public interface Command {
String[] getNames();
public interface Command {
String[] getNames();
-
void
activate(Console console, String[] args);
+
Object
activate(Console console, String[] args);
}
}
}
}