added device add and update

5 files changed, 113 insertions, 43 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 57bd864..b2c6d30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -251,9 +251,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4"
 dependencies = [
  "libc",
 ]
@@ -526,7 +526,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -968,9 +968,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.19"
+version = "0.38.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
@@ -1082,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi",
@@ -1092,9 +1092,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
  "windows-sys",
@@ -1153,18 +1153,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1198,7 +1198,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2 0.5.4",
+ "socket2 0.5.5",
  "windows-sys",
 ]
 
@@ -1243,9 +1243,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.39"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
diff --git a/src/main.rs b/src/main.rs
index e6ca3ef..ab7e476 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,7 @@
 use clap::{Parser, Subcommand};
 use config::SETTINGS;
 use error::CliError;
-use requests::{start::start, get::get};
+use requests::{start::start, device};
 use reqwest::header::{HeaderMap, HeaderValue};
 use serde::Deserialize;
 
@@ -23,11 +23,29 @@ enum Commands {
         /// id of the device
         id: String
     },
-    Get {
-        id: String
+    Device {
+        #[command(subcommand)]
+        devicecmd: DeviceCmd,
     }
 }
 
+#[derive(Subcommand)]
+enum DeviceCmd {
+    Add {
+        id: String,
+        mac: String,
+        broadcast_addr: String
+    },
+    Get {
+        id: String,
+    },
+    Edit {
+        id: String,
+        mac: String,
+        broadcast_addr: String
+    },
+}
+
 fn main() -> Result<(), CliError> {
     let cli = Args::parse();
 
@@ -35,8 +53,18 @@ fn main() -> Result<(), CliError> {
         Commands::Start { id } => {
             start(id)?;
         },
-        Commands::Get { id } => {
-            get(id)?;
+        Commands::Device { devicecmd } => {
+            match devicecmd {
+                DeviceCmd::Add { id, mac, broadcast_addr } => {
+                    device::put(id, mac, broadcast_addr)?;
+                },
+                DeviceCmd::Get { id } => {
+                    device::get(id)?;
+                },
+                DeviceCmd::Edit { id, mac, broadcast_addr } => {
+                    device::post(id, mac, broadcast_addr)?;
+                },
+            }
         }
     }
 
@@ -57,7 +85,14 @@ fn default_headers() -> Result<HeaderMap, CliError> {
     );
 
     Ok(map)
+}
 
+fn format_url(path: &str) -> Result<String, CliError> {
+    Ok(format!(
+        "{}/{}",
+        SETTINGS.get_string("server").map_err(CliError::Config)?,
+        path
+    ))
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/src/requests/device.rs b/src/requests/device.rs
new file mode 100644
index 0000000..525745a
--- /dev/null
+++ b/src/requests/device.rs
@@ -0,0 +1,56 @@
+use crate::{error::CliError, default_headers, format_url};
+
+pub fn put(id: String, mac: String, broadcast_addr: String) -> Result<(), CliError> {
+    let res = reqwest::blocking::Client::new()
+        .put(format_url("device")?)
+        .headers(default_headers()?)
+        .body(
+            format!(
+                r#"{{"id": "{}", "mac": "{}", "broadcast_addr": "{}"}}"#,
+                id,
+                mac,
+                broadcast_addr
+            )
+        )
+        .send()
+        .map_err(CliError::Reqwest)?
+        .text();
+
+    println!("{:?}", res);
+    Ok(())
+}
+
+pub fn get(id: String) -> Result<(), CliError> {
+    let res = reqwest::blocking::Client::new()
+        .get(format_url("device")?)
+        .headers(default_headers()?)
+        .body(
+            format!(r#"{{"id": "{}"}}"#, id)
+        )
+        .send()
+        .map_err(CliError::Reqwest)?
+        .text();
+
+    println!("{:?}", res);
+    Ok(())
+}
+
+pub fn post(id: String, mac: String, broadcast_addr: String) -> Result<(), CliError> {
+    let res = reqwest::blocking::Client::new()
+        .post(format_url("device")?)
+        .headers(default_headers()?)
+        .body(
+            format!(
+                r#"{{"id": "{}", "mac": "{}", "broadcast_addr": "{}"}}"#,
+                id,
+                mac,
+                broadcast_addr
+            )
+        )
+        .send()
+        .map_err(CliError::Reqwest)?
+        .text();
+
+    println!("{:?}", res);
+    Ok(())
+}
diff --git a/src/requests/get.rs b/src/requests/get.rs
deleted file mode 100644
index 225562d..0000000
--- a/src/requests/get.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use crate::{error::CliError, config::SETTINGS, default_headers};
-
-pub fn get(id: String) -> Result<(), CliError> {
-    let res = reqwest::blocking::Client::new()
-        .get(
-            format!(
-                "{}/start",
-                SETTINGS.get_string("server").map_err(CliError::Config)?
-            )
-        )
-        .headers(default_headers()?)
-        .body(
-            format!(r#"{{"id": "{}"}}"#, id)
-        )
-        .send()
-        .map_err(CliError::Reqwest)?
-        .text();
-
-    println!("{:?}", res);
-    Ok(())
-}
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index ddf0ea9..6855db1 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -1,2 +1,2 @@
 pub mod start;
-pub mod get;
+pub mod device;