allow calc queries to end in =
This commit is contained in:
parent
e35a840a5c
commit
64fd3bcaae
@ -3,27 +3,35 @@ use crate::engines::EngineResponse;
|
||||
use super::regex;
|
||||
|
||||
pub fn request(query: &str) -> EngineResponse {
|
||||
let Some(result_html) = evaluate(query, true) else {
|
||||
let query = clean_query(query.to_string());
|
||||
|
||||
let Some(result_html) = evaluate(&query, true) else {
|
||||
return EngineResponse::new();
|
||||
};
|
||||
|
||||
EngineResponse::answer_html(format!(
|
||||
r#"<p class="answer-calc-query">{query} =</p>
|
||||
<h3><b>{result_html}</b></h3>"#,
|
||||
query = html_escape::encode_text(query),
|
||||
query = html_escape::encode_text(&query),
|
||||
))
|
||||
}
|
||||
|
||||
pub fn request_autocomplete(query: &str) -> Vec<String> {
|
||||
let mut results = Vec::new();
|
||||
|
||||
if let Some(result) = evaluate(query, false) {
|
||||
let query = clean_query(query.to_string());
|
||||
|
||||
if let Some(result) = evaluate(&query, false) {
|
||||
results.push(format!("{query}={result}"));
|
||||
}
|
||||
|
||||
results
|
||||
}
|
||||
|
||||
fn clean_query(query: String) -> String {
|
||||
query.strip_suffix('=').unwrap_or(&query).trim().to_string()
|
||||
}
|
||||
|
||||
fn evaluate(query: &str, html: bool) -> Option<String> {
|
||||
// at least 3 characters and not one of the short constants
|
||||
if query.len() < 3 && !matches!(query.to_lowercase().as_str(), "pi" | "e" | "c") {
|
||||
|
Loading…
Reference in New Issue
Block a user