Refactor most of common, in correct modules

Author: ranfdev

src/common/mod.rs

@@ -1,13 +1,7 @@
-use async_trait::async_trait;
-use futures::prelude::*;
 use gtk::glib;
 use once_cell::sync::Lazy;
-use std::borrow::Cow;
-use std::cell::RefCell;
-use std::rc::Rc;
-use url::Url;
 
-use crate::gemini;
+use url::Url;
 
 pub static DOWNLOAD_PATH: Lazy<std::path::PathBuf> = Lazy::new(|| {
     let mut download_path = glib::user_special_dir(glib::UserDirectory::Downloads)
@@ -63,65 +57,3 @@ pub fn bookmarks_url() -> Url {
 pub fn glibctx() -> glib::MainContext {
     glib::MainContext::default()
 }
-
-pub struct Color(pub u8, pub u8, pub u8);
-
-impl std::fmt::LowerHex for Color {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:02x}", self.0)?;
-        write!(f, "{:02x}", self.1)?;
-        write!(f, "{:02x}", self.2)?;
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub enum PageElement {
-    Heading(String),
-    Quote(String),
-    Preformatted(String),
-    Text(String),
-    Link(String, Option<String>),
-    Empty,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct HistoryItem {
-    pub url: url::Url,
-    pub cache: Rc<RefCell<Option<Vec<u8>>>>,
-    pub scroll_progress: f64,
-}
-
-#[async_trait(?Send)]
-pub trait LossyTextRead {
-    async fn read_line_lossy(&mut self, mut buf: &mut String) -> std::io::Result<usize>;
-}
-
-#[async_trait(?Send)]
-impl<T: AsyncBufRead + Unpin> LossyTextRead for T {
-    async fn read_line_lossy(&mut self, buf: &mut String) -> std::io::Result<usize> {
-        // FIXME:  thread 'main' panicked at 'assertion failed: self.is_char_boundary(new_len)', /build/rustc-1.58.1-src/library/alloc/src/string.rs:1204:13
-        // This is safe because we treat buf as a mut Vec to read the data, BUT,
-        // we check if it's valid utf8 using String::from_utf8_lossy.
-        // If it's not valid utf8, we swap our buf with the newly allocated and
-        // safe string returned from String::from_utf8_lossy
-        //
-        // In the implementation of BufReader::read_line, they talk about some things about
-        // panic handling, which I don't understand currently. Whatever...
-        unsafe {
-            let vec_buf = buf.as_mut_vec();
-            let mut n = self.read_until(b'\n', vec_buf).await?;
-
-            let correct_string = String::from_utf8_lossy(vec_buf);
-            if let Cow::Owned(valid_utf8_string) = correct_string {
-                // Yes, I know this is not good for performance because it requires useless copying.
-                // BUT, this code will only be executed when invalid utf8 is found, so i
-                // consider this as good enough
-                buf.truncate(buf.len() - n); // Remove bad non-utf8 data
-                buf.push_str(&valid_utf8_string); // Add correct utf8 data instead
-                n = valid_utf8_string.len();
-            }
-            Ok(n)
-        }
-    }
-}

src/gemini/parser.rs

@@ -1,9 +1,18 @@
-use crate::common::PageElement;
 use once_cell::sync::Lazy;
 use regex::Regex;
 static R_GEMINI_LINK: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^=>\s*(?P<href>\S*)\s*(?P<label>.*)").unwrap());
 
+#[derive(Debug)]
+pub enum PageElement {
+    Heading(String),
+    Quote(String),
+    Preformatted(String),
+    Text(String),
+    Link(String, Option<String>),
+    Empty,
+}
+
 pub struct Parser {
     inside_pre: bool,
 }

src/lossy_text_read.rs

@@ -0,0 +1,37 @@
+use async_trait::async_trait;
+use futures::prelude::*;
+use std::borrow::Cow;
+
+#[async_trait(?Send)]
+pub trait LossyTextRead {
+    async fn read_line_lossy(&mut self, mut buf: &mut String) -> std::io::Result<usize>;
+}
+
+#[async_trait(?Send)]
+impl<T: AsyncBufRead + Unpin> LossyTextRead for T {
+    async fn read_line_lossy(&mut self, buf: &mut String) -> std::io::Result<usize> {
+        // FIXME:  thread 'main' panicked at 'assertion failed: self.is_char_boundary(new_len)', /build/rustc-1.58.1-src/library/alloc/src/string.rs:1204:13
+        // This is safe because we treat buf as a mut Vec to read the data, BUT,
+        // we check if it's valid utf8 using String::from_utf8_lossy.
+        // If it's not valid utf8, we swap our buf with the newly allocated and
+        // safe string returned from String::from_utf8_lossy
+        //
+        // In the implementation of BufReader::read_line, they talk about some things about
+        // panic handling, which I don't understand currently. Whatever...
+        unsafe {
+            let vec_buf = buf.as_mut_vec();
+            let mut n = self.read_until(b'\n', vec_buf).await?;
+
+            let correct_string = String::from_utf8_lossy(vec_buf);
+            if let Cow::Owned(valid_utf8_string) = correct_string {
+                // Yes, I know this is not good for performance because it requires useless copying.
+                // BUT, this code will only be executed when invalid utf8 is found, so i
+                // consider this as good enough
+                buf.truncate(buf.len() - n); // Remove bad non-utf8 data
+                buf.push_str(&valid_utf8_string); // Add correct utf8 data instead
+                n = valid_utf8_string.len();
+            }
+            Ok(n)
+        }
+    }
+}

src/main.rs

@@ -15,7 +15,7 @@ mod common;
 mod config;
 mod download_page;
 mod gemini;
-mod input_page;
+mod lossy_text_read;
 mod macros;
 mod tab;
 mod text_extensions;

src/tab.rs

@@ -22,8 +22,9 @@ use std::rc::Rc;
 use url::Url;
 
 use crate::common;
-use crate::common::{glibctx, HistoryItem, LossyTextRead, PageElement};
+use crate::common::{glibctx, HistoryItem, LossyTextRead};
 use crate::gemini;
+use crate::gemini::PageElement;
 use crate::text_extensions::Gemini as GeminiTextExt;
 
 #[derive(Clone, Debug, glib::Boxed, Default)]

src/text_extensions/mod.rs

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