From bb6ab0fa6f26966f871d959bb300e9ca261b6f91 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 15 Jul 2026 00:32:06 +0200 Subject: [PATCH] Updates the graph for modular import --- crates/config/src/graph.rs | 2 +- crates/graphs/src/graphs.rs | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/crates/config/src/graph.rs b/crates/config/src/graph.rs index 40428cd..27e434f 100644 --- a/crates/config/src/graph.rs +++ b/crates/config/src/graph.rs @@ -14,7 +14,7 @@ pub struct GraphConfig { pub target: GraphTargetType, /// Alternative origin - #[arg(short, long, default_value = "Images/Radar/radar.csv")] + #[arg(short, long, default_value = "Ecoles")] pub origin: String, /// Alternative destination diff --git a/crates/graphs/src/graphs.rs b/crates/graphs/src/graphs.rs index 7a908d1..c2b0b94 100644 --- a/crates/graphs/src/graphs.rs +++ b/crates/graphs/src/graphs.rs @@ -88,7 +88,7 @@ fn del_graphs(args: &GraphConfig) -> Result<()> { fn load_graph(args: &GraphConfig) -> Result<()> { let _ = args; // load_categories_from_tsv("./test.csv")?; - generate_csv()?; + generate_csv(&args)?; Ok(()) } ///Generate the graph and save it @@ -132,9 +132,11 @@ fn import_csv(args: &GraphConfig) -> Result { } /// Generate the csv from all the classes -fn generate_csv() -> Result<()> { +fn generate_csv(args: &GraphConfig) -> Result<()> { // Acquire the data from all classes - let list_class = list_dir("Tables/??? - *.tsv"); + let list_class = list_dir(&format!("{}/??? - *.tsv", args.origin)); + + println!("{:?}", list_class); let mut final_class_list = Vec::with_capacity(list_class.len() + 1); // Very ugly space reservation for the last operation, need to check if no way of skipping an element is possible final_class_list.push(FinalClassRadar::default()); @@ -147,8 +149,8 @@ fn generate_csv() -> Result<()> { .context("Generating new name")?[12..] .strip_suffix(".tsv") .context("Stripping extention")?; - let categories = - load_categories_from_tsv(single_class.clone()).context("Loading from csv")?; + let categories = load_categories_from_tsv(single_class.clone()) + .context(format!("Loading class {:?} from it's tsv", &single_class))?; final_class_list.push(FinalClassRadar::from_radar_with_name( class_name.to_string(), categories,