YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-01-27 11:34:14 +00:00
Code Issues Projects Releases Wiki Activity

return Uri as Result to handle redirect on error

Browse Source
This commit is contained in:
yggverse 2025-01-22 05:44:30 +02:00
parent 130f66deff
commit 436899a248
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,14 +48,16 @@ impl Client {
let driver = self.driver.clone();
let subject = self.subject.clone();
// route by scheme parsed
move |feature, cancellable, uri| match uri.scheme().as_str() {
move |feature, cancellable, result| match result {
Ok(uri) => match uri.scheme().as_str() {
"gemini" => driver
.gemini
.handle(uri, feature, cancellable, is_snap_history),
scheme => {
// no scheme match driver, complete with failure message
let status = subject.page.content.to_status_failure();
status.set_description(Some(&format!("Scheme `{scheme}` yet not supported")));
status
.set_description(Some(&format!("Scheme `{scheme}` yet not supported")));
subject.page.title.replace(status.title());
subject
.page
@ -66,6 +68,13 @@ impl Client {
.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
}
},
// begin redirection to new address suggested
Err(uri) => subject
.page
.tab_action
.load
.activate(Some(&uri.to_string()), false),
}
})
}
@ -87,12 +96,11 @@ impl Client {
}
/// Create request using async DNS resolver (slow method)
/// * useful for scheme-less requests, before apply search redirect
/// * the `query` should not contain `feature` prefix
/// * return suggestion [Uri](https://docs.gtk.org/glib/struct.Uri.html) on failure (to handle as redirect)
fn lookup(
query: &str,
cancellable: Cancellable,
callback: impl FnOnce(Feature, Cancellable, Uri) + 'static,
callback: impl FnOnce(Feature, Cancellable, Result<Uri, Uri>) + 'static,
) {
use gtk::{
gio::{NetworkAddress, Resolver},
@ -106,7 +114,7 @@ fn lookup(
let (feature, query) = Feature::parse(query.trim());
match Uri::parse(query, UriFlags::NONE) {
Ok(uri) => callback(feature, cancellable, uri),
Ok(uri) => callback(feature, cancellable, Ok(uri)),
Err(_) => {
// try default scheme suggestion
let suggestion = format!("{DEFAULT_SCHEME}://{query}");
@ -124,16 +132,16 @@ fn lookup(
cancellable,
if resolve.is_ok() {
match Uri::parse(&suggestion, UriFlags::NONE) {
Ok(uri) => uri,
Err(_) => search(&suggestion),
Ok(uri) => Err(uri),
Err(_) => Err(search(&suggestion)),
}
} else {
search(&suggestion)
Err(search(&suggestion))
},
)
},
),
Err(_) => callback(feature, cancellable, search(&suggestion)),
Err(_) => callback(feature, cancellable, Err(search(&suggestion))),
}
}
}