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

move common handler features to the parent level

Browse source
This commit is contained in:
yggverse 2025-01-22 06:47:06 +02:00
parent 025899ba68
commit 133d0f39f2
2 changed files with 65 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,46 +72,7 @@ impl Gemini {
// Actions
pub fn handle(
&self,
uri: Uri,
feature: Feature,
cancellable: Cancellable,
is_snap_history: bool,
) {
// Move focus out from navigation entry
self.subject
.page
.browser_action
.escape
.activate_stateful_once(Some(self.subject.page.id.as_str().into()));
// Initially disable find action
self.subject
.page
.window_action
.find
.simple_action
.set_enabled(false);
// Reset widgets
self.subject.page.search.unset();
self.subject.page.input.unset();
self.subject.page.title.replace("Loading..".into());
self.subject
.page
.navigation
.request
.widget
.entry
.set_progress_fraction(0.1);
self.subject.tab_page.set_loading(true);
if is_snap_history {
snap_history(&self.subject, None);
}
pub fn handle(&self, uri: Uri, feature: Feature, cancellable: Cancellable) {
self.client.request_async(
Request::gemini(uri.clone()),
Priority::DEFAULT,
@ -392,7 +353,7 @@ impl Gemini {
.set_text(&uri.to_string());
}
redirects.replace(total);
subject.page.tab_action.load.activate(Some(&target.to_string()), is_snap_history);
subject.page.tab_action.load.activate(Some(&target.to_string()), false);
}
}
Err(e) => {
@ -459,30 +420,3 @@ fn uri_to_title(uri: &Uri) -> GString {
path
}
}
/// 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.widget.entry.text();
// Add new record into the global memory index (used in global menu)
// * if the `Uri` is `None`, try parse it from `request`
match uri {
Some(uri) => subject.page.profile.history.memory.request.set(uri.clone()),
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.as_uri() {
subject.page.profile.history.memory.request.set(uri);
}
}
}
// Add new record into the page navigation history
if match subject.page.navigation.history.current() {
Some(current) => current != request, // apply additional filters
None => true,
} {
subject.page.navigation.history.add(request, true)
}
}