YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-03-13 06:01:21 +00:00
Code Issues Projects Releases Wiki Activity

fix lookup query detection

Browse Source
This commit is contained in:
yggverse 2025-01-19 09:02:39 +02:00
parent 0c8d1e47c9
commit 8d3c4319c6
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/browser/window/tab/item/page/client.rs
View File

@ -86,7 +86,7 @@ impl Client {
Error::Unsupported => callback(Response::Failure(Failure::Error { Error::Unsupported => callback(Response::Failure(Failure::Error {
message: "Request scheme yet not supported".to_string(), message: "Request scheme yet not supported".to_string(),
})), })),
// try async resolver // try async resolver (slow method)
_ => Request::lookup(query, Some(&cancellable), |result| { _ => Request::lookup(query, Some(&cancellable), |result| {
callback(match result { callback(match result {
// redirection with scheme auto-complete or default search provider // redirection with scheme auto-complete or default search provider

50
src/app/browser/window/tab/item/page/client/request.rs
View File

@ -78,34 +78,36 @@ impl Request {
prelude::{NetworkAddressExt, ResolverExt}, prelude::{NetworkAddressExt, ResolverExt},
}; };
const DEFAULT_SCHEME: &str = "gemini://"; const DEFAULT_SCHEME: &str = "gemini";
const DEFAULT_PORT: u16 = 1965; const DEFAULT_PORT: u16 = 1965;
const TIMEOUT: u32 = 1000; const TIMEOUT: u32 = 250; // ms
let request = match query.trim().strip_prefix(DEFAULT_SCHEME) { let query = query.trim();
Some(postfix) => format!("{DEFAULT_SCHEME}{postfix}"),
None => query.to_string(),
};
let resolver = Resolver::default(); match Uri::parse(query, UriFlags::NONE) {
resolver.set_timeout(TIMEOUT); Ok(uri) => callback(Self::from_uri(uri, None, None)),
Err(_) => {
// try default scheme suggestion
let suggestion = format!("{DEFAULT_SCHEME}://{query}");
match NetworkAddress::parse_uri(&request, DEFAULT_PORT) { let resolver = Resolver::default();
Ok(connectable) => resolver.lookup_by_name_async( resolver.set_timeout(TIMEOUT);
&connectable.hostname(),
cancellable, match NetworkAddress::parse_uri(&suggestion, DEFAULT_PORT) {
move |resolve| { Ok(connectable) => resolver.lookup_by_name_async(
callback(if resolve.is_ok() { &connectable.hostname(),
match Uri::parse(&request, UriFlags::NONE) { cancellable,
Ok(uri) => Self::from_uri(uri, None, None), move |resolve| {
Err(e) => Err(Error::Glib(e)), callback(if resolve.is_ok() {
} Self::parse(&suggestion, None)
} else { } else {
Ok(Self::search(&request)) Ok(Self::search(&suggestion))
}) })
}, },
), ),
Err(_) => callback(Ok(Self::search(&request))), // @TODO not completed yet, fix invalid URI issue Err(_) => callback(Ok(Self::search(&suggestion))),
}
}
} }
} }