morrigan/crabbysearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🧹 chore: make clippy happy (#201)

Browse source
This commit is contained in:
neon_arch 2023-09-10 18:56:54 +03:00
parent ac4e29a93f
commit 12bfc5276a
6 changed files with 84 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config/parser.rs
View file

@ -117,7 +117,7 @@ impl Config {
.get::<_, HashMap<String, bool>>("upstream_search_engines")?
.into_iter()
.filter_map(|(key, value)| value.then_some(key))
.filter_map(|engine| crate::engines::engine_models::EngineHandler::new(engine))
.filter_map(|engine| crate::engines::engine_models::EngineHandler::new(&engine))
.collect(),
request_timeout: globals.get::<_, u8>("request_timeout")?,
threads,

4
src/results/aggregation_models.rs
View file

@ -132,9 +132,9 @@ impl SearchResults {
) -> Self {
Self {
results,
page_query,
page_query: page_query.to_owned(),
style: Style::default(),
engine_errors_info,
engine_errors_info: engine_errors_info.to_owned(),
disallowed: Default::default(),
filtered: Default::default(),
}

6
src/results/aggregator.rs
View file

@ -93,7 +93,7 @@ pub async fn aggregate(
tasks.push(tokio::spawn(async move {
search_engine
.results(
query,
&query,
page,
user_agent.clone(),
request_timeout,
@ -162,13 +162,13 @@ pub async fn aggregate(
filter_with_lists(
&mut result_map,
&mut blacklist_map,
&file_path(FileType::BlockList)?,
file_path(FileType::BlockList)?,
)?;
filter_with_lists(
&mut blacklist_map,
&mut result_map,
&file_path(FileType::AllowList)?,
file_path(FileType::AllowList)?,
)?;
drop(blacklist_map);

18
src/server/routes.rs
View file

@ -22,7 +22,7 @@ use tokio::join;
// ---- Constants ----
/// Initialize redis cache connection once and store it on the heap.
const REDIS_CACHE: async_once_cell::OnceCell<RedisCache> = async_once_cell::OnceCell::new();
static REDIS_CACHE: async_once_cell::OnceCell<RedisCache> = async_once_cell::OnceCell::new();
/// A named struct which deserializes all the user provided search parameters and stores them.
///
@ -184,7 +184,7 @@ async fn results(
req: HttpRequest,
safe_search: u8,
) -> Result<SearchResults, Box<dyn std::error::Error>> {
let redis_cache: RedisCache = REDIS_CACHE
let mut redis_cache: RedisCache = REDIS_CACHE
.get_or_init(async {
// Initialize redis cache connection pool only one and store it in the heap.
RedisCache::new(&config.redis_url, 5).await.unwrap()
@ -203,14 +203,16 @@ async fn results(
if safe_search == 4 {
let mut results: SearchResults = SearchResults::default();
let mut _flag: bool =
is_match_from_filter_list(&file_path(FileType::BlockList)?, &query)?;
_flag = !is_match_from_filter_list(&file_path(FileType::AllowList)?, &query)?;
is_match_from_filter_list(file_path(FileType::BlockList)?, query)?;
_flag = !is_match_from_filter_list(file_path(FileType::AllowList)?, query)?;
if _flag {
results.set_disallowed();
results.add_style(&config.style);
results.set_page_query(&query);
redis_cache.cache_results(serde_json::to_string(&results)?, &url)?;
results.set_page_query(query);
redis_cache
.cache_results(&serde_json::to_string(&results)?, &url)
.await?;
return Ok(results);
}
}
@ -257,7 +259,9 @@ async fn results(
results.set_filtered();
}
results.add_style(&config.style);
redis_cache.cache_results(serde_json::to_string(&results)?, &url)?;
redis_cache
.cache_results(&serde_json::to_string(&results)?, &url)
.await?;
Ok(results)
}
}