YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-04-02 09:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement resend form ability on request failure

Browse source
This commit is contained in:
yggverse 2025-01-31 20:06:52 +02:00
parent c4e8f2ff61
commit afc33c1a03
8 changed files with 406 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

631
src/app/browser/window/tab/item/client/driver/gemini.rs
View file

@ -73,13 +73,14 @@ impl Gemini {
self.redirects.clone(), self.redirects.clone(),
feature, feature,
cancellable, cancellable,
None,
), ),
"titan" => { "titan" => {
self.page.input.set_new_titan({ self.page.input.set_new_titan({
let client = self.client.clone(); let client = self.client.clone();
let page = self.page.clone(); let page = self.page.clone();
let redirects = self.redirects.clone(); let redirects = self.redirects.clone();
move |data, _label| { move |data, on_failure| {
handle( handle(
Request::Titan { Request::Titan {
uri: uri.clone(), uri: uri.clone(),
@ -93,27 +94,8 @@ impl Gemini {
redirects.clone(), redirects.clone(),
feature.clone(), feature.clone(),
cancellable.clone(), cancellable.clone(),
Some(on_failure),
) )
// init data to send
/* @TODO
use plurify::ns as plural;
const CHUNK: usize = 0x400;
let bytes_sent = 0;
let bytes_total = data.len();
// send by chunks for large content size
if bytes_total > CHUNK {
label.set_label(&format!(
"sent {}/{} {}",
format_bytes(bytes_sent),
format_bytes(bytes_total),
plural(bytes_sent, &["byte", "bytes", "bytes"])
));
} else {
label.set_visible(false);
}
todo!()*/
} }
}); });
self.page.set_title("Titan input"); self.page.set_title("Titan input");
@ -131,6 +113,7 @@ fn handle(
redirects: Rc<Cell<usize>>, redirects: Rc<Cell<usize>>,
feature: Rc<Feature>, feature: Rc<Feature>,
cancellable: Cancellable, cancellable: Cancellable,
on_failure: Option<Box<dyn Fn()>>,
) { ) {
let uri = request.uri().clone(); let uri = request.uri().clone();
client.request_async( client.request_async(
@ -153,322 +136,320 @@ fn handle(
{ {
let page = page.clone(); let page = page.clone();
let redirects = redirects.clone(); let redirects = redirects.clone();
move |result| { move |result| match result {
// Remove input forms when redirection expected has not been applied (e.g. failure status) Ok(response) => {
// @TODO implement input data recovery on error (it's also available before unset, but reference lost at this point) match response.meta.status {
page.input.unset(); // https://geminiprotocol.net/docs/protocol-specification.gmi#input-expected
Status::Input | Status::SensitiveInput => {
// Begin result handle let title = match response.meta.data {
match result { Some(data) => data.to_string(),
Ok(response) => { None => Status::Input.to_string(),
match response.meta.status { };
// https://geminiprotocol.net/docs/protocol-specification.gmi#input-expected if matches!(response.meta.status, Status::SensitiveInput) {
Status::Input | Status::SensitiveInput => { page.input.set_new_sensitive(
let title = match response.meta.data { page.item_action.clone(),
Some(data) => data.to_string(), uri,
None => Status::Input.to_string(), Some(&title),
}; Some(1024),
if matches!(response.meta.status, Status::SensitiveInput) { );
page.input.set_new_sensitive( } else {
page.item_action.clone(), page.input.set_new_response(
uri, page.item_action.clone(),
Some(&title), uri,
Some(1024), Some(&title),
); Some(1024),
} else { );
page.input.set_new_response(
page.item_action.clone(),
uri,
Some(&title),
Some(1024),
);
}
page.set_progress(0.0);
page.set_title(&title);
redirects.replace(0); // reset
} }
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-20 page.set_progress(0.0);
Status::Success => match *feature { page.set_title(&title);
Feature::Download => { redirects.replace(0); // reset
// Init download widget }
let status = page.content.to_status_download( // https://geminiprotocol.net/docs/protocol-specification.gmi#status-20
uri_to_title(&uri).trim_matches(MAIN_SEPARATOR), // grab default filename from base URI, Status::Success => match *feature {
// format FS entities Feature::Download => {
&cancellable, // Init download widget
{ let status = page.content.to_status_download(
let cancellable = cancellable.clone(); uri_to_title(&uri).trim_matches(MAIN_SEPARATOR), // grab default filename from base URI,
let stream = response.connection.stream(); // format FS entities
move |file, action| { &cancellable,
match file.replace( {
None, let cancellable = cancellable.clone();
false, let stream = response.connection.stream();
gtk::gio::FileCreateFlags::NONE, move |file, action| {
Some(&cancellable), match file.replace(
) { None,
Ok(file_output_stream) => { false,
use crate::tool::Format; gtk::gio::FileCreateFlags::NONE,
// Asynchronously read [IOStream](https://docs.gtk.org/gio/class.IOStream.html) Some(&cancellable),
// to local [MemoryInputStream](https://docs.gtk.org/gio/class.MemoryInputStream.html) ) {
// show bytes count in loading widget, validate max size for incoming data Ok(file_output_stream) => {
// * no dependency of Gemini library here, feel free to use any other `IOStream` processor use crate::tool::Format;
ggemini::gio::file_output_stream::move_all_from_stream_async( // Asynchronously read [IOStream](https://docs.gtk.org/gio/class.IOStream.html)
stream.clone(), // to local [MemoryInputStream](https://docs.gtk.org/gio/class.MemoryInputStream.html)
file_output_stream, // show bytes count in loading widget, validate max size for incoming data
cancellable.clone(), // * no dependency of Gemini library here, feel free to use any other `IOStream` processor
Priority::DEFAULT, ggemini::gio::file_output_stream::move_all_from_stream_async(
( stream.clone(),
0x100000, // 1M bytes per chunk file_output_stream,
None, // unlimited cancellable.clone(),
0, // initial totals Priority::DEFAULT,
), (
( 0x100000, // 1M bytes per chunk
// on chunk None, // unlimited
{ 0, // initial totals
let action = action.clone(); ),
move |_, total| action.update.activate(&format!( (
"Received {}...", // on chunk
total.bytes() {
)) let action = action.clone();
}, move |_, total| action.update.activate(&format!(
// on complete "Received {}...",
{ total.bytes()
let action = action.clone(); ))
move |result| match result { },
Ok((_, total)) => { // on complete
action.complete.activate(&format!( {
"Saved to {} ({} total)", let action = action.clone();
file.parse_name(), move |result| match result {
total.bytes() Ok((_, total)) => {
)) action.complete.activate(&format!(
} "Saved to {} ({} total)",
Err(e) => action.cancel.activate(&e.to_string()) file.parse_name(),
total.bytes()
))
} }
}, Err(e) => action.cancel.activate(&e.to_string())
), }
) },
} ),
Err(e) => action.cancel.activate(&e.to_string()), )
} }
} Err(e) => action.cancel.activate(&e.to_string()),
},
);
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
},
_ => match response.meta.mime {
Some(mime) => match mime.as_str() {
"text/gemini" => Text::from_stream_async(
response.connection.stream(),
Priority::DEFAULT,
cancellable.clone(),
move |result| match result {
Ok(text) => {
let widget = if matches!(*feature, Feature::Source) {
page.content.to_text_source(&text.to_string())
} else {
page.content.to_text_gemini(&uri, &text.to_string())
};
page.search.set(Some(widget.text_view));
page.set_title(&match widget.meta.title {
Some(title) => title.into(), // @TODO
None => uri_to_title(&uri),
});
page.set_progress(0.0);
page.window_action
.find
.simple_action
.set_enabled(true);
redirects.replace(0); // reset
}
Err(e) => {
let status = page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
},
},
),
"image/png" | "image/gif" | "image/jpeg" | "image/webp" => {
// Final image size unknown, show loading widget
let status = page.content.to_status_loading(
Some(Duration::from_secs(1)), // show if download time > 1 second
);
// Asynchronously read [IOStream](https://docs.gtk.org/gio/class.IOStream.html)
// to local [MemoryInputStream](https://docs.gtk.org/gio/class.MemoryInputStream.html)
// show bytes count in loading widget, validate max size for incoming data
// * no dependency of Gemini library here, feel free to use any other `IOStream` processor
ggemini::gio::memory_input_stream::from_stream_async(
response.connection.stream(),
cancellable.clone(),
Priority::DEFAULT,
0x400, // 1024 bytes per chunk, optional step for images download tracking
0xA00000, // 10M bytes max to prevent memory overflow if server play with promises
move |_, total|
status.set_description(Some(&format!("Download: {total} bytes"))),
{
let page = page.clone();
move |result| match result {
Ok((memory_input_stream, _)) => {
Pixbuf::from_stream_async(
&memory_input_stream,
Some(&cancellable),
move |result| {
match result {
Ok(buffer) => {
page.set_title(&uri_to_title(&uri));
page.content.to_image(&Texture::for_pixbuf(&buffer));
}
Err(e) => {
let status = page.content.to_status_failure();
status.set_description(Some(e.message()));
page.set_title(&status.title());
}
}
page.set_progress(0.0);
redirects.replace(0); // reset
},
)
}
Err(e) => {
let status = page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
}
}
},
)
}
mime => {
let status = page
.content
.to_status_mime(mime, Some((&page.item_action, &uri)));
status.set_description(Some(&format!("Content type `{mime}` yet not supported")));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
},
},
None => {
let status = page.content.to_status_failure();
status.set_description(Some("MIME type not found"));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
},
}
},
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-30-temporary-redirection
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-31-permanent-redirection
Status::PermanentRedirect | Status::Redirect => {
// Expected target URL in response meta
match response.meta.data {
Some(data) => match uri.parse_relative(data.as_str(), UriFlags::NONE) {
Ok(absolute) => {
// Base donor scheme could be `titan`, rewrite new relative links resolved with `gemini`
// otherwise, keep original scheme to handle external redirect rules properly
// * in this case, `titan` scheme redirects unexpected
let scheme = absolute.scheme();
let target = Uri::build(
UriFlags::NONE,
&if "titan" == scheme {
scheme.replace("titan", "gemini")
} else {
scheme.to_string()
},
absolute.userinfo().as_deref(),
absolute.host().as_deref(),
absolute.port(),
absolute.path().as_str(),
absolute.query().as_deref(),
absolute.fragment().as_deref(),
);
// Increase client redirection counter
let total = redirects.take() + 1;
// Validate total redirects by protocol specification
if total > 5 {
let status = page.content.to_status_failure();
status.set_description(Some("Redirection limit reached"));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
// Disallow external redirection by protocol restrictions
} else if "gemini" != target.scheme()
|| uri.port() != target.port()
|| uri.host() != target.host() {
let status = page.content.to_status_failure();
status.set_description(Some("External redirects not allowed by protocol specification"));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
// Valid
} else {
if matches!(response.meta.status, Status::PermanentRedirect) {
page.navigation.set_request(&uri.to_string());
}
redirects.replace(total);
page.item_action.load.activate(Some(&target.to_string()), false);
} }
} }
Err(e) => { },
let status = page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
}
}
None => {
let status = page.content.to_status_failure();
status.set_description(Some("Redirection target not found"));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
}
}
},
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-60
Status::CertificateRequest |
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-61-certificate-not-authorized
Status::CertificateUnauthorized |
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-62-certificate-not-valid
Status::CertificateInvalid => {
let status = page.content.to_status_identity();
status.set_description(Some(&match response.meta.data {
Some(data) => data.to_string(),
None => response.meta.status.to_string(),
}));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
}
error => {
let status = page.content.to_status_failure();
status.set_description(
Some(&match response.meta.data {
Some(message) => message.to_string(),
None => error.to_string()
})
); );
page.set_progress(0.0); page.set_progress(0.0);
page.set_title(&status.title()); page.set_title(&status.title());
redirects.replace(0); // reset redirects.replace(0); // reset
}, },
_ => match response.meta.mime {
Some(mime) => match mime.as_str() {
"text/gemini" => Text::from_stream_async(
response.connection.stream(),
Priority::DEFAULT,
cancellable.clone(),
move |result| match result {
Ok(text) => {
let widget = if matches!(*feature, Feature::Source) {
page.content.to_text_source(&text.to_string())
} else {
page.content.to_text_gemini(&uri, &text.to_string())
};
page.search.set(Some(widget.text_view));
page.set_title(&match widget.meta.title {
Some(title) => title.into(), // @TODO
None => uri_to_title(&uri),
});
page.set_progress(0.0);
page.window_action
.find
.simple_action
.set_enabled(true);
redirects.replace(0); // reset
}
Err(e) => {
let status = page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
},
},
),
"image/png" | "image/gif" | "image/jpeg" | "image/webp" => {
// Final image size unknown, show loading widget
let status = page.content.to_status_loading(
Some(Duration::from_secs(1)), // show if download time > 1 second
);
// Asynchronously read [IOStream](https://docs.gtk.org/gio/class.IOStream.html)
// to local [MemoryInputStream](https://docs.gtk.org/gio/class.MemoryInputStream.html)
// show bytes count in loading widget, validate max size for incoming data
// * no dependency of Gemini library here, feel free to use any other `IOStream` processor
ggemini::gio::memory_input_stream::from_stream_async(
response.connection.stream(),
cancellable.clone(),
Priority::DEFAULT,
0x400, // 1024 bytes per chunk, optional step for images download tracking
0xA00000, // 10M bytes max to prevent memory overflow if server play with promises
move |_, total|
status.set_description(Some(&format!("Download: {total} bytes"))),
{
let page = page.clone();
move |result| match result {
Ok((memory_input_stream, _)) => {
Pixbuf::from_stream_async(
&memory_input_stream,
Some(&cancellable),
move |result| {
match result {
Ok(buffer) => {
page.set_title(&uri_to_title(&uri));
page.content.to_image(&Texture::for_pixbuf(&buffer));
}
Err(e) => {
let status = page.content.to_status_failure();
status.set_description(Some(e.message()));
page.set_title(&status.title());
}
}
page.set_progress(0.0);
redirects.replace(0); // reset
},
)
}
Err(e) => {
let status = page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
}
}
},
)
}
mime => {
let status = page
.content
.to_status_mime(mime, Some((&page.item_action, &uri)));
status.set_description(Some(&format!("Content type `{mime}` yet not supported")));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
},
},
None => {
let status = page.content.to_status_failure();
status.set_description(Some("MIME type not found"));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
},
}
},
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-30-temporary-redirection
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-31-permanent-redirection
Status::PermanentRedirect | Status::Redirect => {
// Expected target URL in response meta
match response.meta.data {
Some(data) => match uri.parse_relative(data.as_str(), UriFlags::NONE) {
Ok(absolute) => {
// Base donor scheme could be `titan`, rewrite new relative links resolved with `gemini`
// otherwise, keep original scheme to handle external redirect rules properly
// * in this case, `titan` scheme redirects unexpected
let scheme = absolute.scheme();
let target = Uri::build(
UriFlags::NONE,
&if "titan" == scheme {
scheme.replace("titan", "gemini")
} else {
scheme.to_string()
},
absolute.userinfo().as_deref(),
absolute.host().as_deref(),
absolute.port(),
absolute.path().as_str(),
absolute.query().as_deref(),
absolute.fragment().as_deref(),
);
// Increase client redirection counter
let total = redirects.take() + 1;
// Validate total redirects by protocol specification
if total > 5 {
let status = page.content.to_status_failure();
status.set_description(Some("Redirection limit reached"));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
// Disallow external redirection by protocol restrictions
} else if "gemini" != target.scheme()
|| uri.port() != target.port()
|| uri.host() != target.host() {
let status = page.content.to_status_failure();
status.set_description(Some("External redirects not allowed by protocol specification"));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
// Valid
} else {
if matches!(response.meta.status, Status::PermanentRedirect) {
page.navigation.set_request(&uri.to_string());
}
redirects.replace(total);
page.item_action.load.activate(Some(&target.to_string()), false);
}
}
Err(e) => {
let status = page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
}
}
None => {
let status = page.content.to_status_failure();
status.set_description(Some("Redirection target not found"));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
}
}
},
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-60
Status::CertificateRequest |
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-61-certificate-not-authorized
Status::CertificateUnauthorized |
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-62-certificate-not-valid
Status::CertificateInvalid => {
let status = page.content.to_status_identity();
status.set_description(Some(&match response.meta.data {
Some(data) => data.to_string(),
None => response.meta.status.to_string(),
}));
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
} }
error => {
let status = page.content.to_status_failure();
status.set_description(
Some(&match response.meta.data {
Some(message) => message.to_string(),
None => error.to_string()
})
);
page.set_progress(0.0);
page.set_title(&status.title());
redirects.replace(0); // reset
if let Some(callback) = on_failure {
callback()
}
},
} }
Err(e) => { }
let status = page.content.to_status_failure(); Err(e) => {
status.set_description(Some(&e.to_string())); let status = page.content.to_status_failure();
page.set_progress(0.0); status.set_description(Some(&e.to_string()));
page.set_title(&status.title()); page.set_progress(0.0);
redirects.replace(0); // reset page.set_title(&status.title());
} redirects.replace(0); // reset
} }
} }
}, },

8
src/app/browser/window/tab/item/page/input.rs
View file

@ -4,7 +4,7 @@ mod titan;
use super::ItemAction; use super::ItemAction;
use adw::Clamp; use adw::Clamp;
use gtk::{glib::Uri, prelude::WidgetExt, Box, Label}; use gtk::{glib::Uri, prelude::WidgetExt};
use response::Response; use response::Response;
use sensitive::Sensitive; use sensitive::Sensitive;
use std::rc::Rc; use std::rc::Rc;
@ -40,7 +40,7 @@ impl Input {
self.update(None); self.update(None);
} }
pub fn update(&self, child: Option<&Box>) { pub fn update(&self, child: Option<&gtk::Box>) {
if child.is_some() { if child.is_some() {
self.clamp.set_visible(true); // widget may be hidden, make it visible to child redraw self.clamp.set_visible(true); // widget may be hidden, make it visible to child redraw
self.clamp.set_child(child); self.clamp.set_child(child);
@ -74,7 +74,7 @@ impl Input {
)); ));
} }
pub fn set_new_titan(&self, on_send: impl Fn(&[u8], &Label) + 'static) { pub fn set_new_titan(&self, on_send: impl Fn(&[u8], Box<dyn Fn()>) + 'static) {
self.update(Some(&Titan::build(on_send).g_box)); self.update(Some(&gtk::Box::titan(on_send)));
} }
} }

63
src/app/browser/window/tab/item/page/input/titan.rs
View file

@ -3,36 +3,31 @@ mod form;
mod title; mod title;
use control::Control; use control::Control;
use control::Send;
use form::Form; use form::Form;
use title::Title; use gtk::{
prelude::{BoxExt, ButtonExt, TextBufferExt, TextViewExt},
use gtk::{gio::SimpleAction, glib::uuid_string_random, prelude::BoxExt, Box, Label, Orientation}; Label, Orientation, TextView,
};
use std::rc::Rc; use std::rc::Rc;
use title::Title;
const MARGIN: i32 = 6; const MARGIN: i32 = 6;
const SPACING: i32 = 8; const SPACING: i32 = 8;
pub struct Titan { pub trait Titan {
// Components fn titan(callback: impl Fn(&[u8], Box<dyn Fn()>) + 'static) -> Self;
pub g_box: Box,
} }
impl Titan { impl Titan for gtk::Box {
// Constructors fn titan(callback: impl Fn(&[u8], Box<dyn Fn()>) + 'static) -> Self {
/// Build new `Self`
pub fn build(on_send: impl Fn(&[u8], &Label) + 'static) -> Self {
// Init local actions
let action_update = SimpleAction::new(&uuid_string_random(), None);
let action_send = SimpleAction::new(&uuid_string_random(), None);
// Init components // Init components
let control = Rc::new(Control::build(action_send.clone())); let control = Rc::new(Control::build());
let form = Rc::new(Form::build(action_update.clone())); let form = TextView::form();
let title = Title::build(None); let title = Label::title(None);
// Init widget // Init widget
let g_box = Box::builder() let g_box = gtk::Box::builder()
.margin_bottom(MARGIN) .margin_bottom(MARGIN)
.margin_end(MARGIN) .margin_end(MARGIN)
.margin_start(MARGIN) .margin_start(MARGIN)
@ -41,21 +36,31 @@ impl Titan {
.orientation(Orientation::Vertical) .orientation(Orientation::Vertical)
.build(); .build();
g_box.append(&title.label); g_box.append(&title);
g_box.append(&form.text_view); g_box.append(&form);
g_box.append(&control.g_box); g_box.append(&control.g_box);
// Init events // Connect events
action_update.connect_activate({ control.send.connect_clicked({
let control = control.clone();
let form = form.clone(); let form = form.clone();
move |_, _| control.update(Some(form.text().len())) move |this| {
this.set_sending();
callback(
form.text().as_bytes(),
Box::new({
let this = this.clone();
move || this.set_resend() // on failure
}),
)
}
}); });
action_send form.buffer().connect_changed({
.connect_activate(move |_, _| on_send(form.text().as_bytes(), &control.counter.label)); let control = control.clone();
move |this| control.update(Some(this.char_count()))
});
// Return activated struct // Return activated `Self`
Self { g_box } g_box
} }
} }

29
src/app/browser/window/tab/item/page/input/titan/control.rs
View file

@ -2,16 +2,17 @@ mod counter;
mod send; mod send;
use counter::Counter; use counter::Counter;
use gtk::gio::SimpleAction; use gtk::{
use gtk::{prelude::BoxExt, Align, Box, Orientation}; prelude::{BoxExt, WidgetExt},
use send::Send; Align, Box, Button, Label, Orientation,
use std::rc::Rc; };
pub use send::Send;
const SPACING: i32 = 8; const SPACING: i32 = 8;
pub struct Control { pub struct Control {
pub counter: Rc<Counter>, pub counter: Label,
pub send: Rc<Send>, pub send: Button,
pub g_box: Box, pub g_box: Box,
} }
@ -19,10 +20,10 @@ impl Control {
// Constructors // Constructors
/// Build new `Self` /// Build new `Self`
pub fn build(action_send: SimpleAction) -> Self { pub fn build() -> Self {
// Init components // Init components
let counter = Rc::new(Counter::new()); let counter = Label::counter();
let send = Rc::new(Send::build(action_send)); let send = Button::send();
// Init main widget // Init main widget
let g_box = Box::builder() let g_box = Box::builder()
@ -31,8 +32,8 @@ impl Control {
.spacing(SPACING) .spacing(SPACING)
.build(); .build();
g_box.append(&counter.label); g_box.append(&counter);
g_box.append(&send.button); g_box.append(&send);
// Return activated struct // Return activated struct
Self { Self {
@ -43,10 +44,10 @@ impl Control {
} }
// Actions // Actions
pub fn update(&self, bytes_total: Option<usize>) { pub fn update(&self, char_count: Option<i32>) {
// Update children components // Update children components
self.counter.update(bytes_total); self.counter.update(char_count);
self.send.update(match bytes_total { self.send.set_sensitive(match char_count {
Some(total) => total > 0, Some(total) => total > 0,
None => false, None => false,
}); });

31
src/app/browser/window/tab/item/page/input/titan/control/counter.rs
View file

@ -1,31 +1,26 @@
use gtk::{prelude::WidgetExt, Label}; use gtk::{prelude::WidgetExt, Label};
pub struct Counter { pub trait Counter {
pub label: Label, fn counter() -> Self;
fn update(&self, char_count: Option<i32>);
} }
impl Default for Counter { impl Counter for Label {
fn default() -> Self { // Constructors
Self::new()
}
}
impl Counter { fn counter() -> Self {
// Construct Label::builder().css_classes(["dim-label"]).build() // @TODO use `dimmed` in Adw 1.6,
pub fn new() -> Self {
Self {
label: Label::builder().css_classes(["dim-label"]).build(), // @TODO use `dimmed` in Adw 1.6,
}
} }
// Actions // Actions
pub fn update(&self, bytes_total: Option<usize>) {
match bytes_total { fn update(&self, char_count: Option<i32>) {
match char_count {
Some(value) => { Some(value) => {
self.label.set_label(&value.to_string()); self.set_label(&value.to_string());
self.label.set_visible(value > 0); self.set_visible(value > 0);
} }
None => self.label.set_visible(false), None => self.set_visible(false),
} }
} }
} }

44
src/app/browser/window/tab/item/page/input/titan/control/send.rs
View file

@ -1,40 +1,28 @@
use gtk::{ use gtk::{
gio::SimpleAction, prelude::{ButtonExt, WidgetExt},
prelude::{ActionExt, ButtonExt, WidgetExt},
Button, Button,
}; };
pub struct Send { pub trait Send {
pub button: Button, fn send() -> Self;
fn set_sending(&self);
fn set_resend(&self);
} }
impl Send { impl Send for Button {
// Constructors fn send() -> Self {
Button::builder()
/// Build new `Self`
pub fn build(action_send: SimpleAction) -> Self {
// Init main widget
let button = Button::builder()
.css_classes(["accent"]) // | `suggested-action` .css_classes(["accent"]) // | `suggested-action`
.label("Send") .label("Send")
.sensitive(false) .sensitive(false)
.build(); .build()
// Init events
button.connect_clicked({
move |this| {
this.set_sensitive(false);
this.set_label("sending..");
action_send.activate(None);
}
});
// Return activated `Self`
Self { button }
} }
fn set_sending(&self) {
// Actions self.set_sensitive(false);
pub fn update(&self, is_sensitive: bool) { self.set_label("sending..");
self.button.set_sensitive(is_sensitive); }
fn set_resend(&self) {
self.set_sensitive(true);
self.set_label("Resend");
} }
} }

22
src/app/browser/window/tab/item/page/input/titan/form.rs
View file

@ -1,7 +1,6 @@
use gtk::{ use gtk::{
gio::SimpleAction,
glib::GString, glib::GString,
prelude::{ActionExt, TextBufferExt, TextViewExt, WidgetExt}, prelude::{TextBufferExt, TextViewExt, WidgetExt},
TextView, WrapMode, TextView, WrapMode,
}; };
use libspelling::{Checker, TextBufferAdapter}; use libspelling::{Checker, TextBufferAdapter};
@ -9,15 +8,16 @@ use sourceview::Buffer;
const MARGIN: i32 = 8; const MARGIN: i32 = 8;
pub struct Form { pub trait Form {
pub text_view: TextView, fn form() -> Self;
fn text(&self) -> GString;
} }
impl Form { impl Form for TextView {
// Constructors // Constructors
/// Build new `Self` /// Build new `Self`
pub fn build(action_update: SimpleAction) -> Self { fn form() -> Self {
// Init [SourceView](https://gitlab.gnome.org/GNOME/gtksourceview) type buffer // Init [SourceView](https://gitlab.gnome.org/GNOME/gtksourceview) type buffer
let buffer = Buffer::builder().build(); let buffer = Buffer::builder().build();
@ -43,22 +43,18 @@ impl Form {
text_view.set_size_request(-1, 38); // @TODO [#635](https://gitlab.gnome.org/GNOME/pygobject/-/issues/635) text_view.set_size_request(-1, 38); // @TODO [#635](https://gitlab.gnome.org/GNOME/pygobject/-/issues/635)
// Init events // Init events
text_view.buffer().connect_changed(move |_| {
action_update.activate(None);
});
text_view.connect_realize(|this| { text_view.connect_realize(|this| {
this.grab_focus(); this.grab_focus();
}); });
// Return activated `Self` // Return activated `Self`
Self { text_view } text_view
} }
// Getters // Getters
pub fn text(&self) -> GString { fn text(&self) -> GString {
let buffer = self.text_view.buffer(); let buffer = self.buffer();
buffer.text(&buffer.start_iter(), &buffer.end_iter(), true) buffer.text(&buffer.start_iter(), &buffer.end_iter(), true)
} }
} }

23
src/app/browser/window/tab/item/page/input/titan/title.rs
View file

@ -1,20 +1,15 @@
use gtk::{Align, Label}; use gtk::{Align, Label};
pub struct Title { pub trait Title {
pub label: Label, fn title(title: Option<&str>) -> Self;
} }
impl Title { impl Title for Label {
// Constructors fn title(title: Option<&str>) -> Self {
Label::builder()
/// Build new `Self` .css_classes(["heading"])
pub fn build(title: Option<&str>) -> Self { .halign(Align::Start)
Self { .label(title.unwrap_or("Titan input"))
label: Label::builder() .build()
.css_classes(["heading"])
.halign(Align::Start)
.label(title.unwrap_or("Titan input"))
.build(),
}
} }
} }