diff --git a/weaponry/src/interfaces.rs b/weaponry/src/interfaces.rs index 326b3f1..98ebe99 100644 --- a/weaponry/src/interfaces.rs +++ b/weaponry/src/interfaces.rs @@ -11,7 +11,7 @@ use more_fields::FieldsAsSlice; use rusqlite::Connection; use serde::de::DeserializeOwned; -use crate::{error::FatalEquipementError, weaponry_structs::InitialEquipementList}; +use crate::error::FatalEquipementError; /// Trait representing a view table /// @@ -275,6 +275,7 @@ pub trait Scenario where for<'a> &'a <<::InitialEquipementList /// Inner configuration type Config; /// The initial equipement type, the database serialisation will be to be converted into this type + // TODO[!]: Try to remove as it is present in Database type InitialEquipementType; /// The initial equipement list, about to be converted into a refined list type InitialEquipementListType: RecipeCollection; //: Into>; @@ -298,17 +299,6 @@ pub trait Scenario where for<'a> &'a <<::InitialEquipementList /// Retrieve A config fn get_tablename(&self) -> &str; - /// Automatically deserialize into an equipement - // TODO: Add to trait - // TODO: Add an optionnal initial filter ? - fn deserde_into_equipement( - &self, - filter: Option<&str>, - ) -> Result - where - T: From - + Into<<::InitialEquipementListType as RecipeCollection>::Recipes>; - // /// Automatically deserialize into an equipement // // TODO: Add to trait // // TODO: Add an optionnal initial filter ? @@ -317,12 +307,23 @@ pub trait Scenario where for<'a> &'a <<::InitialEquipementList // filter: Option<&str>, // ) -> Result // where - // T: From + Into<<::InitialEquipementType as RecipeCollection>::Recipes>, - // ::InitialEquipementListType: RecipeCollection, - // { - // RecipeCollection::from_iter_intermediate::( - // self.get_database() - // .serialise_into_intermediate::(self.get_tablename(), filter)?, - // ) - // } + // T: From + // + Into<<::InitialEquipementListType as RecipeCollection>::Recipes>; + + /// Automatically deserialize into an equipement + // TODO: Add to trait + // TODO: Add an optionnal initial filter ? + fn deserde_into_equipement( + &self, + filter: Option<&str>, + ) -> Result + where + T: From<<::DatabaseType as RecipeDatabase>::InnerType> + + Into<<::InitialEquipementListType as RecipeCollection>::Recipes>, + { + RecipeCollection::from_iter_intermediate::( + self.get_database() + .serialise_into_intermediate::(self.get_tablename(), filter)?, + ) + } } diff --git a/weaponry/src/weaponry_structs/equipement_scenario.rs b/weaponry/src/weaponry_structs/equipement_scenario.rs index 0d3c736..4a99840 100644 --- a/weaponry/src/weaponry_structs/equipement_scenario.rs +++ b/weaponry/src/weaponry_structs/equipement_scenario.rs @@ -11,7 +11,7 @@ use crate::{ error::FatalEquipementError, interfaces::{RecipeCollection, RecipeDatabase, Scenario}, weaponry_structs::{ - Equipement, InitialEquipementList, RefinedEquipementList, + InitialEquipementList, RefinedEquipementList, equipement_impl_database::EquipementDatabase, equipement_structs::{EqFinishing, EqMaterial, EqNature, EqShape, InnerEquipementStats}, }, @@ -134,21 +134,4 @@ impl Scenario for CrossRecipeScenario { fn get_database(&self) -> &Self::DatabaseType { &self.database } - - /// Automatically deserialize into an equipement - // TODO: Add to trait - // TODO: Add an optionnal initial filter ? - fn deserde_into_equipement( - &self, - filter: Option<&str>, - ) -> Result - where - T: From - + Into<<::InitialEquipementListType as RecipeCollection>::Recipes>, - { - RecipeCollection::from_iter_intermediate::( - self.get_database() - .serialise_into_intermediate::(self.get_tablename(), filter)?, - ) - } }