diff options
| -rw-r--r-- | src/parameter.rs | 16 | ||||
| -rw-r--r-- | src/template.rs | 17 |
2 files changed, 30 insertions, 3 deletions
diff --git a/src/parameter.rs b/src/parameter.rs index 3ae88cd..4b40c10 100644 --- a/src/parameter.rs +++ b/src/parameter.rs @@ -27,9 +27,19 @@ impl Parameter { } } -// pub fn from_json(val: &Value) -> Option<Parameter> { -// Self::from_typed_json(ParameterType::from_str(val.get(0)?.as_str()?)?, val.get(1)?) -// } + pub fn guess_from_json(val: &Value) -> Option<Parameter> { + let typ = + if val.is_string() { + ParameterType::String + } else if val.is_u64() || val.is_i64() { + ParameterType::Int + } else if val.is_f64() { + ParameterType::Float + } else { + return None + }; + Self::from_typed_json(typ, val.get(1)?) + } pub fn as_str(&self) -> Option<&str> { if let Self::String(str) = self { diff --git a/src/template.rs b/src/template.rs index b6b34cb..24e672b 100644 --- a/src/template.rs +++ b/src/template.rs @@ -1,6 +1,7 @@ use std::collections::HashMap; +use serde_json::{json, Value}; use crate::parameter::Parameter; #[derive(Debug)] @@ -24,4 +25,20 @@ impl Template { pub fn empty(name: &str) -> Self { Self::new(name, HashMap::new()) } + + pub fn from_json(val: Value) -> Option<Template> { + if val.is_string(){ + return Some(Self::empty(val.as_str()?)); + } + let name = val.get("type")?.as_str()?.to_string(); + let mut args = Vec::new(); + for arg in val.get("args").unwrap_or(&json!({})).as_array()? { + args.push(Parameter::guess_from_json(arg)?); + } + let mut kwargs = HashMap::new(); + for (key, arg) in val.get("kwargs").unwrap_or(&json!({})).as_object()? { + kwargs.insert(key.to_string(), Parameter::guess_from_json(arg)?); + } + Some(Template {name, args, kwargs}) + } } |