From 04bc4d57ecb4eb95d35974e5d6e2dd700b16415f Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sat, 22 Feb 2025 02:06:22 +0100 Subject: [PATCH] Bad database selected --- weaponry/Cargo.toml | 8 ++++---- weaponry/src/weaponry_structs/equipement_scenario.rs | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/weaponry/Cargo.toml b/weaponry/Cargo.toml index 0146cdd..291e2c0 100644 --- a/weaponry/Cargo.toml +++ b/weaponry/Cargo.toml @@ -16,10 +16,10 @@ serde_json = { version = "1.0.138", features = ["alloc"] } strum = { version = "0.27.0", features = ["derive"] } thiserror = "2.0.11" regex = "1.11.1" -charming = { version = "0.4.0", features = ["deno_core", "image", "resvg", "ssr", "wasm"] } -chrono = "0.4.39" -leptos = { version = "0.7.7", features = ["csr"] } -leptos-use = "0.15" +charming = { version = "0.4.0", features = [] } +# chrono = "0.4.39" +# leptos = { version = "0.7.7", features = ["csr"] } +# leptos-use = "0.15" [dev-dependencies] criterion = { version = "0.5" } diff --git a/weaponry/src/weaponry_structs/equipement_scenario.rs b/weaponry/src/weaponry_structs/equipement_scenario.rs index d21b8d6..d48a426 100644 --- a/weaponry/src/weaponry_structs/equipement_scenario.rs +++ b/weaponry/src/weaponry_structs/equipement_scenario.rs @@ -47,6 +47,8 @@ impl ViewTable for ViewtableMock { /// A simple cross recipe scenario #[allow(clippy::missing_docs_in_private_items)] pub struct CrossRecipeScenario { + // TODO: Should obv be inside the config + database_name: String, database: EquipementDatabase, config: ConfigMock, } @@ -63,7 +65,7 @@ impl CrossRecipeScenario { Ok(InitialEquipementList::from_vectored( self.database .serialize_vec_from_table::( - &name, + &self.database_name, Some(&format!("META_CATEGORY LIKE '{}'", name)), )? .into_iter() @@ -89,6 +91,7 @@ impl Scenario for CrossRecipeScenario { { Ok(Self { // TODO: Correct this relative path abomination + database_name: "Equipements".into(), database: Self::DatabaseType::new("./databases/weapons.db")?, config, })