sel/wgu
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases 1 Packages Wiki Activity Actions

refactor: moved get_template into new impl for wgu::types::ObjectTemplate

Browse source
This commit is contained in:
selene 2025-12-18 17:24:24 +01:00
parent 3342ef5332
commit 226b880fb6
Signed by: sel
SSH key fingerprint: SHA256:33R/4Rx5Lu4o81LyJyXdMrmP5CJ6j7j1Soo0Dn7mKc0
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
server/src/lib.rs
View file

@ -6,16 +6,18 @@ use crate::types::{ObjectInstance, ObjectTemplate};
use serde_json::{Value, json};
fn get_template(object_type: &str) -> Result<ObjectTemplate, String> {
let modules = item_registry();
let template: ObjectTemplate = match modules.get(object_type) {
Some(ModuleItem::Template(template_str)) => toml::from_str(template_str).unwrap(),
Some(_) => panic!("{} is not a ModuleItem::Template", object_type),
None => return Err(format!("template {} doesn't exist", object_type))
};
Ok(template)
impl ObjectTemplate {
fn from_object_type(object_type: &str) -> Result<ObjectTemplate, String> {
let modules = item_registry();
let template: ObjectTemplate = match modules.get(object_type) {
Some(ModuleItem::Template(template_str)) => toml::from_str(template_str).unwrap(),
Some(_) => panic!("{} is not a ModuleItem::Template", object_type),
None => return Err(format!("template {} doesn't exist", object_type))
};
Ok(template)
}
}
impl ObjectInstance {
@ -33,7 +35,7 @@ impl ObjectInstance {
pub fn validate(obj: &ObjectInstance) -> Result<(), String> {
let modules = item_registry();
let object_type = &obj.object_type;
let template = get_template(object_type)?;
let template = ObjectTemplate::from_object_type(object_type)?;
match modules.get(format!("{}:func:validator", object_type).as_str()) {
Some(ModuleItem::Validator(validate)) => validate(&obj)?,
@ -66,7 +68,7 @@ impl ObjectInstance {
pub fn transform(obj: &ObjectInstance, source: &str, destination: &str) -> Result<Self, String> {
let object_type = &obj.object_type;
let template = get_template(object_type)?;
let template = ObjectTemplate::from_object_type(object_type)?;
// assuming that the property to transform (source) is 'input.some.thing.nya',
// source_parts[0] is the category (input)