YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-09-13 07:22:16 +00:00
Code Issues Projects Releases Wiki Activity

begin ggemini lib integration

Browse Source
This commit is contained in:
yggverse 2024-10-23 10:52:25 +03:00
parent 3578928969
commit ef64e7e032
2 changed files with 161 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ use input::Input;
use navigation::Navigation; use navigation::Navigation;
use widget::Widget; use widget::Widget;
use meta::{Meta, Mime, Status}; use meta::{Meta, Status};
use gtk::{ use gtk::{
gio::{Cancellable, SimpleAction, SocketClient, SocketProtocol, TlsCertificateFlags}, gio::{Cancellable, SimpleAction, SocketClient, SocketProtocol, TlsCertificateFlags},
@ -174,7 +174,6 @@ impl Page {
let action_update = self.action_update.clone(); let action_update = self.action_update.clone();
// Update // Update
meta.borrow_mut().mime = None;
meta.borrow_mut().status = Some(Status::Reload); 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;
@ -228,7 +227,7 @@ impl Page {
gformat!("{}\r\n", &uri.to_str()), gformat!("{}\r\n", &uri.to_str()),
Priority::DEFAULT, Priority::DEFAULT,
Some(&cancellable.clone()), Some(&cancellable.clone()),
move |result| match result { move |o| match o {
Ok(_) => { Ok(_) => {
// Update // Update
meta.borrow_mut().status = Some(Status::Request); meta.borrow_mut().status = Some(Status::Request);
@ -241,12 +240,21 @@ impl Page {
vec![0; 0xfffff], // 1Mb @TODO vec![0; 0xfffff], // 1Mb @TODO
Priority::DEFAULT, Priority::DEFAULT,
Some(&cancellable.clone()), Some(&cancellable.clone()),
move |result| match result { move |i| match i {
Ok(response) => { Ok(i) => {
match GString::from_utf8_until_nul( // Define local NS
response.0, use gemini::client::response::{
header::{
Mime as ResponseMime,
Status as ResponseStatus
},
Response,
};
match Response::from_utf8(
&i.0.to_vec(),
) { ) {
Ok(data) => { Ok(response) => {
// Format response // Format response
meta.borrow_mut().status = Some(Status::Response); meta.borrow_mut().status = Some(Status::Response);
meta.borrow_mut().description = Some(host); meta.borrow_mut().description = Some(host);
@ -254,39 +262,34 @@ impl Page {
action_update.activate(Some(&id)); action_update.activate(Some(&id));
// Parse response @TODO read bytes match response.header().status() {
let parts = Regex::split_simple( // 10 | 11
r"^(\d+)?\s([\w]+\/[\w]+)?(.*)?", ResponseStatus::Input | ResponseStatus::SensitiveInput => {
&data,
RegexCompileFlags::DEFAULT,
RegexMatchFlags::DEFAULT,
);
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-codes
match parts.get(1) {
Some(code) => match code.as_str() {
// Input expected
"10" | "11" => {
match parts.get(3) {
Some(placeholder) => {
// Format response // Format response
let status = Status::Input; let status = Status::Input;
let title = gformat!("Input expected"); let title = gformat!("Input expected");
let description = gformat!("{placeholder}"); let description = match response.header().meta() {
Some(meta) => match meta.to_gstring() {
Ok(value) => value,
Err(_) => title.clone()
},
None => title.clone(),
};
// Make input form // Make input form
if "11" == code.as_str() { // sensitive input match response.header().status() {
ResponseStatus::SensitiveInput =>
input.set_new_sensitive( input.set_new_sensitive(
action_page_open, uri, action_page_open, uri,
Some(&description), Some(&description),
Some(1024), Some(1024),
); ),
} else { _ =>
input.set_new_response( input.set_new_response(
action_page_open, uri, action_page_open, uri,
Some(&description), Some(&description),
Some(1024), Some(1024),
); )
} }
// Update meta // Update meta
@ -297,20 +300,13 @@ impl Page {
// Update page // Update page
action_update.activate(Some(&id)); action_update.activate(Some(&id));
}, },
None => todo!(), // 20
} ResponseStatus::Success =>
}, match response.header().mime() {
// Success Some(ResponseMime::TextGemini) => {
"20" => {
match parts.get(2) {
Some(mime) => match mime.as_str() {
"text/gemini" => {
// Update meta
meta.borrow_mut().mime = Some(Mime::TextGemini);
// Update data // Update data
match parts.get(4) { match response.body().to_gstring() {
Some(source) => { Ok(source) => {
meta.borrow_mut().status = Some(Status::Success); meta.borrow_mut().status = Some(Status::Success);
// This content type may return parsed title // This content type may return parsed title
@ -331,27 +327,19 @@ impl Page {
// Update window components // Update window components
action_update.activate(Some(&id)); action_update.activate(Some(&id));
}, },
None => todo!(), Err(_) => todo!(),
} }
}, },
"text/plain" => { Some(ResponseMime::TextPlain) => {
meta.borrow_mut().status = Some(Status::Success); meta.borrow_mut().status = Some(Status::Success);
meta.borrow_mut().mime = Some(Mime::TextPlain);
action_update.activate(Some(&id)); action_update.activate(Some(&id));
todo!() todo!()
}, },
"image/png" | "image/gif" | "image/jpeg" | "image/webp" => { Some(ResponseMime::ImagePng) | Some(ResponseMime::ImageGif) | Some(ResponseMime::ImageJpeg) | Some(ResponseMime::ImageWebp) => {
// Update meta // Update meta
meta.borrow_mut().status = Some(Status::Success); meta.borrow_mut().status = Some(Status::Success);
meta.borrow_mut().title = Some(gformat!("Picture")); // @TODO meta.borrow_mut().title = Some(gformat!("Picture")); // @TODO
meta.borrow_mut().mime = match mime.as_str() {
"image/png" => Some(Mime::ImagePng),
"image/gif" => Some(Mime::ImageGif),
"image/jpeg" => Some(Mime::ImageJpeg),
"image/webp" => Some(Mime::ImageWebp),
_ => panic!()
};
// Update content // Update content
content.set_image(); // @TODO content.set_image(); // @TODO
@ -375,7 +363,7 @@ impl Page {
// Define common data // Define common data
let status = Status::Failure; let status = Status::Failure;
let title = gformat!("Oops"); let title = gformat!("Oops");
let description = gformat!("Content {mime} not supported"); let description = gformat!("Content type not supported");
// Update widget // Update widget
content.set_status_failure(title.as_str(), description.as_str()); content.set_status_failure(title.as_str(), description.as_str());
@ -388,26 +376,28 @@ impl Page {
// Update window // Update window
action_update.activate(Some(&id)); action_update.activate(Some(&id));
}, },
}
None => todo!(),
};
}, },
// Redirect (@TODO implement limits to auto-redirect) // 32
"31" => { ResponseStatus::Redirect => {
// Update meta // Update meta
meta.borrow_mut().status = Some(Status::Redirect); meta.borrow_mut().status = Some(Status::Redirect);
meta.borrow_mut().mime = Some(Mime::TextGemini);
meta.borrow_mut().title = Some(gformat!("Redirect")); meta.borrow_mut().title = Some(gformat!("Redirect"));
action_update.activate(Some(&id)); action_update.activate(Some(&id));
// Select widget // Select widget
match parts.get(3) { match response.header().meta() {
Some(source) => { Some(meta) => {
let _ = content.set_text_gemini( let _ = content.set_text_gemini(
&uri, &uri,
// @TODO use template file // @TODO use template file
&gformat!("# Redirect\n\nAuto-follow disabled, click on link below to continue\n\n=> {source}") &gformat!(
"# Redirect\n\nAuto-follow disabled, click on link below to continue\n\n=> {}",
match meta.to_gstring() {
Ok(url) => url,
Err(_) => todo!()
}
)
); );
}, },
None => todo!(), None => todo!(),
@ -418,7 +408,7 @@ impl Page {
// Define common data // Define common data
let status = Status::Failure; let status = Status::Failure;
let title = gformat!("Oops"); let title = gformat!("Oops");
let description = gformat!("Status {code} not supported"); let description = gformat!("Status code not supported");
// Update widget // Update widget
content.set_status_failure(title.as_str(), description.as_str()); content.set_status_failure(title.as_str(), description.as_str());
@ -431,15 +421,13 @@ impl Page {
// Update window // Update window
action_update.activate(Some(&id)); action_update.activate(Some(&id));
}, },
}
None => todo!(),
}; };
} }
Err(error) => { Err(_) => {
// Define common data // Define common data
let status = Status::Failure; let status = Status::Failure;
let title = gformat!("Oops"); let title = gformat!("Oops");
let description = gformat!("Failed to read buffer data: {:?}", error); let description = gformat!("Failed to read buffer data");
// Update widget // Update widget
content.set_status_failure(title.as_str(), description.as_str()); content.set_status_failure(title.as_str(), description.as_str());

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

@ -1,38 +1,30 @@
use gtk::glib::GString; use gtk::glib::GString;
// Page MIME type (not related with gemini status code)
// Useful for content renderer detection, etc
pub enum Mime {
TextGemini,
TextPlain,
ImagePng,
ImageGif,
ImageJpeg,
ImageWebp,
}
// Internal page status (not related with gemini status code)
// Useful for widgets composition
pub enum Status { pub enum Status {
// SensitiveInput,
// Complete,
Connect, Connect,
// Connected,
// Connecting,
Failure, Failure,
Input, Input,
Prepare, Prepare,
// ProxyNegotiated,
// ProxyNegotiating,
Redirect, Redirect,
Reload, Reload,
Request, Request,
// Resolved,
// Resolving,
Response, Response,
// @TODO SensitiveInput,
Success, Success,
} // TlsHandshaked,
// TlsHandshaking,
} // @TODO
pub struct Meta { pub struct Meta {
// Text meta data for page
// Useful to update window title, label text, etc
pub title: Option<GString>, pub title: Option<GString>,
pub description: Option<GString>, pub description: Option<GString>,
// Enums
pub mime: Option<Mime>,
pub status: Option<Status>, pub status: Option<Status>,
} }
@ -41,7 +33,6 @@ impl Meta {
Self { Self {
title: None, title: None,
description: None, description: None,
mime: None,
status: None, status: None,
} }
} }