YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-01-15 17:20:08 +00:00
Code Issues Projects Releases Wiki Activity

define shared add_history method #2

Browse Source
This commit is contained in:
yggverse 2024-11-26 14:10:47 +02:00
parent 935c6ad75e
commit 6920cec90e
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ impl Page {
/// Main loader for different protocols, that routed by scheme /// Main loader for different protocols, that routed by scheme
/// * every protocol has it own (children) method implementation /// * every protocol has it own (children) method implementation
pub fn load(&self, history: bool) { pub fn load(&self, is_history: bool) {
/// Global limit to prevent infinitive redirects (ALL protocols) /// Global limit to prevent infinitive redirects (ALL protocols)
/// * every protocol implementation has own value checker, according to specification /// * every protocol implementation has own value checker, according to specification
const DEFAULT_MAX_REDIRECT_COUNT: i8 = 10; const DEFAULT_MAX_REDIRECT_COUNT: i8 = 10;
@ -219,15 +219,8 @@ impl Page {
}; };
// Add history record // Add history record
if history { if is_history {
match self.navigation.history().current() { self.add_history(Some(request.clone()));
Some(current) => {
if current != request {
self.navigation.history().add(request.clone(), true);
}
}
None => self.navigation.history().add(request.clone(), true),
}
} }
// Update // Update
@ -424,7 +417,28 @@ impl Page {
&self.widget &self.widget
} }
// Private helpers @TODO move outside // Private helpers
/// Make new history record match shared conditions
/// * use `request` value from `navigation` entry if `None`
fn add_history(&self, request: Option<GString>) {
// Get request from argument or use navigation entry value
let request = match request {
Some(value) => value,
None => self.navigation.request().widget().gobject().text(),
};
// Apply additional filters
if match self.navigation.history().current() {
Some(current) => current != request,
None => true,
} {
// Add new record match conditions
self.navigation.history().add(request, true)
}
}
// @TODO move outside
fn load_gemini(&self, uri: Uri) { fn load_gemini(&self, uri: Uri) {
// Stream wrapper for TLS connections // Stream wrapper for TLS connections
fn auth( fn auth(