Define config default values

Author: jsurrea

antares/Cargo.lock

@@ -6,12 +6,13 @@ edition = "2021"
 [dependencies]
 chrono = "0.4.38"
 rand = "0.8.5"
-tokio = { version = "1", features = ["full"] }
-hyper = { version = "1", features = ["full"] }
-serde = { version = "1", features = ["derive"] }
 toml = "0.8.19"
 async-trait = "0.1.88"
 tokio-tungstenite = "0.26.2"
 futures-util = "0.3.31"
 futures = "0.3.31"
 axum = "0.8.4"
+tokio = { version = "1", features = ["full"] }
+hyper = { version = "1", features = ["full"] }
+serde = { version = "1", features = ["derive"] }
+clap = { version = "4.5.37", features = ["derive"] }

antares/Cargo.toml

@@ -12,3 +12,12 @@ pub struct Config {
     pub simulation: SimulationConfig,
     pub radar: RadarConfig,
 }
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            simulation: SimulationConfig::default(),
+            radar: RadarConfig::default(),
+        }
+    }
+}

antares/src/config.rs

@@ -1,27 +1,34 @@
-use antares::ShipConfig;
-use antares::{Config, Controller};
+use antares::{Config, Controller, ShipConfig};
 use axum::{extract::State, routing::post, Json, Router};
-use std::{env, fs, net::SocketAddr, process, sync::Arc};
+use clap::Parser;
+use std::{fs, net::SocketAddr, process, sync::Arc};
 use tokio::task;
 
+#[derive(Parser)]
+#[command(author, version, about)]
+struct Args {
+    #[arg(long)]
+    config: Option<String>,
+}
+
 #[tokio::main]
 async fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    if args.len() != 2 {
-        eprintln!("Usage: antares <config-file>");
-        process::exit(1);
-    }
-
-    let config_content = fs::read_to_string(&args[1]).unwrap_or_else(|err| {
-        eprintln!("Problem reading the config file: {err}");
-        process::exit(1);
-    });
-
-    let config: Config = toml::from_str(&config_content).unwrap_or_else(|err| {
-        eprintln!("Problem parsing the config file: {err}");
-        process::exit(1);
-    });
+    let args = Args::parse();
+
+    let config = match args.config {
+        Some(path) => {
+            let content = fs::read_to_string(path).unwrap_or_else(|err| {
+                eprintln!("Problem reading the config file: {err}");
+                process::exit(1);
+            });
+
+            toml::from_str(&content).unwrap_or_else(|err| {
+                eprintln!("Problem parsing the config file: {err}");
+                process::exit(1);
+            })
+        }
+        None => Config::default(),
+    };
 
     let controller_bind_addr = config.simulation.controller_bind_addr.clone();
     let controller = Arc::new(Controller::new(config));

antares/src/main.rs

@@ -7,6 +7,16 @@ pub struct RadarConfig {
     pub bind_addr: String,
 }
 
+impl Default for RadarConfig {
+    fn default() -> Self {
+        RadarConfig {
+            detector: DetectorConfig::default(),
+            broadcast: BroadcastConfig::default(),
+            bind_addr: "0.0.0.0:17396".into(),
+        }
+    }
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct DetectorConfig {
     pub range: f64,
@@ -15,9 +25,26 @@ pub struct DetectorConfig {
     pub start_coordinates: (f64, f64),
 }
 
+impl Default for DetectorConfig {
+    fn default() -> Self {
+        DetectorConfig {
+            range: 1000.0,
+            speed: 0.0,
+            angle: 0.0,
+            start_coordinates: (4.0, -72.0),
+        }
+    }
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(tag = "type", rename_all = "lowercase")]
 pub enum BroadcastConfig {
     Tcp,
     WebSocket,
 }
+
+impl Default for BroadcastConfig {
+    fn default() -> Self {
+        BroadcastConfig::Tcp
+    }
+}

antares/src/radar/config.rs

@@ -10,6 +10,16 @@ pub struct SimulationConfig {
     pub controller_bind_addr: String,
 }
 
+impl Default for SimulationConfig {
+    fn default() -> Self {
+        SimulationConfig {
+            emission_interval: 20,
+            initial_ships: Vec::new(),
+            controller_bind_addr: "0.0.0.0:17394".into(),
+        }
+    }
+}
+
 #[derive(Debug, Deserialize)]
 pub struct ShipConfig {
     pub initial_position: (f64, f64),