refactor!: use mod.rs to clean up directory structure

Using `mod.rs` allows for a cleaner directory as we can avoid
having a file for each module in the root directory. This makes it
easier to identify the important files and represents the
compartmentalization of the code better.

Additionally, imports (of modules, external crates and std
create) in files now follow the recommended order.

Signed-off-by: Ivin Joel Abraham <[email protected]>

Author: ivinjabraham

src/app/config.rs

@@ -1,5 +1,6 @@
 use derive_getters::Getters;
 use serde::{Deserialize, Serialize};
+
 use std::{
     collections::{HashMap, HashSet},
     env,

src/app.rs renamed to src/app/mod.rs

@@ -1,20 +1,28 @@
-use crate::infrastructure::logging::Logger;
-use crate::lore::{
-    lore_api_client::BlockingLoreAPIClient,
-    lore_session,
-    patch::{Author, Patch},
-};
+pub mod config;
+mod cover_renderer;
+mod patch_renderer;
+pub mod screens;
+
+use ansi_to_tui::IntoText;
+use color_eyre::eyre::bail;
+use ratatui::text::Text;
+
+use std::collections::{HashMap, HashSet};
+
 use crate::{
-    infrastructure::logging,
+    infrastructure::{garbage_collector, logging::Logger},
     log_on_error,
+    lore::{
+        lore_api_client::BlockingLoreAPIClient,
+        lore_session,
+        patch::{Author, Patch},
+    },
     ui::popup::{info_popup::InfoPopUp, PopUp},
 };
-use ansi_to_tui::IntoText;
-use color_eyre::eyre::bail;
+
 use config::Config;
 use cover_renderer::render_cover;
 use patch_renderer::{render_patch_preview, PatchRenderer};
-use ratatui::text::Text;
 use screens::{
     bookmarked::BookmarkedPatchsets,
     details_actions::{DetailsActions, PatchsetAction},
@@ -23,12 +31,6 @@ use screens::{
     mail_list::MailingListSelection,
     CurrentScreen,
 };
-use std::collections::{HashMap, HashSet};
-
-pub mod config;
-pub mod cover_renderer;
-pub mod patch_renderer;
-pub mod screens;
 
 /// Type that represents the overall state of the application. It can be viewed
 /// as the **Model** component of `patch-hub`.
@@ -80,7 +82,7 @@ impl App {
         // Initialize the logger before the app starts
         Logger::init_log_file(&config)?;
         Logger::info("patch-hub started");
-        logging::garbage_collector::collect_garbage(&config);
+        garbage_collector::collect_garbage(&config);
 
         Ok(App {
             current_screen: CurrentScreen::MailingListSelection,

src/app/screens/edit_config.rs

@@ -1,8 +1,9 @@
+use color_eyre::eyre::bail;
+use derive_getters::Getters;
+
 use std::{collections::HashMap, fmt::Display, path::Path};
 
 use crate::app::config::Config;
-use color_eyre::eyre::bail;
-use derive_getters::Getters;
 
 #[derive(Debug, Getters)]
 pub struct EditConfig {

src/handler/bookmarked.rs

@@ -1,15 +1,16 @@
+use ratatui::{
+    crossterm::event::{KeyCode, KeyEvent},
+    prelude::Backend,
+    Terminal,
+};
+
 use std::ops::ControlFlow;
 
 use crate::{
     app::{screens::CurrentScreen, App},
     loading_screen,
     ui::popup::{help::HelpPopUpBuilder, PopUp},
 };
-use ratatui::{
-    crossterm::event::{KeyCode, KeyEvent},
-    prelude::Backend,
-    Terminal,
-};
 
 pub fn handle_bookmarked_patchsets<B>(
     app: &mut App,

src/handler/edit_config.rs

@@ -1,8 +1,9 @@
+use ratatui::crossterm::event::{KeyCode, KeyEvent};
+
 use crate::{
     app::{screens::CurrentScreen, App},
     ui::popup::{help::HelpPopUpBuilder, PopUp},
 };
-use ratatui::crossterm::event::{KeyCode, KeyEvent};
 
 pub fn handle_edit_config(app: &mut App, key: KeyEvent) -> color_eyre::Result<()> {
     if let Some(edit_config_state) = app.edit_config.as_mut() {

src/handler/latest.rs

@@ -1,15 +1,16 @@
+use ratatui::{
+    crossterm::event::{KeyCode, KeyEvent},
+    prelude::Backend,
+    Terminal,
+};
+
 use std::ops::ControlFlow;
 
 use crate::{
     app::{screens::CurrentScreen, App},
     loading_screen,
     ui::popup::{help::HelpPopUpBuilder, PopUp},
 };
-use ratatui::{
-    crossterm::event::{KeyCode, KeyEvent},
-    prelude::Backend,
-    Terminal,
-};
 
 pub fn handle_latest_patchsets<B>(
     app: &mut App,

src/handler/mail_list.rs

@@ -1,15 +1,16 @@
+use ratatui::{
+    crossterm::event::{KeyCode, KeyEvent},
+    prelude::Backend,
+    Terminal,
+};
+
 use std::ops::ControlFlow;
 
 use crate::{
     app::{screens::CurrentScreen, App},
     loading_screen,
     ui::popup::{help::HelpPopUpBuilder, PopUp},
 };
-use ratatui::{
-    crossterm::event::{KeyCode, KeyEvent},
-    prelude::Backend,
-    Terminal,
-};
 
 pub fn handle_mailing_list_selection<B>(
     app: &mut App,

src/handler.rs renamed to src/handler/mod.rs

@@ -1,16 +1,25 @@
-pub mod bookmarked;
-pub mod details_actions;
-pub mod edit_config;
-pub mod latest;
-pub mod mail_list;
+mod bookmarked;
+mod details_actions;
+mod edit_config;
+mod latest;
+mod mail_list;
+
+use ratatui::{
+    crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind},
+    prelude::Backend,
+    Terminal,
+};
 
 use std::{
     ops::ControlFlow,
     time::{Duration, Instant},
 };
 
 use crate::{
-    app::screens::CurrentScreen, infrastructure::logging::Logger, loading_screen, ui::draw_ui, App,
+    app::{screens::CurrentScreen, App},
+    infrastructure::logging::Logger,
+    loading_screen,
+    ui::draw_ui,
 };
 
 use bookmarked::handle_bookmarked_patchsets;
@@ -19,11 +28,6 @@ use details_actions::handle_patchset_details;
 use edit_config::handle_edit_config;
 use latest::handle_latest_patchsets;
 use mail_list::handle_mailing_list_selection;
-use ratatui::{
-    crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind},
-    prelude::Backend,
-    Terminal,
-};
 
 fn key_handling<B>(
     mut terminal: Terminal<B>,

src/infrastructure/mod.rs

@@ -1,3 +1,5 @@
 pub mod errors;
 pub mod logging;
 pub mod terminal;
+
+pub use logging::garbage_collector;

src/lore/lore_api_client.rs

@@ -1,10 +1,10 @@
-use std::time::Duration;
-
 use mockall::automock;
 use thiserror::Error;
 use ureq::tls::TlsConfig;
 use ureq::Agent;
 
+use std::time::Duration;
+
 #[cfg(test)]
 mod tests;