Finished to merge some elements to polymorphism
This commit is contained in:
parent
4380ad5591
commit
93d1bbbbe7
|
|
@ -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 <<<Self as Scenario>::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<impl RecipeCollection<Recipes = Self::Recipe>>;
|
||||
|
|
@ -298,17 +299,6 @@ pub trait Scenario where for<'a> &'a <<<Self as Scenario>::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<T>(
|
||||
&self,
|
||||
filter: Option<&str>,
|
||||
) -> Result<Self::InitialEquipementListType, FatalEquipementError>
|
||||
where
|
||||
T: From<Self::InitialEquipementType>
|
||||
+ Into<<<Self as Scenario>::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 <<<Self as Scenario>::InitialEquipementList
|
|||
// filter: Option<&str>,
|
||||
// ) -> Result<Self::InitialEquipementListType, FatalEquipementError>
|
||||
// where
|
||||
// T: From<Self::InitialEquipementType> + Into<<<Self as Scenario>::InitialEquipementType as RecipeCollection>::Recipes>,
|
||||
// <Self as Scenario>::InitialEquipementListType: RecipeCollection,
|
||||
// {
|
||||
// RecipeCollection::from_iter_intermediate::<T>(
|
||||
// self.get_database()
|
||||
// .serialise_into_intermediate::<T>(self.get_tablename(), filter)?,
|
||||
// )
|
||||
// }
|
||||
// T: From<Self::InitialEquipementType>
|
||||
// + Into<<<Self as Scenario>::InitialEquipementListType as RecipeCollection>::Recipes>;
|
||||
|
||||
/// Automatically deserialize into an equipement
|
||||
// TODO: Add to trait
|
||||
// TODO: Add an optionnal initial filter ?
|
||||
fn deserde_into_equipement<T>(
|
||||
&self,
|
||||
filter: Option<&str>,
|
||||
) -> Result<Self::InitialEquipementListType, FatalEquipementError>
|
||||
where
|
||||
T: From<<<Self as Scenario>::DatabaseType as RecipeDatabase>::InnerType>
|
||||
+ Into<<<Self as Scenario>::InitialEquipementListType as RecipeCollection>::Recipes>,
|
||||
{
|
||||
RecipeCollection::from_iter_intermediate::<T>(
|
||||
self.get_database()
|
||||
.serialise_into_intermediate::<T>(self.get_tablename(), filter)?,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<T>(
|
||||
&self,
|
||||
filter: Option<&str>,
|
||||
) -> Result<Self::InitialEquipementListType, FatalEquipementError>
|
||||
where
|
||||
T: From<Self::InitialEquipementType>
|
||||
+ Into<<<Self as Scenario>::InitialEquipementListType as RecipeCollection>::Recipes>,
|
||||
{
|
||||
RecipeCollection::from_iter_intermediate::<T>(
|
||||
self.get_database()
|
||||
.serialise_into_intermediate::<T>(self.get_tablename(), filter)?,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue