X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FConsole.java;h=f32ba9824edfe632868c22823c1dfcf9210fddcd;hb=f1a6a6a5cf7d61c2df185206cb0a5b0e7eceb3c1;hp=caae09b80793726b9e25ecf0245954a6116cb53f;hpb=884380465ae1ae412b7e5858ade7fd3f77da497f;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index caae09b..f32ba98 100644
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -3,56 +3,132 @@ package kaka.cakelight;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 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.color());
+	register(Commands.brightness());
+	register(Commands.gamma());
+	register(Commands.saturation());
+	register(Commands.ambientMode());
+	register(Commands.twoColorNoiseMode());
+    }
+
+    public CakeLight getCakelight() {
+	return cakelight;
+    }
+
+    public Configuration getConfig() {
+	return config;
+    }
+
+    private class HelpCommand implements Command {
+	@Override
+	public String[] getNames() {
+	    return new String[] {"?", "h", "help"};
+	}
+
+	@Override
+	public void activate(Console console, String[] args) {
+	    for (Command c : commandList) {
+		System.out.println(String.join("|", c.getNames()));
+	    }
+	}
+    }
+
+    private void register(Command cmd) {
+	for (String name : cmd.getNames()){
+	    if (commands.containsKey(name)) {
+	        System.out.println("Command name '" + name + "' is already registered by '" + commands.get(name).getClass() + "'!");
+	        System.exit(1);
+	    }
+	    commands.put(name, cmd);
+	}
+	commandList.add(cmd);
     }
 
     @Override
     public void run() {
         while (true) {
-            System.out.print("> ");
-            try {
-                String input = reader.readLine();
-                if (input.matches("[0-5]")) {
-		    cakelight.setMode(new AmbientMode(new String[] {input}));
-		    System.out.println("setting ambient mode to " + input);
-		} else if (input.matches("v|video")) {
-                    cakelight.setMode(new VideoMode());
-		} else if (input.matches("(b|brightness)\\s+[0-9]+")) {
-		    String[] split = input.split("\\s+");
-		    config.leds.brightness = Integer.parseInt(split[1]);
-		    System.out.println("setting brightness to " + split[1]);
-		} else if (input.matches("q|quit")) {
-		    cakelight.turnOff();
-		    System.out.println("stopping cakelight");
-		    break;
-		} else if (input.matches("(c|col|color)(\\s+[0-9]+){3}")) {
-		    String[] split = input.split("\\s+");
-		    Color c = Color.rgb(
-			    Integer.parseInt(split[1]),
-			    Integer.parseInt(split[2]),
-			    Integer.parseInt(split[3])
+	    System.out.print("> ");
+	    try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
+		String input = reader.readLine();
+		handleInput(input);
+	    } 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) {
+	System.out.println("(" + text + ")");
+    }
+
+    Color parseColor(String s) {
+	switch (s.toLowerCase()) {
+	    case "r": return Color.rgb(255, 0, 0);
+	    case "g": return Color.rgb(0, 255, 0);
+	    case "b": return Color.rgb(0, 0, 255);
+	    default: // assume hexadecimal
+		if (s.startsWith("#")) {
+		    s = s.substring(1);
+		}
+		if (s.length() == 3) {
+		    return Color.rgb(
+			    Integer.parseInt(s.substring(0, 1), 16) * 16 + Integer.parseInt(s.substring(0, 1), 16),
+			    Integer.parseInt(s.substring(1, 2), 16) * 16 + Integer.parseInt(s.substring(1, 2), 16),
+			    Integer.parseInt(s.substring(2, 3), 16) * 16 + Integer.parseInt(s.substring(2, 3), 16)
+		    );
+		} else if (s.length() == 6) {
+		    return Color.rgb(
+			    Integer.parseInt(s.substring(0, 2), 16),
+			    Integer.parseInt(s.substring(2, 4), 16),
+			    Integer.parseInt(s.substring(4, 6), 16)
 		    );
-		    cakelight.setMode(new SingleColorMode(c));
-		    System.out.println("setting color to " + c);
 		}
-            } catch (IOException e) {
-                System.out.println("Error reading from command line");
-                break;
-            }
-        }
+	}
+	System.out.println("Failed to parse color '" + s + "'. Using black instead.");
+	return Color.BLACK;
     }
 
+    public interface Command {
+        String[] getNames();
+        void activate(Console console, String[] args);
+    }
 }