Refactor gemini lib into crate, fix unused var warnings

Author: ranfdev

Cargo.lock

@@ -4,6 +4,7 @@ version = "1.0.1"
 authors = ["ranfdev <[email protected]>"]
 edition = "2021"
 
+[workspace]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,12 +14,12 @@ git = "https://github.com/gtk-rs/gtk4-rs.git"
 features = ["v4_6"]
 
 [dependencies]
+gemini = { path = "gemini" }
 async-net = "1.4.7"
 async-fs = "1.5.0"
 url = "2.1.1"
 thiserror = "1.0.20"
 futures = "0.3.5"
-regex = "1.3.9"
 once_cell = "1.4.0"
 anyhow = "1.0.32"
 async-trait = "0.1.38"

Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "gemini"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+
+[dependencies]
+once_cell = "1.4.0"
+regex = "1.3.9"
+async-net = "1.4.7"
+futures = "0.3.5"
+log = "0.4.0"
+url = "2.1.1"
+thiserror = "1.0.20"
+async-native-tls = "0.3.3"

gemini/Cargo.toml

@@ -13,6 +13,7 @@ pub enum PageElement {
     Empty,
 }
 
+#[derive(Debug, Clone, Default)]
 pub struct Parser {
     inside_pre: bool,
 }

src/gemini/client.rs gemini/src/client.rssrc/gemini/client.rs renamed to gemini/src/client.rs

@@ -1,7 +1,7 @@
 pub const APP_ID: &str = @APP_ID@;
-pub const GETTEXT_PACKAGE: &str = @GETTEXT_PACKAGE@;
-pub const LOCALEDIR: &str = @LOCALEDIR@;
-pub const PKGDATADIR: &str = @PKGDATADIR@;
-pub const PROFILE: &str = @PROFILE@;
+pub const _GETTEXT_PACKAGE: &str = @GETTEXT_PACKAGE@;
+pub const _LOCALEDIR: &str = @LOCALEDIR@;
+pub const _PKGDATADIR: &str = @PKGDATADIR@;
+pub const _PROFILE: &str = @PROFILE@;
 pub const RESOURCES_FILE: &str = concat!(@PKGDATADIR@, "/resources.gresource");
 pub const VERSION: &str = @VERSION@;

src/gemini/mod.rs gemini/src/lib.rssrc/gemini/mod.rs renamed to gemini/src/lib.rs

@@ -15,8 +15,6 @@ pub static DOWNLOAD_PATH: Lazy<std::path::PathBuf> = Lazy::new(|| {
 
 pub static ABOUT_PAGE: &str = std::include_str!("../../README.gemini");
 
-pub const MARGIN: i32 = 20;
-
 pub static DATA_DIR_PATH: Lazy<std::path::PathBuf> =
     Lazy::new(|| glib::user_data_dir().join("geopard"));
 

src/gemini/parser.rs gemini/src/parser.rssrc/gemini/parser.rs renamed to gemini/src/parser.rs

@@ -13,7 +13,6 @@ use std::rc::Rc;
 mod build_config;
 mod common;
 mod config;
-mod gemini;
 mod lossy_text_read;
 mod macros;
 mod text_extensions;

src/build_config.rs.in

@@ -1,3 +1,3 @@
 /// Composable extensions over `gtk::TextEditor`
 mod gemini;
-pub use gemini::*;
+pub use self::gemini::*;