YGGverse
/
Yoda
mirror of https://github.com/YGGverse/Yoda.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add page meta status update

master
yggverse 2 months ago
parent
492e3bb2ea
commit
7d55e2b8ee
2 changed files with 16 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/browser/main/tab/page.rs
  2. 1
      src/browser/main/tab/page/meta.rs

18
src/browser/main/tab/page.rs
Unescape View File

@ -3,7 +3,7 @@ mod meta;
mod navigation; mod navigation;
use content::Content; use content::Content;
use meta::{Meta, Mime}; use meta::{Meta, Mime, Status};
use navigation::Navigation; use navigation::Navigation;
use gtk::{ use gtk::{
@ -116,6 +116,7 @@ impl Page {
// Update // Update
meta.borrow_mut().mime = None; meta.borrow_mut().mime = None;
meta.borrow_mut().status = Some(Status::Reload);
meta.borrow_mut().title = Some(gformat!("Loading..")); meta.borrow_mut().title = Some(gformat!("Loading.."));
meta.borrow_mut().description = None; meta.borrow_mut().description = None;
meta.borrow_mut().progress_fraction = 0.0; meta.borrow_mut().progress_fraction = 0.0;
@ -222,11 +223,14 @@ impl Page {
// Select widget // Select widget
match parts.get(4) { match parts.get(4) {
Some(source) => { Some(source) => {
// Update component // Update content
let result = content.reset(content::Mime::TextGemini, &uri, &source); let result = content.reset(content::Mime::TextGemini, &uri, &source);
// This content type may return parsed title // This content type may return parsed title
meta.borrow_mut().title = result.title.clone(); meta.borrow_mut().title = result.title.clone();
// Update status
meta.borrow_mut().status = Some(Status::Success);
}, },
None => todo!(), None => todo!(),
} }
@ -247,7 +251,9 @@ impl Page {
"31" => { "31" => {
// Update meta // Update meta
meta.borrow_mut().mime = Some(Mime::TextGemini); meta.borrow_mut().mime = Some(Mime::TextGemini);
meta.borrow_mut().status = Some(Status::Redirect);
meta.borrow_mut().title = Some(gformat!("Redirect")); meta.borrow_mut().title = Some(gformat!("Redirect"));
meta.borrow_mut().progress_fraction = 1.0;
// Select widget // Select widget
match parts.get(3) { match parts.get(3) {
@ -255,7 +261,7 @@ impl Page {
let _ = content.reset( let _ = content.reset(
content::Mime::TextGemini, content::Mime::TextGemini,
&uri, &uri,
&gformat!("# Redirect\nConfirm:\n=> {source}") &gformat!("# Redirect\n=> {source}")
); );
}, },
None => todo!(), None => todo!(),
@ -263,8 +269,10 @@ impl Page {
}, },
// @TODO // @TODO
_ => { _ => {
meta.borrow_mut().status = Some(Status::Failure);
meta.borrow_mut().title = Some(gformat!("Oops")); meta.borrow_mut().title = Some(gformat!("Oops"));
meta.borrow_mut().description = Some(gformat!("Status {code} not supported")); meta.borrow_mut().description = Some(gformat!("Status {code} not supported"));
meta.borrow_mut().progress_fraction = 1.0;
}, },
} }
None => todo!(), None => todo!(),
@ -274,6 +282,7 @@ impl Page {
action_update.activate(None); action_update.activate(None);
} }
Err(e) => { Err(e) => {
meta.borrow_mut().status = Some(Status::Failure);
meta.borrow_mut().title = Some(gformat!("Oops")); meta.borrow_mut().title = Some(gformat!("Oops"));
meta.borrow_mut().description = Some(gformat!("Failed to read buffer data: {e}")); meta.borrow_mut().description = Some(gformat!("Failed to read buffer data: {e}"));
meta.borrow_mut().progress_fraction = 1.0; meta.borrow_mut().progress_fraction = 1.0;
@ -289,6 +298,7 @@ impl Page {
} }
Err(e) => { Err(e) => {
// Update // Update
meta.borrow_mut().status = Some(Status::Failure);
meta.borrow_mut().title = Some(gformat!("Oops")); meta.borrow_mut().title = Some(gformat!("Oops"));
meta.borrow_mut().description = Some(gformat!("Failed to read response: {:?}", e)); meta.borrow_mut().description = Some(gformat!("Failed to read response: {:?}", e));
meta.borrow_mut().progress_fraction = 1.0; meta.borrow_mut().progress_fraction = 1.0;
@ -305,6 +315,7 @@ impl Page {
} }
Err(e) => { Err(e) => {
// Update // Update
meta.borrow_mut().status = Some(Status::Failure);
meta.borrow_mut().title = Some(gformat!("Oops")); meta.borrow_mut().title = Some(gformat!("Oops"));
meta.borrow_mut().description = Some(gformat!("Failed to read request: {:?}", e)); meta.borrow_mut().description = Some(gformat!("Failed to read request: {:?}", e));
meta.borrow_mut().progress_fraction = 1.0; meta.borrow_mut().progress_fraction = 1.0;
@ -321,6 +332,7 @@ impl Page {
} }
Err(e) => { Err(e) => {
// Update // Update
meta.borrow_mut().status = Some(Status::Failure);
meta.borrow_mut().title = Some(gformat!("Oops")); meta.borrow_mut().title = Some(gformat!("Oops"));
meta.borrow_mut().description = Some(gformat!("Failed to connect: {:?}", e)); meta.borrow_mut().description = Some(gformat!("Failed to connect: {:?}", e));
meta.borrow_mut().progress_fraction = 1.0; meta.borrow_mut().progress_fraction = 1.0;

1
src/browser/main/tab/page/meta.rs
Unescape View File

@ -12,6 +12,7 @@ pub enum Mime {
pub enum Status { pub enum Status {
Failure, Failure,
Redirect, Redirect,
Reload,
Success, Success,
} }

Write Preview
Loading…
Cancel
Save