YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-03-31 16:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement request as trait

Browse source
This commit is contained in:
yggverse 2025-01-27 16:30:27 +02:00
parent 6db928afee
commit 3d1a07213c
11 changed files with 141 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/browser/window/header/bar/menu.rs
View file

@ -210,7 +210,7 @@ impl Menu for MenuButton {
// Recently closed history
main_history_tab.remove_all();
for item in profile.history.memory.tab.recent() {
let item_request = item.page.navigation.request.entry.text(); // @TODO restore entire `Item`
let item_request = item.page.navigation.request.text(); // @TODO restore entire `Item`
let menu_item = gio::MenuItem::new(Some(&ellipsize(&item_request, LABEL_MAX_LENGTH)), None);
menu_item.set_action_and_target_value(Some(&format!(
"{}.{}",

15
src/app/browser/window/tab.rs
View file

@ -12,7 +12,7 @@ use error::Error;
use gtk::{
gio::Icon,
glib::{DateTime, Propagation},
prelude::{ActionExt, EditableExt, WidgetExt},
prelude::{ActionExt, EditableExt},
};
pub use item::Item;
use menu::Menu;
@ -136,7 +136,7 @@ impl Tab {
// Expect user input on tab appended has empty request entry
// * this action initiated here because should be applied on tab appending event only
if request.is_none() || request.is_some_and(|value| value.is_empty()) {
item.page.navigation.request.entry.grab_focus();
item.page.navigation.grab_focus();
}
// Register dynamically created tab components in the HashMap index
@ -196,7 +196,7 @@ impl Tab {
// Save page at given `position`, `None` to save selected page (if available)
pub fn save_as(&self, tab_page_position: Option<i32>) {
if let Some(item) = self.item(tab_page_position) {
item.page.navigation.request.to_download();
item.page.navigation.to_download();
self.window_action.reload.activate();
}
}
@ -204,7 +204,7 @@ impl Tab {
// View source for page at given `position`, `None` to use selected page (if available)
pub fn source(&self, tab_page_position: Option<i32>) {
if let Some(item) = self.item(tab_page_position) {
item.page.navigation.request.to_source();
item.page.navigation.to_source();
self.window_action.reload.activate();
}
}
@ -233,9 +233,9 @@ impl Tab {
pub fn page_home(&self, tab_page_position: Option<i32>) {
if let Some(item) = self.item(tab_page_position) {
if let Some(home) = item.page.navigation.request.home() {
if let Some(home) = item.page.navigation.home() {
let home = home.to_string();
item.page.navigation.request.entry.set_text(&home);
item.page.navigation.request.set_text(&home);
item.client.handle(&home, true);
}
}
@ -256,8 +256,7 @@ impl Tab {
/// Reload page at `i32` position or selected page on `None` given
pub fn page_reload(&self, tab_page_position: Option<i32>) {
if let Some(item) = self.item(tab_page_position) {
item.client
.handle(&item.page.navigation.request.entry.text(), true);
item.client.handle(&item.page.navigation.request(), true);
}
}

12
src/app/browser/window/tab/item.rs
View file

@ -82,9 +82,9 @@ impl Item {
let page = page.clone();
move |this, _| {
this.set_enabled(false);
if let Some(uri) = page.navigation.request.home() {
if let Some(uri) = page.navigation.home() {
let request = uri.to_string();
page.navigation.request.entry.set_text(&request);
page.navigation.request.set_text(&request);
client.handle(&request, true);
}
}
@ -96,7 +96,7 @@ impl Item {
let profile = profile.clone();
let window_action = window_action.clone();
move || {
if let Some(uri) = page.navigation.request.uri() {
if let Some(uri) = page.navigation.uri() {
let scheme = uri.scheme();
if scheme == "gemini" || scheme == "titan" {
return identity::default(&window_action, &profile, &uri)
@ -112,7 +112,7 @@ impl Item {
let client = client.clone();
move |request, is_history| {
if let Some(text) = request {
page.navigation.request.entry.set_text(&text);
page.navigation.request.set_text(&text);
client.handle(&text, is_history);
}
}
@ -122,13 +122,13 @@ impl Item {
let page = page.clone();
let client = client.clone();
move |_, _| {
client.handle(&page.navigation.request.entry.text(), false);
client.handle(&page.navigation.request.text(), false);
}
});
// Handle immediately on request
if let Some(text) = request {
page.navigation.request.entry.set_text(text);
page.navigation.request.set_text(text);
if is_load {
client.handle(text, true);
}

14
src/app/browser/window/tab/item/client.rs
View file

@ -9,7 +9,7 @@ use feature::Feature;
use gtk::{
gio::Cancellable,
glib::{Uri, UriFlags},
prelude::{ActionExt, CancellableExt, EditableExt, EntryExt},
prelude::{ActionExt, CancellableExt, EntryExt},
};
use std::{cell::Cell, rc::Rc};
use subject::Subject;
@ -62,7 +62,6 @@ impl Client {
.page
.navigation
.request
.entry
.set_progress_fraction(0.1);
self.subject.tab_page.set_loading(true);
@ -87,12 +86,7 @@ impl Client {
"Scheme `{scheme}` yet not supported"
)));
subject.tab_page.set_title(&status.title());
subject
.page
.navigation
.request
.entry
.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
}
},
@ -201,7 +195,7 @@ fn search(query: &str) -> Uri {
/// 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
fn snap_history(subject: &Rc<Subject>, uri: Option<&Uri>) {
let request = subject.page.navigation.request.entry.text();
let request = subject.page.navigation.request();
// Add new record into the global memory index (used in global menu)
// * if the `Uri` is `None`, try parse it from `request`
@ -210,7 +204,7 @@ fn snap_history(subject: &Rc<Subject>, uri: Option<&Uri>) {
None => {
// this case especially useful for some routes that contain redirects
// maybe some parental optimization wanted @TODO
if let Some(uri) = subject.page.navigation.request.uri() {
if let Some(uri) = subject.page.navigation.uri() {
subject.page.profile.history.memory.request.set(uri);
}
}

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

@ -60,7 +60,6 @@ impl Gemini {
.page
.navigation
.request
.entry
.set_progress_fraction(progress_fraction);
}
});
@ -134,7 +133,6 @@ impl Gemini {
.page
.navigation
.request
.entry
.set_progress_fraction(0.0);
self.subject.tab_page.set_loading(false);
}
@ -203,7 +201,7 @@ fn handle(
Some(1024),
);
}
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&title);
redirects.replace(0); // reset
@ -275,7 +273,7 @@ fn handle(
}
},
);
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -298,7 +296,7 @@ fn handle(
Some(title) => title.into(), // @TODO
None => uri_to_title(&uri),
});
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.page.window_action
.find
@ -309,7 +307,7 @@ fn handle(
Err(e) => {
let status = subject.page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -353,7 +351,7 @@ fn handle(
subject.tab_page.set_title(&status.title());
}
}
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
redirects.replace(0); // reset
},
@ -362,7 +360,7 @@ fn handle(
Err(e) => {
let status = subject.page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -376,7 +374,7 @@ fn handle(
.content
.to_status_mime(mime, Some((&subject.page.item_action, &uri)));
status.set_description(Some(&format!("Content type `{mime}` yet not supported")));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -385,7 +383,7 @@ fn handle(
None => {
let status = subject.page.content.to_status_failure();
status.set_description(Some("MIME type not found"));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -423,7 +421,7 @@ fn handle(
if total > 5 {
let status = subject.page.content.to_status_failure();
status.set_description(Some("Redirection limit reached"));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -434,7 +432,7 @@ fn handle(
|| uri.host() != target.host() {
let status = subject.page.content.to_status_failure();
status.set_description(Some("External redirects not allowed by protocol specification"));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -443,7 +441,6 @@ fn handle(
if matches!(response.meta.status, Status::PermanentRedirect) {
subject.page.navigation
.request
.entry
.set_text(&uri.to_string());
}
redirects.replace(total);
@ -453,7 +450,7 @@ fn handle(
Err(e) => {
let status = subject.page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -462,7 +459,7 @@ fn handle(
None => {
let status = subject.page.content.to_status_failure();
status.set_description(Some("Redirection target not found"));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -481,7 +478,7 @@ fn handle(
None => response.meta.status.to_string(),
}));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -489,7 +486,7 @@ fn handle(
error => {
let status = subject.page.content.to_status_failure();
status.set_description(Some(&error.to_string()));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset
@ -499,7 +496,7 @@ fn handle(
Err(e) => {
let status = subject.page.content.to_status_failure();
status.set_description(Some(&e.to_string()));
subject.page.navigation.request.entry.set_progress_fraction(0.0);
subject.page.navigation.request.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
subject.tab_page.set_title(&status.title());
redirects.replace(0); // reset

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

@ -6,18 +6,15 @@ mod navigation;
mod search;
mod widget;
use super::{Action as ItemAction, BrowserAction, Profile, TabAction, WindowAction};
use content::Content;
use error::Error;
use input::Input;
use navigation::Navigation;
use search::Search;
use widget::Widget;
use super::{Action as ItemAction, BrowserAction, Profile, TabAction, WindowAction};
use gtk::prelude::EditableExt;
use sqlite::Transaction;
use std::rc::Rc;
use widget::Widget;
pub struct Page {
pub profile: Rc<Profile>,
@ -88,7 +85,7 @@ impl Page {
let result = match self
.profile
.bookmark
.toggle(self.navigation.request.entry.text().as_str())
.toggle(self.navigation.request().as_str())
{
Ok(result) => Ok(result),
Err(_) => Err(Error::Bookmark), // @TODO
@ -144,7 +141,7 @@ impl Page {
self.navigation.restore(transaction, &record.id)?;
// Make initial page history snap using `navigation` values restored
// * just to have back/forward navigation ability
if let Some(uri) = self.navigation.request.uri() {
if let Some(uri) = self.navigation.uri() {
self.profile.history.memory.request.set(uri);
}
}

42
src/app/browser/window/tab/item/page/navigation.rs
View file

@ -7,7 +7,11 @@ mod request;
use super::{ItemAction, Profile, TabAction, WindowAction};
use bookmark::Bookmark;
use gtk::{prelude::BoxExt, Box, Button, Orientation};
use gtk::{
glib::{GString, Uri},
prelude::{BoxExt, EditableExt, WidgetExt},
Box, Button, Entry, Orientation,
};
use history::History;
use home::Home;
use reload::Reload;
@ -22,7 +26,7 @@ pub struct Navigation {
pub home: Button,
pub reload: Button,
pub bookmark: Button,
pub request: Rc<Request>,
pub request: Entry,
pub g_box: Box,
}
@ -35,14 +39,14 @@ impl Navigation {
&Rc<ItemAction>,
),
) -> Self {
// init children components
// Init children components
let history = Box::history((window_action, tab_action, item_action));
let request = Rc::new(Request::build(item_action, profile));
let request = Entry::request(item_action, profile);
let reload = Button::reload((window_action, tab_action, item_action), &request);
let home = Button::home((window_action, tab_action, item_action), &request);
let bookmark = Button::bookmark(window_action, profile, &request);
// Init main widget
let g_box = Box::builder()
.orientation(Orientation::Horizontal)
.spacing(SPACING)
@ -54,7 +58,7 @@ impl Navigation {
g_box.append(&home);
g_box.append(&history);
g_box.append(&reload);
g_box.append(&request.entry); // @TODO
g_box.append(&request);
g_box.append(&bookmark);
Self {
@ -126,6 +130,32 @@ impl Navigation {
Ok(())
}
pub fn grab_focus(&self) -> bool {
self.request.grab_focus()
}
pub fn to_download(&self) {
self.request.to_download();
}
pub fn to_source(&self) {
self.request.to_source();
}
// Getters
pub fn request(&self) -> GString {
self.request.text()
}
pub fn uri(&self) -> Option<Uri> {
self.request.uri()
}
pub fn home(&self) -> Option<Uri> {
self.request.home()
}
}
// Tools

14
src/app/browser/window/tab/item/page/navigation/bookmark.rs
View file

@ -1,7 +1,7 @@
use super::{Profile, Request, WindowAction};
use super::{Profile, WindowAction};
use gtk::{
prelude::{ActionExt, ButtonExt, EditableExt},
Button,
Button, Entry,
};
use std::rc::Rc;
@ -9,12 +9,12 @@ const ICON_YES: &str = "starred-symbolic";
const ICON_NON: &str = "non-starred-symbolic";
pub trait Bookmark {
fn bookmark(action: &Rc<WindowAction>, profile: &Rc<Profile>, request: &Rc<Request>) -> Self;
fn bookmark(action: &Rc<WindowAction>, profile: &Rc<Profile>, request: &Entry) -> Self;
}
impl Bookmark for Button {
fn bookmark(action: &Rc<WindowAction>, profile: &Rc<Profile>, request: &Rc<Request>) -> Self {
let has_bookmark = profile.bookmark.get(&request.entry.text()).is_ok();
fn bookmark(action: &Rc<WindowAction>, profile: &Rc<Profile>, request: &Entry) -> Self {
let has_bookmark = profile.bookmark.get(&request.text()).is_ok();
let button = Button::builder()
.action_name(format!(
@ -31,9 +31,7 @@ impl Bookmark for Button {
let profile = profile.clone();
let request = request.clone();
move |_, _| {
button.set_icon_name(icon_name(
profile.bookmark.get(&request.entry.text()).is_ok(),
))
button.set_icon_name(icon_name(profile.bookmark.get(&request.text()).is_ok()))
}
}); // @TODO use local action

9
src/app/browser/window/tab/item/page/navigation/home.rs
View file

@ -3,15 +3,12 @@ use crate::app::browser::window::action::Position;
use gtk::{
gdk::BUTTON_MIDDLE,
prelude::{ActionExt, WidgetExt},
Button, GestureClick,
Button, Entry, GestureClick,
};
use std::rc::Rc;
pub trait Home {
fn home(
action: (&Rc<WindowAction>, &Rc<TabAction>, &Rc<ItemAction>),
request: &Rc<Request>,
) -> Self;
fn home(action: (&Rc<WindowAction>, &Rc<TabAction>, &Rc<ItemAction>), request: &Entry) -> Self;
}
impl Home for Button {
@ -21,7 +18,7 @@ impl Home for Button {
&Rc<TabAction>,
&Rc<ItemAction>,
),
request: &Rc<Request>,
request: &Entry,
) -> Self {
let button = Button::builder()
.action_name(format!("{}.{}", tab_action.id, item_action.home.name()))

6
src/app/browser/window/tab/item/page/navigation/reload.rs
View file

@ -3,14 +3,14 @@ use crate::app::browser::window::action::Position;
use gtk::{
gdk::BUTTON_MIDDLE,
prelude::{ActionExt, WidgetExt},
Button, GestureClick,
Button, Entry, GestureClick,
};
use std::rc::Rc;
pub trait Reload {
fn reload(
action: (&Rc<WindowAction>, &Rc<TabAction>, &Rc<ItemAction>),
request: &Rc<Request>,
request: &Entry,
) -> Self;
}
@ -21,7 +21,7 @@ impl Reload for Button {
&Rc<TabAction>,
&Rc<ItemAction>,
),
request: &Rc<Request>,
request: &Entry,
) -> Self {
let button = Button::builder()
.action_name(format!("{}.{}", tab_action.id, item_action.reload.name()))

78
src/app/browser/window/tab/item/page/navigation/request.rs
View file

@ -14,15 +14,50 @@ use std::{cell::Cell, rc::Rc};
const PLACEHOLDER_TEXT: &str = "URL or search term...";
pub struct Request {
pub entry: Entry,
pub trait Request {
// Constructors
fn request(item_action: &Rc<ItemAction>, profile: &Rc<Profile>) -> Self;
// Actions
fn clean(
&self,
transaction: &Transaction,
app_browser_window_tab_item_page_navigation_id: &i64,
) -> Result<(), String>;
fn restore(
&self,
transaction: &Transaction,
app_browser_window_tab_item_page_navigation_id: &i64,
) -> Result<(), String>;
fn save(
&self,
transaction: &Transaction,
app_browser_window_tab_item_page_navigation_id: &i64,
) -> Result<(), String>;
// Setters
fn to_download(&self);
fn to_source(&self);
// Getters
fn strip_prefix(&self) -> GString;
fn download(&self) -> GString;
fn source(&self) -> GString;
fn uri(&self) -> Option<Uri>;
fn home(&self) -> Option<Uri>;
}
impl Request {
impl Request for Entry {
// Constructors
/// Build new `Self`
pub fn build(item_action: &Rc<ItemAction>, profile: &Rc<Profile>) -> Self {
fn request(item_action: &Rc<ItemAction>, profile: &Rc<Profile>) -> Self {
// Init main widget
let entry = Entry::builder()
.placeholder_text(PLACEHOLDER_TEXT)
@ -122,12 +157,11 @@ impl Request {
}
});
// Return activated `Self`
Self { entry }
entry
}
// Actions
pub fn clean(
fn clean(
&self,
transaction: &Transaction,
app_browser_window_tab_item_page_navigation_id: &i64,
@ -150,7 +184,7 @@ impl Request {
Ok(())
}
pub fn restore(
fn restore(
&self,
transaction: &Transaction,
app_browser_window_tab_item_page_navigation_id: &i64,
@ -159,7 +193,7 @@ impl Request {
Ok(records) => {
for record in records {
if let Some(text) = record.text {
self.entry.set_text(&text);
self.set_text(&text);
}
// Delegate restore action to the item childs
@ -172,13 +206,13 @@ impl Request {
Ok(())
}
pub fn save(
fn save(
&self,
transaction: &Transaction,
app_browser_window_tab_item_page_navigation_id: &i64,
) -> Result<(), String> {
// Keep value in memory until operation complete
let text = self.entry.text();
let text = self.text();
match database::insert(
transaction,
@ -202,40 +236,40 @@ impl Request {
// Setters
pub fn to_download(&self) {
self.entry.set_text(&self.download());
fn to_download(&self) {
self.set_text(&self.download());
}
pub fn to_source(&self) {
self.entry.set_text(&self.source());
fn to_source(&self) {
self.set_text(&self.source());
}
// Getters
/// Get current request value without system prefix
/// * the `prefix` is not `scheme`
pub fn strip_prefix(&self) -> GString {
strip_prefix(self.entry.text())
fn strip_prefix(&self) -> GString {
strip_prefix(self.text())
}
/// Get request value in `download:` format
pub fn download(&self) -> GString {
fn download(&self) -> GString {
gformat!("download:{}", self.strip_prefix())
}
/// Get request value in `source:` format
pub fn source(&self) -> GString {
fn source(&self) -> GString {
gformat!("source:{}", self.strip_prefix())
}
/// Try get current request value as [Uri](https://docs.gtk.org/glib/struct.Uri.html)
/// * `strip_prefix` on parse
pub fn uri(&self) -> Option<Uri> {
uri(&strip_prefix(self.entry.text()))
fn uri(&self) -> Option<Uri> {
uri(&strip_prefix(self.text()))
}
/// Try build home [Uri](https://docs.gtk.org/glib/struct.Uri.html) for `Self`
pub fn home(&self) -> Option<Uri> {
fn home(&self) -> Option<Uri> {
home(self.uri())
}
}