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

implement Redirect options enum

Browse Source
This commit is contained in:
yggverse 2025-01-17 22:17:01 +02:00
parent 380ade924f
commit 29fee89e64
4 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,7 @@ impl Page {
snap_history(&self.profile, &self.navigation, None); // @TODO snap_history(&self.profile, &self.navigation, None); // @TODO
} }
use client::response::{Certificate, Failure, Input}; use client::response::{Certificate, Failure, Input, Redirect};
use client::Response; use client::Response;
self.client self.client
@ -211,7 +211,7 @@ impl Page {
let window_action = self.window_action.clone(); let window_action = self.window_action.clone();
move |response| { move |response| {
match response { match response {
Response::Certificate(certificate) => match certificate { Response::Certificate(this) => match this {
Certificate::Invalid { Certificate::Invalid {
title: certificate_title, title: certificate_title,
} }
@ -233,7 +233,7 @@ impl Page {
browser_action.update.activate(Some(&id)); browser_action.update.activate(Some(&id));
} }
}, },
Response::Failure(failure) => match failure { Response::Failure(this) => match this {
Failure::Status { message } | Failure::Error { message } => { Failure::Status { message } | Failure::Error { message } => {
// Update widget // Update widget
let status_page = content.to_status_failure(); let status_page = content.to_status_failure();
@ -259,7 +259,7 @@ impl Page {
browser_action.update.activate(Some(&id)); browser_action.update.activate(Some(&id));
} }
}, },
Response::Input(response_input) => match response_input { Response::Input(this) => match this {
Input::Response { Input::Response {
base, base,
title: response_title, title: response_title,
@ -301,22 +301,13 @@ impl Page {
browser_action.update.activate(Some(&id)); browser_action.update.activate(Some(&id));
} }
}, },
Response::Redirect { Response::Redirect(this) => match this {
referrer, Redirect::Background { source, target } => todo!(), // @TODO
request, Redirect::Foreground { source, target } => navigation
is_foreground,
} => {
// Some clients may support foreground redirects
// e.g. status code `31` in Gemini protocol
if is_foreground {
navigation
.request .request
.widget .widget
.entry .entry
.set_text(&request.to_string()); .set_text(&target.to_string()) // @TODO
}
// @TODO request_async
} }
Response::TextGemini { base, source, is_source_request } => { Response::TextGemini { base, source, is_source_request } => {
let widget = if is_source_request { let widget = if is_source_request {

24
src/app/browser/window/tab/item/page/client/driver/gemini.rs
View File

@ -1,5 +1,5 @@
use super::{ use super::{
response::{Certificate, Failure, Input}, response::{Certificate, Failure, Input, Redirect},
Profile, Response, Profile, Response,
}; };
use gtk::{ use gtk::{
@ -96,13 +96,12 @@ pub fn handle(
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-30-temporary-redirection // https://geminiprotocol.net/docs/protocol-specification.gmi#status-30-temporary-redirection
Status::Redirect => callback(match response.meta.data { Status::Redirect => callback(match response.meta.data {
Some(data) => match Uri::parse_relative(&base, &data.value, UriFlags::NONE) { Some(data) => match Uri::parse_relative(&base, &data.value, UriFlags::NONE) {
Ok(request) => Response::Redirect { Ok(target) => Response::Redirect(Redirect::Foreground {
referrer: base, source: base,
request, target,
is_foreground: false, }),
},
Err(e) => Response::Failure(Failure::Error { Err(e) => Response::Failure(Failure::Error {
message: format!("Could not parse target address: {}", e.message()), message: format!("Could not parse target address: {e}"),
}), }),
}, },
None => Response::Failure(Failure::Error { None => Response::Failure(Failure::Error {
@ -112,13 +111,12 @@ pub fn handle(
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-31-permanent-redirection // https://geminiprotocol.net/docs/protocol-specification.gmi#status-31-permanent-redirection
Status::PermanentRedirect => callback(match response.meta.data { Status::PermanentRedirect => callback(match response.meta.data {
Some(data) => match Uri::parse_relative(&base, &data.value, UriFlags::NONE) { Some(data) => match Uri::parse_relative(&base, &data.value, UriFlags::NONE) {
Ok(request) => Response::Redirect { Ok(target) => Response::Redirect(Redirect::Background {
referrer: base, source: base,
request, target,
is_foreground: true, }),
},
Err(e) => Response::Failure(Failure::Error { Err(e) => Response::Failure(Failure::Error {
message: format!("Could not parse target address: {}", e.message()), message: format!("Could not parse target address: {e}"),
}), }),
}, },
None => Response::Failure(Failure::Error { None => Response::Failure(Failure::Error {

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

@ -1,11 +1,13 @@
pub mod certificate; pub mod certificate;
pub mod failure; pub mod failure;
pub mod input; pub mod input;
pub mod redirect;
// Local dependencies // Local dependencies
pub use certificate::Certificate; pub use certificate::Certificate;
pub use failure::Failure; pub use failure::Failure;
pub use input::Input; pub use input::Input;
pub use redirect::Redirect;
// Global dependencies // Global dependencies
use gtk::{ use gtk::{
@ -28,11 +30,7 @@ pub enum Response {
is_source_request: bool, is_source_request: bool,
}, },
Input(Input), Input(Input),
Redirect { Redirect(Redirect),
is_foreground: bool,
referrer: Uri,
request: Uri,
},
Stream { Stream {
base: Uri, base: Uri,
mime: String, mime: String,

6
src/app/browser/window/tab/item/page/client/response/redirect.rs Normal file
View File

@ -0,0 +1,6 @@
use gtk::glib::Uri;
pub enum Redirect {
Foreground { source: Uri, target: Uri },
Background { source: Uri, target: Uri },
}