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

use shared Subject struct for Page and TabPage

Browse Source
This commit is contained in:
yggverse 2025-01-22 05:25:16 +02:00
parent 065bd8bfad
commit 5570b6fa85
4 changed files with 121 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
mod driver; mod driver;
mod feature; mod feature;
mod subject;
use super::Page; use super::Page;
use adw::TabPage; use adw::TabPage;
@ -11,11 +12,13 @@ use gtk::{
prelude::CancellableExt, prelude::CancellableExt,
}; };
use std::{cell::Cell, rc::Rc}; use std::{cell::Cell, rc::Rc};
use subject::Subject;
/// Multi-protocol client API for tab `Item` /// Multi-protocol client API for tab `Item`
pub struct Client { pub struct Client {
cancellable: Cell<Cancellable>, cancellable: Cell<Cancellable>,
driver: Rc<Driver>, driver: Rc<Driver>,
subject: Rc<Subject>,
} }
impl Client { impl Client {
@ -23,9 +26,14 @@ impl Client {
/// Create new `Self` /// Create new `Self`
pub fn init(page: &Rc<Page>, tab_page: &TabPage) -> Self { pub fn init(page: &Rc<Page>, tab_page: &TabPage) -> Self {
let subject = Rc::new(Subject {
page: page.clone(),
tab_page: tab_page.clone(),
});
Self { Self {
cancellable: Cell::new(Cancellable::new()), cancellable: Cell::new(Cancellable::new()),
driver: Rc::new(Driver::build(page, tab_page)), driver: Rc::new(Driver::build(&subject)),
subject,
} }
} }

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

@ -1,7 +1,6 @@
mod gemini; mod gemini;
use super::{Feature, Page}; use super::{Feature, Subject};
use adw::TabPage;
use gemini::Gemini; use gemini::Gemini;
use std::rc::Rc; use std::rc::Rc;
@ -14,9 +13,9 @@ impl Driver {
// Constructors // Constructors
/// Build new `Self` /// Build new `Self`
pub fn build(page: &Rc<Page>, tab_page: &TabPage) -> Self { pub fn build(subject: &Rc<Subject>) -> Self {
Driver { Driver {
gemini: Gemini::init(page, tab_page), gemini: Gemini::init(subject),
} }
} }
} }

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

@ -1,5 +1,4 @@
use super::{Feature, Page}; use super::{Feature, Subject};
use adw::TabPage;
use ggemini::client::{ use ggemini::client::{
connection::response::{data::Text, meta::Status}, connection::response::{data::Text, meta::Status},
Request, Request,
@ -19,25 +18,23 @@ use std::{cell::Cell, path::MAIN_SEPARATOR, rc::Rc, time::Duration};
pub struct Gemini { pub struct Gemini {
/// Should be initiated once /// Should be initiated once
client: Rc<ggemini::Client>, client: Rc<ggemini::Client>,
/// Handle targets
tab_page: TabPage,
page: Rc<Page>,
/// Validate redirection count by Gemini protocol specification /// Validate redirection count by Gemini protocol specification
redirects: Rc<Cell<usize>>, redirects: Rc<Cell<usize>>,
/// Handle target
subject: Rc<Subject>,
} }
impl Gemini { impl Gemini {
// Constructors // Constructors
/// Create new `Self` /// Create new `Self`
pub fn init(page: &Rc<Page>, tab_page: &TabPage) -> Self { pub fn init(subject: &Rc<Subject>) -> Self {
// Init supported protocol libraries // Init supported protocol libraries
let client = Rc::new(ggemini::Client::new()); let client = Rc::new(ggemini::Client::new());
// Listen for [SocketClient](https://docs.gtk.org/gio/class.SocketClient.html) updates // Listen for [SocketClient](https://docs.gtk.org/gio/class.SocketClient.html) updates
client.socket.connect_event({ client.socket.connect_event({
let page = page.clone(); let subject = subject.clone();
let tab_page = tab_page.clone();
move |_, event, _, _| { move |_, event, _, _| {
let progress_fraction = match event { let progress_fraction = match event {
// 0.1 reserved for handle begin // 0.1 reserved for handle begin
@ -54,9 +51,11 @@ impl Gemini {
_ => todo!(), // alert on API change _ => todo!(), // alert on API change
}; };
tab_page.set_loading(progress_fraction > 0.0); subject.tab_page.set_loading(progress_fraction > 0.0);
page.navigation subject
.page
.navigation
.request .request
.widget .widget
.entry .entry
@ -66,9 +65,8 @@ impl Gemini {
Self { Self {
client, client,
page: page.clone(),
tab_page: tab_page.clone(),
redirects: Rc::new(Cell::new(0)), redirects: Rc::new(Cell::new(0)),
subject: subject.clone(),
} }
} }
@ -82,33 +80,36 @@ impl Gemini {
is_snap_history: bool, is_snap_history: bool,
) { ) {
// Move focus out from navigation entry // Move focus out from navigation entry
self.page self.subject
.page
.browser_action .browser_action
.escape .escape
.activate_stateful_once(Some(self.page.id.as_str().into())); .activate_stateful_once(Some(self.subject.page.id.as_str().into()));
// Initially disable find action // Initially disable find action
self.page self.subject
.page
.window_action .window_action
.find .find
.simple_action .simple_action
.set_enabled(false); .set_enabled(false);
// Reset widgets // Reset widgets
self.page.search.unset(); self.subject.page.search.unset();
self.page.input.unset(); self.subject.page.input.unset();
self.page.title.replace("Loading..".into()); self.subject.page.title.replace("Loading..".into());
self.page self.subject
.page
.navigation .navigation
.request .request
.widget .widget
.entry .entry
.set_progress_fraction(0.1); .set_progress_fraction(0.1);
self.tab_page.set_loading(true); self.subject.tab_page.set_loading(true);
if is_snap_history { if is_snap_history {
snap_history(&self.page, None); snap_history(&self.subject, None);
} }
self.client.request_async( self.client.request_async(
@ -118,7 +119,7 @@ impl Gemini {
// Search for user certificate match request // Search for user certificate match request
// * @TODO this feature does not support multi-protocol yet // * @TODO this feature does not support multi-protocol yet
match self match self
.page .subject.page
.profile .profile
.identity .identity
.gemini .gemini
@ -132,8 +133,7 @@ impl Gemini {
}, },
{ {
let uri = uri.clone(); let uri = uri.clone();
let page = self.page.clone(); let subject = self.subject.clone();
let tab_page = self.tab_page.clone();
let redirects = self.redirects.clone(); let redirects = self.redirects.clone();
move |result| match result { move |result| match result {
Ok(response) => { Ok(response) => {
@ -145,29 +145,29 @@ impl Gemini {
None => Status::Input.to_string(), None => Status::Input.to_string(),
}; };
if matches!(response.meta.status, Status::SensitiveInput) { if matches!(response.meta.status, Status::SensitiveInput) {
page.input.set_new_sensitive( subject.page.input.set_new_sensitive(
page.tab_action.clone(), subject.page.tab_action.clone(),
uri, uri,
Some(&title), Some(&title),
Some(1024), Some(1024),
); );
} else { } else {
page.input.set_new_response( subject.page.input.set_new_response(
page.tab_action.clone(), subject.page.tab_action.clone(),
uri, uri,
Some(&title), Some(&title),
Some(1024), Some(1024),
); );
} }
page.title.replace(title.into()); subject.page.title.replace(title.into());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
} }
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-20 // https://geminiprotocol.net/docs/protocol-specification.gmi#status-20
Status::Success => match feature { Status::Success => match feature {
Feature::Download => { Feature::Download => {
// Init download widget // Init download widget
let status = page.content.to_status_download( let status = subject.page.content.to_status_download(
uri_to_title(&uri).trim_matches(MAIN_SEPARATOR), // grab default filename from base URI, uri_to_title(&uri).trim_matches(MAIN_SEPARATOR), // grab default filename from base URI,
// format FS entities // format FS entities
&cancellable, &cancellable,
@ -230,9 +230,9 @@ impl Gemini {
} }
}, },
); );
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
}, },
_ => match response.meta.mime { _ => match response.meta.mime {
Some(mime) => match mime.as_str() { Some(mime) => match mime.as_str() {
@ -243,42 +243,42 @@ impl Gemini {
move |result| match result { move |result| match result {
Ok(text) => { Ok(text) => {
let widget = if matches!(feature, Feature::Source) { let widget = if matches!(feature, Feature::Source) {
page.content.to_text_source(&text.to_string()) subject.page.content.to_text_source(&text.to_string())
} else { } else {
page.content.to_text_gemini(&uri, &text.to_string()) subject.page.content.to_text_gemini(&uri, &text.to_string())
}; };
// Connect `TextView` widget, update `search` model // Connect `TextView` widget, update `search` model
page.search.set(Some(widget.text_view)); subject.page.search.set(Some(widget.text_view));
// Update page meta // Update page meta
page.title.replace(match widget.meta.title { subject.page.title.replace(match widget.meta.title {
Some(title) => title.into(), // @TODO Some(title) => title.into(), // @TODO
None => uri_to_title(&uri), None => uri_to_title(&uri),
}); });
// Deactivate loading indication // Deactivate loading indication
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
// Update window components // Update window components
page.window_action subject.page.window_action
.find .find
.simple_action .simple_action
.set_enabled(true); .set_enabled(true);
} }
Err(e) => { Err(e) => {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some(&e.to_string())); status.set_description(Some(&e.to_string()));
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
}, },
}, },
), ),
"image/png" | "image/gif" | "image/jpeg" | "image/webp" => { "image/png" | "image/gif" | "image/jpeg" | "image/webp" => {
// Final image size unknown, show loading widget // Final image size unknown, show loading widget
let status = page.content.to_status_loading( let status = subject.page.content.to_status_loading(
Some(Duration::from_secs(1)), // show if download time > 1 second Some(Duration::from_secs(1)), // show if download time > 1 second
); );
@ -295,7 +295,7 @@ impl Gemini {
move |_, total| move |_, total|
status.set_description(Some(&format!("Download: {total} bytes"))), status.set_description(Some(&format!("Download: {total} bytes"))),
{ {
let page = page.clone(); let subject = subject.clone();
move |result| match result { move |result| match result {
Ok((memory_input_stream, _)) => { Ok((memory_input_stream, _)) => {
Pixbuf::from_stream_async( Pixbuf::from_stream_async(
@ -305,51 +305,51 @@ impl Gemini {
// Process buffer data // Process buffer data
match result { match result {
Ok(buffer) => { Ok(buffer) => {
page.title.replace(uri_to_title(&uri)); subject.page.title.replace(uri_to_title(&uri));
page.content subject.page.content
.to_image(&Texture::for_pixbuf(&buffer)); .to_image(&Texture::for_pixbuf(&buffer));
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
} }
Err(e) => { Err(e) => {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some(e.message())); status.set_description(Some(e.message()));
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
} }
} }
}, },
) )
} }
Err(e) => { Err(e) => {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some(&e.to_string())); status.set_description(Some(&e.to_string()));
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
} }
} }
}, },
) )
} }
mime => { mime => {
let status = page let status = subject.page
.content .content
.to_status_mime(mime, Some((&page.tab_action, &uri))); .to_status_mime(mime, Some((&subject.page.tab_action, &uri)));
status.set_description(Some(&format!("Content type `{mime}` yet not supported"))); status.set_description(Some(&format!("Content type `{mime}` yet not supported")));
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
}, },
}, },
None => { None => {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some("MIME type not found")); status.set_description(Some("MIME type not found"));
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
}, },
} }
}, },
@ -365,47 +365,47 @@ impl Gemini {
// Validate total redirects by protocol specification // Validate total redirects by protocol specification
if total > 5 { if total > 5 {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some("Redirection limit reached")); status.set_description(Some("Redirection limit reached"));
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset redirects.replace(0); // reset
// Disallow external redirection // Disallow external redirection
} else if uri.scheme() != target.scheme() } else if uri.scheme() != target.scheme()
|| uri.port() != target.port() || uri.port() != target.port()
|| uri.host() != target.host() { || uri.host() != target.host() {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some("External redirects not allowed by protocol specification")); status.set_description(Some("External redirects not allowed by protocol specification"));
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset redirects.replace(0); // reset
// Valid // Valid
} else { } else {
if matches!(response.meta.status, Status::PermanentRedirect) { if matches!(response.meta.status, Status::PermanentRedirect) {
page.navigation subject.page.navigation
.request .request
.widget .widget
.entry .entry
.set_text(&uri.to_string()); .set_text(&uri.to_string());
} }
redirects.replace(total); redirects.replace(total);
page.tab_action.load.activate(Some(&target.to_string()), is_snap_history); subject.page.tab_action.load.activate(Some(&target.to_string()), is_snap_history);
} }
} }
Err(e) => { Err(e) => {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some(&e.to_string())); status.set_description(Some(&e.to_string()));
page.title.replace(status.title()); subject.page.title.replace(status.title());
} }
} }
} }
None => { None => {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some("Redirection target not found")); status.set_description(Some("Redirection target not found"));
page.title.replace(status.title()); subject.page.title.replace(status.title());
} }
} }
}, },
@ -415,29 +415,29 @@ impl Gemini {
Status::CertificateUnauthorized | Status::CertificateUnauthorized |
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-62-certificate-not-valid // https://geminiprotocol.net/docs/protocol-specification.gmi#status-62-certificate-not-valid
Status::CertificateInvalid => { Status::CertificateInvalid => {
let status = page.content.to_status_identity(); let status = subject.page.content.to_status_identity();
status.set_description(Some(&match response.meta.data { status.set_description(Some(&match response.meta.data {
Some(data) => data.to_string(), Some(data) => data.to_string(),
None => response.meta.status.to_string(), None => response.meta.status.to_string(),
})); }));
page.title.replace(status.title()); subject.page.title.replace(status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
} }
status => { status => {
let _status = page.content.to_status_failure(); let _status = subject.page.content.to_status_failure();
_status.set_description(Some(&format!("Undefined status code `{status}`"))); _status.set_description(Some(&format!("Undefined status code `{status}`")));
page.title.replace(_status.title()); subject.page.title.replace(_status.title());
page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
tab_page.set_loading(false); subject.tab_page.set_loading(false);
}, },
} }
} }
Err(e) => { Err(e) => {
let status = page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some(&e.to_string())); status.set_description(Some(&e.to_string()));
page.title.replace(status.title()); subject.page.title.replace(status.title());
}, },
} }
}, },
@ -462,27 +462,27 @@ fn uri_to_title(uri: &Uri) -> GString {
/// Make new history record in related components /// Make new history record in related components
/// * optional [Uri](https://docs.gtk.org/glib/struct.Uri.html) reference wanted only for performance reasons, to not parse it twice /// * optional [Uri](https://docs.gtk.org/glib/struct.Uri.html) reference wanted only for performance reasons, to not parse it twice
fn snap_history(page: &Page, uri: Option<&Uri>) { fn snap_history(subject: &Rc<Subject>, uri: Option<&Uri>) {
let request = page.navigation.request.widget.entry.text(); let request = subject.page.navigation.request.widget.entry.text();
// Add new record into the global memory index (used in global menu) // Add new record into the global memory index (used in global menu)
// * if the `Uri` is `None`, try parse it from `request` // * if the `Uri` is `None`, try parse it from `request`
match uri { match uri {
Some(uri) => page.profile.history.memory.request.set(uri.clone()), Some(uri) => subject.page.profile.history.memory.request.set(uri.clone()),
None => { None => {
// this case especially useful for some routes that contain redirects // this case especially useful for some routes that contain redirects
// maybe some parental optimization wanted @TODO // maybe some parental optimization wanted @TODO
if let Some(uri) = page.navigation.request.as_uri() { if let Some(uri) = subject.page.navigation.request.as_uri() {
page.profile.history.memory.request.set(uri); subject.page.profile.history.memory.request.set(uri);
} }
} }
} }
// Add new record into the page navigation history // Add new record into the page navigation history
if match page.navigation.history.current() { if match subject.page.navigation.history.current() {
Some(current) => current != request, // apply additional filters Some(current) => current != request, // apply additional filters
None => true, None => true,
} { } {
page.navigation.history.add(request, true) subject.page.navigation.history.add(request, true)
} }
} }

9
src/app/browser/window/tab/item/client/subject.rs Normal file
View File

@ -0,0 +1,9 @@
use super::Page;
use adw::TabPage;
use std::rc::Rc;
/// The subject for `Client` handler
pub struct Subject {
pub page: Rc<Page>,
pub tab_page: TabPage,
}