YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_http: reduce allocations in Request::urldecode

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-03 17:42:57 +02:00
parent 7419c51434
commit c2f79aa368
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
aquatic_http/src/lib/protocol/request.rs
View file

@ -57,7 +57,8 @@ impl Request {
.with_context(|| format!("no key in {}", part))?; .with_context(|| format!("no key in {}", part))?;
let value = key_and_value.next() let value = key_and_value.next()
.with_context(|| format!("no value in {}", part))?; .with_context(|| format!("no value in {}", part))?;
let value = Self::urldecode(value).to_string(); let value = Self::urldecode(value)?
.to_string();
if key == "info_hash" { if key == "info_hash" {
info_hashes.push(value); info_hashes.push(value);
@ -119,7 +120,7 @@ impl Request {
/// UTF-8 string, meaning that non-ascii bytes are invalid characters. /// UTF-8 string, meaning that non-ascii bytes are invalid characters.
/// Therefore, these bytes must be converted to their equivalent multi-byte /// Therefore, these bytes must be converted to their equivalent multi-byte
/// UTF-8 encodings. /// UTF-8 encodings.
fn urldecode(value: &str) -> String { fn urldecode(value: &str) -> anyhow::Result<String> {
let mut processed = String::new(); let mut processed = String::new();
for (i, part) in value.split('%').enumerate(){ for (i, part) in value.split('%').enumerate(){
@ -127,23 +128,23 @@ impl Request {
processed.push_str(part); processed.push_str(part);
} else if part.len() >= 2 { } else if part.len() >= 2 {
let mut two_first = String::with_capacity(2); let mut two_first = String::with_capacity(2);
let mut rest = String::new();
for (j, c) in part.chars().enumerate(){ for (j, c) in part.chars().enumerate(){
if j < 2 { if j == 0 {
two_first.push(c);
} else if j == 1 {
two_first.push(c); two_first.push(c);
} else {
rest.push(c);
}
}
let byte = u8::from_str_radix(&two_first, 16).unwrap(); let byte = u8::from_str_radix(&two_first, 16)?;
processed.push(byte as char); processed.push(byte as char);
processed.push_str(&rest); } else {
processed.push(c);
}
}
} }
} }
processed Ok(processed)
} }
} }