beenull/libreddit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

client.rs: remove some String allocations

Browse source
This commit is contained in:
hinto.janai 2023-10-27 09:05:22 -04:00
parent 2815dc5209
commit 3e236e7ab5
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/client.rs
View file

@ -34,28 +34,25 @@ static CLIENT: Lazy<Client<HttpsConnector<HttpConnector>>> = Lazy::new(|| {
#[cached(size = 1024, time = 600, result = true)] #[cached(size = 1024, time = 600, result = true)]
pub async fn canonical_path(path: String) -> Result<Option<String>, String> { pub async fn canonical_path(path: String) -> Result<Option<String>, String> {
let res = reddit_head(path.clone(), true).await?; let res = reddit_head(path.clone(), true).await?;
let status = res.status().as_u16();
if res.status() == 429 { match status {
return Err("Too many requests.".to_string()); 429 => return Err("Too many requests.".to_string()),
};
// If Reddit responds with a 2xx, then the path is already canonical. // If Reddit responds with a 2xx, then the path is already canonical.
if res.status().to_string().starts_with('2') { 200..=299 => return Ok(Some(path)),
return Ok(Some(path));
}
// If Reddit responds with anything other than 3xx (except for the 2xx as // If Reddit responds with anything other than 3xx (except for the 2xx as
// above), return a None. // above), return a None.
if !res.status().to_string().starts_with('3') { 300..=399 => return Ok(None),
return Ok(None);
}
Ok( _ => Ok(
res res
.headers() .headers()
.get(header::LOCATION) .get(header::LOCATION)
.map(|val| percent_encode(val.as_bytes(), CONTROLS).to_string().trim_start_matches(REDDIT_URL_BASE).to_string()), .map(|val| percent_encode(val.as_bytes(), CONTROLS).to_string().trim_start_matches(REDDIT_URL_BASE).to_string()),
) ),
}
} }
pub async fn proxy(req: Request<Body>, format: &str) -> Result<Response<Body>, String> { pub async fn proxy(req: Request<Body>, format: &str) -> Result<Response<Body>, String> {
@ -136,7 +133,7 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo
let builder = Request::builder() let builder = Request::builder()
.method(method) .method(method)
.uri(&url) .uri(&url)
.header("User-Agent", format!("web:libreddit:{}", env!("CARGO_PKG_VERSION"))) .header("User-Agent", concat!("web:libreddit:", env!("CARGO_PKG_VERSION")))
.header("Host", "www.reddit.com") .header("Host", "www.reddit.com")
.header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8") .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8")
.header("Accept-Encoding", if method == Method::GET { "gzip" } else { "identity" }) .header("Accept-Encoding", if method == Method::GET { "gzip" } else { "identity" })
@ -158,7 +155,7 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo
Ok(mut response) => { Ok(mut response) => {
// Reddit may respond with a 3xx. Decide whether or not to // Reddit may respond with a 3xx. Decide whether or not to
// redirect based on caller params. // redirect based on caller params.
if response.status().to_string().starts_with('3') { if response.status().is_redirection() {
if !redirect { if !redirect {
return Ok(response); return Ok(response);
}; };