0
0
mirror of https://github.com/neon-mmd/websurfx.git synced 2024-11-21 21:48:21 -05:00

perf: reduce the usage of clones (#603)

This commit is contained in:
neon_arch 2024-09-05 22:12:34 +05:30
parent f2d2068bcf
commit 4afc07f1d5

View File

@ -14,7 +14,6 @@ use futures::stream::FuturesUnordered;
use regex::Regex; use regex::Regex;
use reqwest::{Client, ClientBuilder}; use reqwest::{Client, ClientBuilder};
use std::sync::Arc; use std::sync::Arc;
use std::time::{SystemTime, UNIX_EPOCH};
use tokio::{ use tokio::{
fs::File, fs::File,
io::{AsyncBufReadExt, BufReader}, io::{AsyncBufReadExt, BufReader},
@ -93,13 +92,6 @@ pub async fn aggregate(
let user_agent: &str = random_user_agent(); let user_agent: &str = random_user_agent();
// Add a random delay before making the request.
if config.aggregator.random_delay || !config.debug {
let nanos = SystemTime::now().duration_since(UNIX_EPOCH)?.subsec_nanos() as f32;
let delay = ((nanos / 1_0000_0000 as f32).floor() as u64) + 1;
tokio::time::sleep(Duration::from_secs(delay)).await;
}
let mut names: Vec<&str> = Vec::with_capacity(0); let mut names: Vec<&str> = Vec::with_capacity(0);
// create tasks for upstream result fetching // create tasks for upstream result fetching
@ -188,19 +180,21 @@ pub async fn aggregate(
drop(blacklist_map); drop(blacklist_map);
} }
let mut results: Vec<SearchResult> = result_map let mut results: Box<[SearchResult]> = result_map
.iter() .into_iter()
.map(|(_, value)| { .map(|(_, mut value)| {
let mut copy = value.clone(); if !value.url.contains("temu.com") {
if !copy.url.contains("temu.com") { value.calculate_relevance(query.as_str())
copy.calculate_relevance(query.as_str())
} }
copy value
}) })
.collect(); .collect();
sort_search_results(&mut results); sort_search_results(&mut results);
Ok(SearchResults::new(results, &engine_errors_info)) Ok(SearchResults::new(
results,
engine_errors_info.into_boxed_slice(),
))
} }
/// Filters a map of search results using a list of regex patterns. /// Filters a map of search results using a list of regex patterns.
@ -265,7 +259,6 @@ fn sort_search_results(results: &mut [SearchResult]) {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use smallvec::smallvec;
use std::io::Write; use std::io::Write;
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
@ -281,7 +274,7 @@ mod tests {
description: "This domain is for use in illustrative examples in documents." description: "This domain is for use in illustrative examples in documents."
.to_owned(), .to_owned(),
relevance_score: 0.0, relevance_score: 0.0,
engine: smallvec!["Google".to_owned(), "Bing".to_owned()], engine: vec!["Google".to_owned(), "Bing".to_owned()],
}, },
)); ));
map_to_be_filtered.push(( map_to_be_filtered.push((
@ -290,7 +283,7 @@ mod tests {
title: "Rust Programming Language".to_owned(), title: "Rust Programming Language".to_owned(),
url: "https://www.rust-lang.org/".to_owned(), url: "https://www.rust-lang.org/".to_owned(),
description: "A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.".to_owned(), description: "A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.".to_owned(),
engine: smallvec!["Google".to_owned(), "DuckDuckGo".to_owned()], engine: vec!["Google".to_owned(), "DuckDuckGo".to_owned()],
relevance_score:0.0 relevance_score:0.0
},) },)
); );
@ -331,7 +324,7 @@ mod tests {
url: "https://www.example.com".to_owned(), url: "https://www.example.com".to_owned(),
description: "This domain is for use in illustrative examples in documents." description: "This domain is for use in illustrative examples in documents."
.to_owned(), .to_owned(),
engine: smallvec!["Google".to_owned(), "Bing".to_owned()], engine: vec!["Google".to_owned(), "Bing".to_owned()],
relevance_score: 0.0, relevance_score: 0.0,
}, },
)); ));
@ -341,7 +334,7 @@ mod tests {
title: "Rust Programming Language".to_owned(), title: "Rust Programming Language".to_owned(),
url: "https://www.rust-lang.org/".to_owned(), url: "https://www.rust-lang.org/".to_owned(),
description: "A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.".to_owned(), description: "A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.".to_owned(),
engine: smallvec!["Google".to_owned(), "DuckDuckGo".to_owned()], engine: vec!["Google".to_owned(), "DuckDuckGo".to_owned()],
relevance_score:0.0 relevance_score:0.0
}, },
)); ));
@ -398,7 +391,7 @@ mod tests {
url: "https://www.example.com".to_owned(), url: "https://www.example.com".to_owned(),
description: "This domain is for use in illustrative examples in documents." description: "This domain is for use in illustrative examples in documents."
.to_owned(), .to_owned(),
engine: smallvec!["Google".to_owned(), "Bing".to_owned()], engine: vec!["Google".to_owned(), "Bing".to_owned()],
relevance_score: 0.0, relevance_score: 0.0,
}, },
)); ));