diff --git a/src/browser/db.rs b/src/browser/db.rs index f3bb5fb4..ed8aae00 100644 --- a/src/browser/db.rs +++ b/src/browser/db.rs @@ -1,3 +1,4 @@ +/* @TODO use std::sync::Arc; pub struct Browser { @@ -20,4 +21,4 @@ impl Browser { // Restore previous browser session from DB fn restore(&self) {} -} +}*/ diff --git a/src/browser/main/tab/page/content/text/gemini/reader/parser/header.rs b/src/browser/main/tab/page/content/text/gemini/reader/parser/header.rs index c92d6862..d77b0910 100644 --- a/src/browser/main/tab/page/content/text/gemini/reader/parser/header.rs +++ b/src/browser/main/tab/page/content/text/gemini/reader/parser/header.rs @@ -7,7 +7,7 @@ pub enum Level { } pub struct Header { - level: Level, + // level: Level, text: GString, markup: GString, } @@ -54,12 +54,11 @@ impl Header { "{}\n", markup_escape_text(&text) ), - _ => return None, }; // Result return Some(Header { - level, + // level, text, markup, }); diff --git a/src/browser/main/tab/page/content/text/gemini/reader/parser/link.rs b/src/browser/main/tab/page/content/text/gemini/reader/parser/link.rs index 346a7539..d7d51cb9 100644 --- a/src/browser/main/tab/page/content/text/gemini/reader/parser/link.rs +++ b/src/browser/main/tab/page/content/text/gemini/reader/parser/link.rs @@ -3,12 +3,12 @@ use gtk::glib::{ }; pub struct Link { - alt: Option, // [optional] alternative text - date: Option, // [optional] date @TODO store in UnixTime? - external: bool, // external link indicator - link: GString, // original link, wanted for title tooltip - markup: GString, // pango markup with escaped special chars - uri: Uri, // parsed link object (currently not in use) + // alt: Option, // [optional] alternative text + // date: Option, // [optional] date @TODO store in UnixTime? + // external: bool, // external link indicator + // link: GString, // original link, wanted for title tooltip + markup: GString, // pango markup with escaped special chars + // uri: Uri, // parsed link object (currently not in use) } impl Link { @@ -20,8 +20,8 @@ impl Link { // returns new Link struct or None pub fn from(line: &str, base: &Uri) -> Option { // Init struct members - let mut alt: Option = None; - let mut date: Option = None; + // let mut alt: Option = None; + // let mut date: Option = None; let external: bool; let link: GString; let markup: GString; @@ -72,7 +72,7 @@ impl Link { // Date if let Some(this) = parsed.get(2) { - date = Some(GString::from(this.to_string())); + // date = Some(GString::from(this.to_string())); name.push(this.to_string()); } @@ -80,7 +80,7 @@ impl Link { match parsed.get(3) { // Not empty Some(this) => { - alt = Some(GString::from(this.to_string())); + // alt = Some(GString::from(this.to_string())); name.push(this.to_string()); } // Empty, use resolved address @@ -96,16 +96,17 @@ impl Link { ); Some(Self { - alt, - date, - external, - link, + // alt, + // date, + // external, + // link, markup, - uri, + // uri, }) } // Getters + /* @TODO pub fn alt(&self) -> &Option { &self.alt } @@ -122,11 +123,11 @@ impl Link { &self.link } + pub fn uri(&self) -> &Uri { + &self.uri + }*/ + pub fn markup(&self) -> &GString { &self.markup } - - pub fn uri(&self) -> &Uri { - &self.uri - } }