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

update ggemtext api version

Browse Source
This commit is contained in:
yggverse 2024-12-03 19:29:14 +02:00
parent eb70c2d873
commit a5c0a4bdd0
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,12 +866,12 @@ pub fn migrate(tx: &Transaction) -> Result<(), String> {
/// Useful as common placeholder when page title could not be detected
///
/// * this feature may be improved and moved outside @TODO
fn uri_to_title(uri: &Uri) -> GString {
let title = GString::from(uri.path().split('/').last().unwrap_or_default());
fn uri_to_title(uri: &Uri) -> String {
let title = uri.path().split('/').last().unwrap_or_default().to_string();
if title.is_empty() {
match uri.host() {
Some(host) => gformat!("{host}"),
None => gformat!("Untitled"),
Some(host) => host.to_string(),
None => "Untitled".to_string(),
}
} else {
title

7
src/app/browser/window/tab/item/page/content/text.rs
View File

@ -3,14 +3,11 @@ mod gemini;
use gemini::Gemini;
use crate::app::browser::window::{tab::item::Action as TabAction, Action as WindowAction};
use gtk::{
glib::{GString, Uri},
ScrolledWindow,
};
use gtk::{glib::Uri, ScrolledWindow};
use std::rc::Rc;
pub struct Meta {
pub title: Option<GString>,
pub title: Option<String>,
} // @TODO move to separated mod
pub struct Text {

12
src/app/browser/window/tab/item/page/content/text/gemini/reader.rs
View File

@ -13,7 +13,7 @@ use crate::app::browser::window::{
};
use adw::StyleManager;
use gemtext::line::{
code::Code,
code::{Inline, Multiline},
header::{Header, Level},
link::Link,
list::List,
@ -22,7 +22,7 @@ use gemtext::line::{
use gtk::{
gdk::{BUTTON_MIDDLE, BUTTON_PRIMARY},
gio::Cancellable,
glib::{GString, TimeZone, Uri},
glib::{TimeZone, Uri},
prelude::{TextBufferExt, TextBufferExtManual, TextViewExt, WidgetExt},
EventControllerMotion, GestureClick, TextBuffer, TextTag, TextWindowType, UriLauncher, Window,
WrapMode,
@ -35,7 +35,7 @@ pub const LIST_ITEM: &str = "•";
pub const NEW_LINE: &str = "\n";
pub struct Reader {
pub title: Option<GString>,
pub title: Option<String>,
pub widget: Rc<Widget>,
}
@ -67,7 +67,7 @@ impl Reader {
// Parse gemtext lines
for line in gemtext.lines() {
// Is inline code
if let Some(code) = Code::inline_from(line) {
if let Some(code) = Inline::from(line) {
// Append value to buffer
match syntax.highlight(&code.value, &tag.code.text_tag, None) {
Ok(highlight) => {
@ -104,7 +104,7 @@ impl Reader {
match multiline {
None => {
// Open tag found
if let Some(code) = Code::multiline_begin_from(line) {
if let Some(code) = Multiline::begin_from(line) {
// Begin next lines collection into the code buffer
multiline = Some(code);
@ -113,7 +113,7 @@ impl Reader {
}
}
Some(ref mut this) => {
match Code::multiline_continue_from(this, line) {
match Multiline::continue_from(this, line) {
Ok(()) => {
// Close tag found:
if this.completed {