Skip to content
Snippets Groups Projects
Commit 4fe55b12 authored by codecraft's avatar codecraft :crocodile:
Browse files

Some rather small changes

parent 91fb02ce
No related branches found
No related tags found
1 merge request!1Initial feature merge
...@@ -71,7 +71,6 @@ impl Request<'_> { ...@@ -71,7 +71,6 @@ impl Request<'_> {
_ => false, _ => false,
} }
} }
// pub fn get_post_form_key<T: FromRequest>(&self, data: Data) -> T {}
pub fn get_get_form_keys<'a>( pub fn get_get_form_keys<'a>(
&'a self, &'a self,
keys: &'a [&str], keys: &'a [&str],
...@@ -115,7 +114,7 @@ impl Request<'_> { ...@@ -115,7 +114,7 @@ impl Request<'_> {
&self, &self,
keys: &[&str], keys: &[&str],
data: &Data, data: &Data,
) -> Result<Vec<String>, ParseFormError> { ) -> Result<HashMap<&str, Result<&str, ParseFormError>>, ParseFormError> {
let mut post_type = self let mut post_type = self
.headers .headers
.iter() .iter()
...@@ -131,6 +130,7 @@ impl Request<'_> { ...@@ -131,6 +130,7 @@ impl Request<'_> {
let post_type: Vec<&str> = post_type.trim().split(';').collect(); let post_type: Vec<&str> = post_type.trim().split(';').collect();
let mime_type = post_type[0].parse::<Mime>().unwrap(); let mime_type = post_type[0].parse::<Mime>().unwrap();
let mut result = HashMap::new();
match mime_type { match mime_type {
Mime::ApplicationXWwwFormUrlencoded => { Mime::ApplicationXWwwFormUrlencoded => {
let data = String::from_utf8(data.buffer.clone()).unwrap(); let data = String::from_utf8(data.buffer.clone()).unwrap();
...@@ -139,15 +139,15 @@ impl Request<'_> { ...@@ -139,15 +139,15 @@ impl Request<'_> {
.map(|kvp| kvp.split_once("=").unwrap()) .map(|kvp| kvp.split_once("=").unwrap())
.collect::<HashMap<&str, &str>>(); .collect::<HashMap<&str, &str>>();
let mut result: Vec<String> = Vec::with_capacity(keys.len());
for key in keys { for key in keys {
if let Some(val) = kvps.get(key) { let entry = if let Some(val) = kvps.get(key) {
result.push(val.to_string()); Ok(*val)
} else { } else {
return Err(ParseFormError { Err(ParseFormError {
error: ParseErrors::NoData, error: ParseErrors::NoData,
}); })
} };
result.insert(*key, entry);
} }
Ok(result) Ok(result)
} }
...@@ -158,7 +158,7 @@ impl Request<'_> { ...@@ -158,7 +158,7 @@ impl Request<'_> {
.unwrap() .unwrap()
.strip_prefix("boundary=") .strip_prefix("boundary=")
.unwrap(); .unwrap();
let mut boundary = "--".as_bytes().to_vec(); let mut boundary = b"--".to_vec();
boundary.extend_from_slice(from_req.trim_matches('"').as_bytes()); boundary.extend_from_slice(from_req.trim_matches('"').as_bytes());
let mut end_boundary = boundary.clone(); let mut end_boundary = boundary.clone();
end_boundary.extend_from_slice(b"--"); end_boundary.extend_from_slice(b"--");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment