Refactor widgets in their own module

Author: ranfdev

src/main.rs

@@ -13,13 +13,11 @@ use std::rc::Rc;
 mod build_config;
 mod common;
 mod config;
-mod download_page;
 mod gemini;
 mod lossy_text_read;
 mod macros;
-mod tab;
 mod text_extensions;
-mod window;
+mod widgets;
 
 use gtk::prelude::*;
 async fn read_config() -> anyhow::Result<config::Config> {
@@ -85,7 +83,7 @@ fn main() {
     let windows = Rc::new(RefCell::new(vec![]));
 
     application.connect_activate(move |_| {
-        let window = window::Window::new(&app_clone, config.clone());
+        let window = widgets::Window::new(&app_clone, config.clone());
         window.present();
         windows.borrow_mut().push(window);
     });

src/download_page.rs src/widgets/download_page.rssrc/download_page.rs renamed to src/widgets/download_page.rs

@@ -1,4 +1,3 @@
-use glib::subclass::prelude::*;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
@@ -51,3 +50,8 @@ impl DownloadPage {
         glib::Object::new(&[]).unwrap()
     }
 }
+impl Default for DownloadPage {
+    fn default() -> Self {
+        Self::new()
+    }
+}

src/input_page.rs src/widgets/input_page.rssrc/input_page.rs renamed to src/widgets/input_page.rs

@@ -1,4 +1,3 @@
-use glib::subclass::prelude::*;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
@@ -47,3 +46,8 @@ impl InputPage {
         glib::Object::new(&[]).unwrap()
     }
 }
+impl Default for InputPage {
+    fn default() -> Self {
+        Self::new()
+    }
+}

src/widgets/mod.rs

@@ -0,0 +1,10 @@
+mod download_page;
+mod input_page;
+#[allow(clippy::await_holding_refcell_ref)]
+mod tab;
+mod window;
+
+pub use download_page::DownloadPage;
+pub use input_page::InputPage;
+pub use tab::Tab;
+pub use window::Window;

src/tab.rs src/widgets/tab.rssrc/tab.rs renamed to src/widgets/tab.rs

@@ -22,10 +22,19 @@ use std::rc::Rc;
 use url::Url;
 
 use crate::common;
-use crate::common::{glibctx, HistoryItem, LossyTextRead};
+use crate::common::glibctx;
 use crate::gemini;
 use crate::gemini::PageElement;
+use crate::lossy_text_read::*;
 use crate::text_extensions::Gemini as GeminiTextExt;
+use crate::widgets;
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct HistoryItem {
+    pub url: url::Url,
+    pub cache: Rc<RefCell<Option<Vec<u8>>>>,
+    pub scroll_progress: f64,
+}
 
 #[derive(Clone, Debug, glib::Boxed, Default)]
 #[boxed_type(name = "GeopardHistoryStatus")]
@@ -413,7 +422,7 @@ impl Tab {
             .iter()
             .find_map(GeminiTextExt::linkhandler)
             .cloned()
-            .ok_or(anyhow::Error::msg("Clicked text doesn't have a link tag"))
+            .ok_or_else(|| anyhow::Error::msg("Clicked text doesn't have a link tag"))
     }
     async fn open_file_url(&self, url: Url) -> Result<()> {
         let path = url
@@ -459,7 +468,7 @@ impl Tab {
     }
     async fn open_gemini_url(&self, url: Url) -> anyhow::Result<Option<Vec<u8>>> {
         let imp = self.imp();
-        let res: gemini::Response = imp.gemini_client.borrow().fetch(url.as_str()).await?;
+        let res: gemini::Response = { imp.gemini_client.borrow().fetch(url.as_str()) }.await?;
 
         use gemini::Status::*;
         let meta = res.meta().to_owned();
@@ -536,7 +545,7 @@ impl Tab {
             .context("Can't get last url segment")?;
         let d_path = Self::download_path(file_name)?;
 
-        let page = crate::download_page::DownloadPage::new();
+        let page = widgets::DownloadPage::new();
         page.imp().label.set_label(file_name);
         imp.stack.add_child(&page);
         imp.stack.set_visible_child(&page);
@@ -547,7 +556,7 @@ impl Tab {
             gtk::show_uri(None::<&gtk::Window>, &downloaded_file_url, 0);
         });
 
-        let ext = file_name.split(".").last();
+        let ext = file_name.split('.').last();
         if let Some(true) = ext.map(|ext| crate::common::STREAMABLE_EXTS.contains(&ext)) {
             page.imp().open_btn.set_opacity(1.0);
         }
@@ -611,7 +620,7 @@ impl Tab {
     fn display_input(&self, url: Url, msg: &str) {
         let imp = self.imp();
 
-        let text_input = crate::input_page::InputPage::new();
+        let text_input = widgets::InputPage::new();
         imp.stack.add_child(&text_input);
         imp.stack.set_visible_child(&text_input);
         text_input.imp().label.set_label(msg);
@@ -699,7 +708,7 @@ impl Tab {
                         if !title_updated {
                             title_updated = true;
                             imp.title
-                                .replace(line.trim_end().trim_start_matches("#").to_string());
+                                .replace(line.trim_end().trim_start_matches('#').to_string());
                             self.notify("title");
                         }
                     }

src/window.rs src/widgets/window.rssrc/window.rs renamed to src/widgets/window.rs

@@ -6,22 +6,19 @@ use glib::{clone, Properties};
 use gtk::gdk;
 use gtk::gio;
 use gtk::glib;
-use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 use gtk::TemplateChild;
 use log::{error, info, warn};
-use std::cell::Cell;
 use std::cell::RefCell;
 use std::hash::{Hash, Hasher};
 use std::marker::PhantomData;
 use url::Url;
 
 use crate::common::{bookmarks_url, glibctx, BOOKMARK_FILE_PATH};
 use crate::config;
-use crate::tab::HistoryStatus;
-use crate::tab::Tab;
-use crate::{self_action, view};
+use crate::self_action;
+use crate::widgets::tab::{HistoryStatus, Tab};
 
 pub mod imp {
     use super::*;
@@ -360,15 +357,15 @@ impl Window {
     }
     fn open_omni(&self, v: &str) {
         let url = Url::parse(v).or_else(|_| {
-            if v.contains(".") && v.split(".").all(|s| s.chars().all(char::is_alphanumeric)) {
+            if v.contains('.') && v.split('.').all(|s| s.chars().all(char::is_alphanumeric)) {
                 Url::parse(&format!("gemini://{}", v))
             } else {
                 Url::parse(&format!("gemini://geminispace.info/search?{}", v))
             }
         });
         match url {
             Ok(url) => self.current_tab().spawn_open_url(url),
-            Err(e) => error!("Failed to open from omni bar"),
+            Err(e) => error!("Failed to open from omni bar: {}", e),
         }
     }
     fn open_url_str(&self, v: &str) {
@@ -446,8 +443,7 @@ impl Window {
         let imp = self.imp();
         imp.squeezer
             .visible_child()
-            .map(|child| child.downcast().ok())
-            .flatten()
+            .and_then(|child| child.downcast().ok())
             .map(|w: gtk::WindowHandle| w == self.imp().header_small.get())
             .unwrap_or(false)
     }