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

Additionally, `lore` was removed as public API. The discusison for this
can be found in kworkflow#128. And imports (of modules, external crates and std
create) now follow the recommended order.

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.

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,19 +1,28 @@
+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::{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 logging::Logger;
-use patch_hub::lore::{
-    lore_api_client::BlockingLoreAPIClient,
-    lore_session,
-    patch::{Author, Patch},
-};
 use patch_renderer::{render_patch_preview, PatchRenderer};
-use ratatui::text::Text;
 use screens::{
     bookmarked::BookmarkedPatchsets,
     details_actions::{DetailsActions, PatchsetAction},
@@ -22,15 +31,6 @@ use screens::{
     mail_list::MailingListSelection,
     CurrentScreen,
 };
-use std::collections::{HashMap, HashSet};
-
-use crate::utils;
-
-mod config;
-pub mod cover_renderer;
-pub mod logging;
-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`.
@@ -85,7 +85,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,
@@ -394,30 +394,30 @@ impl App {
     pub fn check_external_deps(&self) -> bool {
         let mut app_can_run = true;
 
-        if !utils::binary_exists("b4") {
+        if which::which("b4").is_err() {
             Logger::error("b4 is not installed, patchsets cannot be downloaded");
             app_can_run = false;
         }
 
-        if !utils::binary_exists("git") {
+        if which::which("git").is_err() {
             Logger::warn("git is not installed, send-email won't work");
         }
 
         match self.config.patch_renderer() {
             PatchRenderer::Bat => {
-                if !utils::binary_exists("bat") {
+                if which::which("bat").is_err() {
                     Logger::warn("bat is not installed, patch rendering will fallback to default");
                 }
             }
             PatchRenderer::Delta => {
-                if !utils::binary_exists("delta") {
+                if which::which("delta").is_err() {
                     Logger::warn(
                         "delta is not installed, patch rendering will fallback to default",
                     );
                 }
             }
             PatchRenderer::DiffSoFancy => {
-                if !utils::binary_exists("diff-so-fancy") {
+                if which::which("diff-so-fancy").is_err() {
                     Logger::warn(
                         "diff-so-fancy is not installed, patch rendering will fallback to default",
                     );

src/app/screens/bookmarked.rs

@@ -1,4 +1,4 @@
-use patch_hub::lore::patch::Patch;
+use crate::lore::patch::Patch;
 
 pub struct BookmarkedPatchsets {
     pub bookmarked_patchsets: Vec<Patch>,

src/app/screens/details_actions.rs

@@ -1,16 +1,23 @@
-use crate::app::config::{Config, KernelTree};
-
-use super::CurrentScreen;
-use ::patch_hub::lore::{lore_api_client::BlockingLoreAPIClient, lore_session, patch::Patch};
 use color_eyre::eyre::{bail, eyre};
-use patch_hub::lore::patch::Author;
 use ratatui::text::Text;
+
 use std::{
     collections::{HashMap, HashSet},
     path::Path,
     process::Command,
 };
 
+use crate::{
+    app::config::{Config, KernelTree},
+    lore::{
+        lore_api_client::BlockingLoreAPIClient,
+        lore_session,
+        patch::{Author, Patch},
+    },
+};
+
+use super::CurrentScreen;
+
 pub struct DetailsActions {
     pub representative_patch: Patch,
     /// Raw patches as plain text files

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/app/screens/latest.rs

@@ -1,6 +1,7 @@
 use color_eyre::eyre::bail;
 use derive_getters::Getters;
-use patch_hub::lore::{
+
+use crate::lore::{
     lore_api_client::{BlockingLoreAPIClient, ClientError},
     lore_session::{LoreSession, LoreSessionError},
     patch::Patch,

src/app/screens/mail_list.rs

@@ -1,5 +1,6 @@
 use color_eyre::eyre::bail;
-use patch_hub::lore::{
+
+use crate::lore::{
     lore_api_client::BlockingLoreAPIClient, lore_session, mailing_list::MailingList,
 };
 

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,