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

implement page reload on request auto-routed

Browse source
This commit is contained in:
yggverse 2024-09-25 02:35:54 +03:00
parent c31cf21149
commit cdf3dbcf04
3 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/browser/main/tab/page/mod.rs
View file

@ -49,19 +49,25 @@ impl Page {
println!("Parsed URI: {}", uri); // @TODO println!("Parsed URI: {}", uri); // @TODO
} }
Err(_) => { Err(_) => {
// Request contain host substring // Try interpret host manually
if Regex::match_simple( if Regex::match_simple(
r"regex(^[^\/\s]+\.[\w]{2,})regex", r"regex(^[^\/\s]+\.[\w]{2,})regex",
request_text.clone(), request_text.clone(),
RegexCompileFlags::DEFAULT, RegexCompileFlags::DEFAULT,
RegexMatchFlags::DEFAULT, RegexMatchFlags::DEFAULT,
) { ) {
let request_text = format!("gemini://{request_text}"); // Seems request contain some host substring
// @TODO reload self.navigation.set_request_text(
&GString::from(format!("gemini://{request_text}")),
true, // activate (page reload) @TODO validate new uri instead?
);
} else { } else {
// Plain text given, make search request to default provider
Uri::escape_string(&request_text, None, false); Uri::escape_string(&request_text, None, false);
let request_text = format!("gemini://tlgs.one/search?{request_text}"); self.navigation.set_request_text(
// @TODO reload &GString::from(format!("gemini://tlgs.one/search?{request_text}")),
true, // activate (page reload)
);
} }
} }
}; };

5
src/browser/main/tab/page/navigation/mod.rs
View file

@ -68,6 +68,11 @@ impl Navigation {
self.bookmark.update(); self.bookmark.update();
} }
// Setters
pub fn set_request_text(&self, value: &GString, activate: bool) {
self.request.set_text(value, activate);
}
// Getters // Getters
pub fn widget(&self) -> &Box { pub fn widget(&self) -> &Box {
&self.widget &self.widget

9
src/browser/main/tab/page/navigation/request/mod.rs
View file

@ -37,6 +37,15 @@ impl Request {
// @TODO animate progress fraction // @TODO animate progress fraction
} }
// Setters
pub fn set_text(&self, value: &GString, activate: bool) {
self.widget.set_text(value);
if activate {
self.widget.activate();
}
}
// Getters // Getters
pub fn widget(&self) -> &Entry { pub fn widget(&self) -> &Entry {
&self.widget &self.widget