Replace old command parsing with new

[kaka/cakelight.git] / src / kaka / cakelight / Console.java

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index 76bd6e5..cf72cce 100644 (file)
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -1,14 +1,12 @@
 package kaka.cakelight;
 
-import kaka.cakelight.mode.AmbientMode;
-import kaka.cakelight.mode.SingleColorMode;
-import kaka.cakelight.mode.TwoColorNoiseMode;
-import kaka.cakelight.mode.VideoMode;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class Console extends Thread {
     private CakeLight cakelight;
@@ -26,7 +24,14 @@ public class Console extends Thread {
        this.config = config;
        reader = new BufferedReader(new InputStreamReader(System.in));
        register(new HelpCommand());
-       register(TwoColorNoiseMode.getCommand());
+       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() {
@@ -77,43 +82,8 @@ public class Console extends Thread {
                Command cmd = commands.get(name);
                if (cmd != null) {
                    cmd.activate(this, args);
-                   continue;
-               }
-
-                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 " + config.leds.brightness);
-               } 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])
-                   );
-                   cakelight.setMode(new SingleColorMode(c));
-                   System.out.println("setting color to " + c);
-               } else if (input.matches("(g|gamma)\\s+[0-9.]+")) {
-                   String[] split = input.split("\\s+");
-                   config.gamma = Double.parseDouble(split[1]);
-                   Color.calculateGammaCorrection(config.gamma);
-                   System.out.println("setting gamma to " + config.gamma);
-               } else if (input.matches("(s|saturation)\\s+[0-9.]+")) {
-                   String[] split = input.split("\\s+");
-                   config.video.saturation = Double.parseDouble(split[1]);
-                   System.out.println("setting saturation to " + config.video.saturation);
-               } else if (input.matches("(n|noise)(\\s+[a-z0-9]+){2}")) {
-                   TwoColorNoiseMode.getCommand().activate(this, input.split("\\s+"));
-                   System.out.println("setting two-color noise mode");
+               } else {
+                   out("no command named '" + name + "'");
                }
             } catch (IOException e) {
                 System.out.println("Error reading from command line");
@@ -122,39 +92,39 @@ public class Console extends Thread {
         }
     }
 
-    public interface Command {
-        String[] getNames();
-        void activate(Console console, String[] args);
+    void out(String text) {
+       System.out.println("(" + text + ")");
+    }
 
-       default 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)
-                       );
-                   }
-           }
-           System.out.println("Failed to parse color '" + s + "'. Using black instead.");
-           return Color.BLACK;
+    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)
+                   );
+               }
        }
+       System.out.println("Failed to parse color '" + s + "'. Using black instead.");
+       return Color.BLACK;
+    }
 
-       default void output(String text) {
-           System.out.println("(" + text + ")");
-       }
+    public interface Command {
+        String[] getNames();
+        void activate(Console console, String[] args);
     }
 }