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

define lookup and search methods as Request implementation constructors

Browse Source
This commit is contained in:
yggverse 2025-01-19 07:29:42 +02:00
parent d4efcbca37
commit 0f6e54a3ee
2 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,11 +86,12 @@ impl Client {
Error::Unsupported => callback(Response::Failure(Failure::Error {
message: "Request scheme yet not supported".to_string(),
})),
_ => request::lookup(query, Some(&cancellable), |result| {
// try async resolver
_ => Request::lookup(query, Some(&cancellable), |result| {
callback(match result {
// redirection with scheme auto-complete or default search provider
Ok(request) => Response::Redirect(Redirect::Foreground(request)),
// unresolvable request issue
// unresolvable request.
Err(e) => Response::Failure(Failure::Error {
message: e.to_string(),
}),

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

@ -57,6 +57,58 @@ impl Request {
}
}
/// Create new `Self` as the search query to default provider
/// @TODO
// * implement DNS lookup before apply this option
// * make search provider optional
// * validate request len by gemini specifications
pub fn search(query: &str) -> Self {
Self::from_uri(search::tgls(query), None, None).unwrap() // no handler as unexpected
}
/// Create new `Self` using DNS async resolver (slow method)
/// * useful for scheme-less requests, before apply search redirect
pub fn lookup(
query: &str,
cancellable: Option<&Cancellable>,
callback: impl FnOnce(Result<Self, Error>) + 'static,
) {
use gtk::{
gio::{NetworkAddress, Resolver},
prelude::{NetworkAddressExt, ResolverExt},
};
const DEFAULT_SCHEME: &str = "gemini://";
const DEFAULT_PORT: u16 = 1965;
const TIMEOUT: u32 = 1000;
let request = match query.trim().strip_prefix(DEFAULT_SCHEME) {
Some(postfix) => format!("{DEFAULT_SCHEME}{postfix}"),
None => query.to_string(),
};
let resolver = Resolver::default();
resolver.set_timeout(TIMEOUT);
match NetworkAddress::parse_uri(&request, DEFAULT_PORT) {
Ok(connectable) => resolver.lookup_by_name_async(
&connectable.hostname(),
cancellable,
move |resolve| {
callback(if resolve.is_ok() {
match Uri::parse(&request, UriFlags::NONE) {
Ok(uri) => Self::from_uri(uri, None, None),
Err(e) => Err(Error::Glib(e)),
}
} else {
Ok(Self::search(&request))
})
},
),
Err(_) => callback(Ok(Self::search(&request))), // @TODO not completed yet, fix invalid URI issue
}
}
// Actions
/// Handle `Self` request
@ -106,55 +158,3 @@ impl Request {
1 + count
}
}
// Tools
/// Create new search `Request`
/// @TODO
// * implement DNS lookup before apply this option
// * make search provider optional
// * validate request len by gemini specifications
pub fn search(query: &str) -> Request {
Request::from_uri(search::tgls(query), None, None).unwrap() // no handler as unexpected
}
/// Asynchronously check request string contain resolvable query
/// * useful for scheme-less requests, before do search redirect
pub fn lookup(
query: &str,
cancellable: Option<&Cancellable>,
callback: impl FnOnce(Result<Request, Error>) + 'static,
) {
use gtk::{
gio::{NetworkAddress, Resolver},
prelude::{NetworkAddressExt, ResolverExt},
};
const DEFAULT_SCHEME: &str = "gemini://";
const DEFAULT_PORT: u16 = 1965;
const TIMEOUT: u32 = 1000;
let request = match query.trim().strip_prefix(DEFAULT_SCHEME) {
Some(postfix) => format!("{DEFAULT_SCHEME}{postfix}"),
None => query.to_string(),
};
let resolver = Resolver::default();
resolver.set_timeout(TIMEOUT);
match NetworkAddress::parse_uri(&request, DEFAULT_PORT) {
Ok(connectable) => {
resolver.lookup_by_name_async(&connectable.hostname(), cancellable, move |resolve| {
callback(if resolve.is_ok() {
match Uri::parse(&request, UriFlags::NONE) {
Ok(uri) => Request::from_uri(uri, None, None),
Err(e) => Err(Error::Glib(e)),
}
} else {
Ok(search(&request))
})
})
}
Err(_) => callback(Ok(search(&request))), // @TODO not completed yet, fix invalid URI issue
}
}