YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-04-01 17:15:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix search request detection, fix suggestion formatter

Browse source
This commit is contained in:
yggverse 2025-01-25 19:41:12 +02:00
parent c6d24565fd
commit 3e570bd268
1 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/app/browser/window/tab/item/client.rs
View file

@ -152,7 +152,12 @@ fn lookup(
Ok(uri) => callback(feature, cancellable, Ok(uri)), Ok(uri) => callback(feature, cancellable, Ok(uri)),
Err(_) => { Err(_) => {
// try default scheme suggestion // try default scheme suggestion
let suggestion = format!("{DEFAULT_SCHEME}://{query}"); let suggestion = format!(
"{DEFAULT_SCHEME}://{}",
query
.strip_prefix(&format!("{DEFAULT_SCHEME}://"))
.unwrap_or(query)
);
let resolver = Resolver::default(); let resolver = Resolver::default();
resolver.set_timeout(TIMEOUT); resolver.set_timeout(TIMEOUT);
@ -161,22 +166,25 @@ fn lookup(
Ok(connectable) => resolver.lookup_by_name_async( Ok(connectable) => resolver.lookup_by_name_async(
&connectable.hostname(), &connectable.hostname(),
Some(&cancellable.clone()), Some(&cancellable.clone()),
move |resolve| { {
callback( let query = query.to_owned();
feature, move |resolve| {
cancellable, callback(
if resolve.is_ok() { feature,
match Uri::parse(&suggestion, UriFlags::NONE) { cancellable,
Ok(uri) => Err(uri), if resolve.is_ok() {
Err(_) => Err(search(&suggestion)), match Uri::parse(&suggestion, UriFlags::NONE) {
} Ok(uri) => Err(uri),
} else { Err(_) => Err(search(&query)),
Err(search(&suggestion)) }
}, } else {
) Err(search(&query))
},
)
}
}, },
), ),
Err(_) => callback(feature, cancellable, Err(search(&suggestion))), Err(_) => callback(feature, cancellable, Err(search(&query))),
} }
} }
} }