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

fix home button status detection

Browse source
This commit is contained in:
yggverse 2024-12-13 02:52:26 +02:00
parent 27f778e231
commit d08c2fed29
3 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ mod widget;
use widget::Widget;
use crate::app::browser::window::action::Action as WindowAction;
use gtk::glib::{gformat, GString, Uri, UriFlags};
use gtk::glib::{gformat, GString, Uri};
use std::{cell::RefCell, rc::Rc};
pub struct Home {
@ -23,13 +23,13 @@ impl Home {
}
// Actions
pub fn update(&self, request: &str) {
let has_home = match Uri::parse(request, UriFlags::NONE) {
Ok(uri) => {
pub fn update(&self, request: Option<&Uri>) {
let has_home = match request {
Some(uri) => {
self.uri.replace(Some(uri.clone()));
uri.path().len() > 1
}
_ => {
None => {
self.uri.replace(None);
false
}

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

@ -124,8 +124,9 @@ impl Request {
// Getters
/// Get current request value in [Uri](https://docs.gtk.org/glib/struct.Uri.html) format
/// * `strip_prefix` on parse
pub fn uri(&self) -> Option<Uri> {
match Uri::parse(&self.widget.entry.text(), UriFlags::NONE) {
match Uri::parse(&strip_prefix(self.widget.entry.text()), UriFlags::NONE) {
Ok(uri) => Some(uri),
_ => None,
}
@ -134,17 +135,7 @@ impl Request {
/// Get current request value without system prefix
/// * the `prefix` is not `scheme`
pub fn strip_prefix(&self) -> GString {
let mut text = self.widget.entry.text();
if let Some(postfix) = text.strip_prefix("source:") {
text = postfix.into()
};
if let Some(postfix) = text.strip_prefix("download:") {
text = postfix.into()
};
text
strip_prefix(self.widget.entry.text())
}
/// Get request value in `download:` format
@ -188,6 +179,20 @@ impl Request {
// Tools
/// Strip system prefix from request string
/// * the `prefix` is not `scheme`
pub fn strip_prefix(mut request: GString) -> GString {
if let Some(postfix) = request.strip_prefix("source:") {
request = postfix.into()
};
if let Some(postfix) = request.strip_prefix("download:") {
request = postfix.into()
};
request
}
pub fn migrate(tx: &Transaction) -> Result<(), String> {
// Migrate self components
if let Err(e) = database::init(tx) {