Use JSON web API

Cargo.toml

@@ -11,6 +11,7 @@ serde = {version = "1.0", features = ["derive"]}
 actix-web = {version = "3", default_features = false}
 rust-embed="6.0.0"
 hex = "0.4.3"
+serde_json = "1"
 
 [target.armv7-unknown-linux-gnueabihf]
 linker = "armv7-unknown-linux-gnueabihf"

src/color.rs

@@ -1,8 +1,9 @@
 use hex;
 use std::num::ParseIntError;
 use std::str::FromStr;
+use serde::Deserialize;
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, Deserialize)]
 pub struct Rgb(pub u8, pub u8, pub u8);
 impl Rgb {
     pub const fn to_tuple(self) -> (u8, u8, u8) {

src/pattern.rs

@@ -1,4 +1,5 @@
 use crate::color::Rgb;
+use serde::Deserialize;
 
 pub mod collide;
 pub mod fade;
@@ -13,6 +14,20 @@ pub use moving_rainbow::MovingRainbow;
 pub use orb::Orb;
 pub use solid::Solid;
 
+#[derive(Deserialize, Debug)]
+enum PatternParameters {
+    Collide(Rgb, Rgb, Rgb),
+}
+
+pub enum PatternParameters {
+    Collide(Rgb,Rgb,Rgb),
+    Fade(Rgb),
+    MovingPixel(Rgb),
+    MovingRainbow(u8, bool),
+    Orb(Rgb, u8,u8),
+    Solid(Rgb),
+}
+
 pub trait Pattern: std::fmt::Debug {
     fn init(&mut self, num_lights: u16) -> Result<(), ()>;
     fn step(&mut self) -> Result<bool, ()>;

src/webui.rs

@@ -2,11 +2,13 @@ use crate::color::Rgb;
 use crate::pattern;
 use crate::strip;
 use actix_web::web::Form;
-use actix_web::{get, post, web, App, HttpRequest, HttpServer, Responder};
+use actix_web::{get, post, web, App, HttpRequest, HttpServer, Responder, Result, };
+// use actix_web::error::InternalError;
 use rust_embed::RustEmbed;
 use serde::Deserialize;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
+use std::io;
 
 use std::sync::mpsc::Sender;
 
@@ -19,21 +21,26 @@ struct AppState {
     strip_tx: Arc<Mutex<Sender<strip::Message>>>,
 }
 
-#[derive(Deserialize, Debug)]
-struct ColorForm {
-    color: String,
-}
+// #[derive(Deserialize, Debug)]
+// struct ColorForm {
+//     color: String,
+//     e: E
+// }
 
 #[post("/setcolor")]
-async fn set_color(data: web::Data<AppState>, params: Form<ColorForm>) -> impl Responder {
+async fn set_color(data: web::Data<AppState>, params: web::Json<PatternParameters>) -> Result<impl Responder> {
+    println!("{:?}", params);
+    let pattern = match params.0 {
+        PatternParameters::Collide(l, r, c) => pattern::Collide::new(l,r,c)
+    };
     data.strip_tx
-        .lock()
-        .unwrap()
+        .lock().or(Err(io::Error::new(io::ErrorKind::Other, "Failed to get a lock")))?
         .send(strip::Message::ChangePattern(Box::new(
-            pattern::Solid::new(Rgb::from_str(&params.color).unwrap()),
+            // pattern::Solid::new(Rgb::from_str(&params.color).or(Err(io::Error::new(io::ErrorKind::Other, "Failed to parse")))?),
+            pattern
         )))
-        .unwrap();
-    format!("{:?}", params)
+        .or(Err(io::Error::new(io::ErrorKind::Other, "Failed to send to channel")))?;
+    Ok(format!("{:?}", params))
 }
 
 #[get("/")]