tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move parse_query into json_schema

This commit is contained in:
Dietmar Maurer 2018-11-05 15:20:27 +01:00
parent 0dde2f04d0
commit 6d77fb4063
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/json_schema.rs
View File

@ -1,4 +1,7 @@
use failure::*;
use std::collections::HashMap; use std::collections::HashMap;
use url::form_urlencoded;
use serde_json::{json, Value};
pub type PropertyMap = HashMap<&'static str, Jss>; pub type PropertyMap = HashMap<&'static str, Jss>;
@ -39,7 +42,7 @@ pub struct JssObject {
pub description: &'static str, pub description: &'static str,
pub optional: Option<bool>, pub optional: Option<bool>,
pub additional_properties: Option<bool>, pub additional_properties: Option<bool>,
pub properties: Box<HashMap<&'static str, Jss>>, pub properties: HashMap<&'static str, Jss>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -107,7 +110,7 @@ macro_rules! parameter {
$( $(
map.insert(stringify!($name), $e); map.insert(stringify!($name), $e);
)* )*
Box::new(map) map
} }
}; };
@ -116,6 +119,20 @@ macro_rules! parameter {
} }
pub fn parse_parameter_strings(data: &Vec<(String, String)>, schema: &Jss) -> Result<Value, Error> {
println!("QUERY Strings {:?}", data);
Ok(json!(null))
}
pub fn parse_query(query: &str, schema: &Jss) -> Result<Value, Error> {
let raw_param: Vec<(String, String)> =
form_urlencoded::parse(query.as_bytes()).into_owned().collect();
parse_parameter_strings(&raw_param, schema)
}
#[test] #[test]
fn test_shema1() { fn test_shema1() {

30
src/main.rs
View File

@ -1,12 +1,13 @@
extern crate apitest; extern crate apitest;
//use failure::*; use failure::*;
use std::collections::HashMap; use std::collections::HashMap;
use lazy_static::lazy_static; use lazy_static::lazy_static;
//use apitest::json_schema::*; //use apitest::json_schema::*;
use apitest::api_info::*; use apitest::api_info::*;
use apitest::json_schema::*;
//use serde_derive::{Serialize, Deserialize}; //use serde_derive::{Serialize, Deserialize};
use serde_json::{json, Value}; use serde_json::{json, Value};
@ -25,20 +26,6 @@ macro_rules! http_error {
}} }}
} }
fn parse_query(query: &str) -> Value {
println!("PARSE QUERY {}", query);
// fixme: what about repeated parameters (arrays?)
let mut raw_param = HashMap::new();
for (k, v) in form_urlencoded::parse(query.as_bytes()) {
println!("QUERY PARAM {} value {}", k, v);
raw_param.insert(k, v);
}
println!("QUERY HASH {:?}", raw_param);
return json!(null);
}
fn handle_request(req: Request<Body>) -> Response<Body> { fn handle_request(req: Request<Body>) -> Response<Body> {
@ -63,9 +50,9 @@ fn handle_request(req: Request<Body>) -> Response<Body> {
println!("FOUND INFO"); println!("FOUND INFO");
let api_method_opt = match method { let api_method_opt = match method {
&Method::GET => &info.get, &Method::GET => &info.get,
// &Method::PUT => info.put, &Method::PUT => &info.put,
// &Method::POST => info.post, &Method::POST => &info.post,
// &Method::DELETE => info.delete, &Method::DELETE => &info.delete,
_ => &None, _ => &None,
}; };
let api_method = match api_method_opt { let api_method = match api_method_opt {
@ -77,7 +64,12 @@ fn handle_request(req: Request<Body>) -> Response<Body> {
// extract param // extract param
let param = match query { let param = match query {
Some(data) => parse_query(data), Some(data) => {
match parse_query(data, &api_method.parameters) {
Ok(query) => query,
Err(err) => http_error!(NOT_FOUND, format!("Unable to parse query parameters '{}' - {}", data, err)),
}
}
None => json!({}), None => json!({}),
}; };