wip: massive refactor of collection storage and layout

Author: wllfaria

.rustfmt.toml

@@ -0,0 +1,11 @@
+edition = "2021"
+unstable_features = true
+use_field_init_shorthand = true
+imports_granularity = "Module"
+group_imports = "StdExternalCrate"
+format_code_in_doc_comments = true
+reorder_impl_items = true
+single_line_let_else_max_width = 100
+single_line_if_else_max_width = 100
+max_width = 120
+

Cargo.lock

@@ -1,5 +1,13 @@
 [workspace]
-members = ["hac-config", "hac-core", "hac-client", "hac-colors", "hac-cli"]
+members = [
+    "hac-config",
+    "hac-core",
+    "hac-client",
+    "hac-colors",
+    "hac-cli",
+    "hac-store",
+    "hac-loader",
+]
 default-members = ["hac-client"]
 resolver = "2"
 
@@ -10,10 +18,12 @@ name = "hac"
 version = "0.2.0"
 
 [workspace.dependencies]
+hac-store = { path = "hac-store" }
 hac-config = { path = "hac-config" }
 hac-core = { path = "hac-core" }
 hac-colors = { path = "hac-colors" }
 hac-cli = { path = "hac-cli" }
+hac-loader = { path = "hac-loader" }
 
 anyhow = "1.0.81"
 crossterm = { version = "0.27.0", features = ["event-stream"] }

Cargo.toml

@@ -18,6 +18,8 @@ hac-core.workspace = true
 hac-config.workspace = true
 hac-colors.workspace = true
 hac-cli.workspace = true
+hac-loader.workspace = true
+hac-store.workspace = true
 
 anyhow.workspace = true
 crossterm.workspace = true

hac-client/Cargo.toml

@@ -1,4 +1,5 @@
-use hac_core::{collection::Collection, command::Command};
+use hac_core::command::Command;
+use hac_loader::collection_loader::CollectionMeta;
 
 use crate::event_pool::{Event, EventPool};
 use crate::pages::{Eventful, Renderable};
@@ -19,19 +20,13 @@ pub struct App<'app> {
 impl<'app> App<'app> {
     pub fn new(
         colors: &'app hac_colors::Colors,
-        collections: Vec<Collection>,
+        collections: Vec<CollectionMeta>,
         config: &'app hac_config::Config,
         dry_run: bool,
     ) -> anyhow::Result<Self> {
         let terminal = Terminal::new(CrosstermBackend::new(std::io::stdout()))?;
         Ok(Self {
-            screen_manager: ScreenManager::new(
-                terminal.size()?,
-                colors,
-                collections,
-                config,
-                dry_run,
-            )?,
+            screen_manager: ScreenManager::new(terminal.size()?, colors, collections, config, dry_run)?,
             event_pool: EventPool::new(60f64, 30f64),
             should_quit: false,
             terminal,
@@ -46,8 +41,7 @@ impl<'app> App<'app> {
 
         startup()?;
 
-        self.screen_manager
-            .register_command_handler(command_tx.clone())?;
+        self.screen_manager.register_command_handler(command_tx.clone())?;
 
         loop {
             {
@@ -74,9 +68,7 @@ impl<'app> App<'app> {
                         })?;
                     }
                     event => {
-                        if let Some(command) =
-                            self.screen_manager.handle_event(Some(event.clone()))?
-                        {
+                        if let Some(command) = self.screen_manager.handle_event(Some(event.clone()))? {
                             command_tx
                                 .send(command)
                                 .expect("failed to send command through channel")

hac-client/src/app.rs

@@ -1,9 +1,10 @@
 use hac_cli::RuntimeBehavior;
 use hac_client::app;
-use hac_core::collection::collection;
+use hac_core::collection;
 
 fn setup_tracing() -> anyhow::Result<tracing_appender::non_blocking::WorkerGuard> {
-    let (data_dir, logfile) = hac_config::log_file();
+    let logfile = hac_config::LOGFILE;
+    let data_dir = hac_loader::data_dir();
     let appender = tracing_appender::rolling::never(data_dir, logfile);
     let (writer, guard) = tracing_appender::non_blocking(appender);
     let subscriber = tracing_subscriber::FmtSubscriber::builder()
@@ -21,29 +22,30 @@ fn setup_tracing() -> anyhow::Result<tracing_appender::non_blocking::WorkerGuard
 async fn main() -> anyhow::Result<()> {
     let runtime_behavior = hac_cli::Cli::parse_args();
 
-    match runtime_behavior {
-        RuntimeBehavior::PrintConfigPath => hac_cli::Cli::print_config_path(
-            hac_config::get_config_dir_path(),
-            hac_config::get_usual_path(),
-        ),
-        RuntimeBehavior::PrintDataPath => {
-            hac_cli::Cli::print_data_path(hac_config::get_collections_dir())
-        }
-        RuntimeBehavior::DumpDefaultConfig => {
-            hac_cli::Cli::print_default_config(hac_config::default_as_str())
-        }
-        _ => {}
-    }
+    //match runtime_behavior {
+    //    RuntimeBehavior::PrintConfigPath => hac_cli::Cli::print_config_path(
+    //        hac_config::get_config_dir_path(),
+    //        hac_config::get_usual_path(),
+    //    ),
+    //    RuntimeBehavior::PrintDataPath => {
+    //        hac_cli::Cli::print_data_path(hac_config::get_collections_dir())
+    //    }
+    //    RuntimeBehavior::DumpDefaultConfig => {
+    //        hac_cli::Cli::print_default_config(hac_config::default_as_str())
+    //    }
+    //    _ => {}
+    //}
 
     let dry_run = runtime_behavior.eq(&RuntimeBehavior::DryRun);
 
     let _guard = setup_tracing()?;
-    hac_config::get_or_create_data_dir();
-    let config = hac_config::load_config();
+    hac_loader::get_or_create_data_dir();
+    hac_loader::get_or_create_collections_dir();
 
+    let collections = hac_loader::collection_loader::collections_metadata()?;
     let colors = hac_colors::Colors::default();
-    let mut collections = collection::get_collections_from_config()?;
-    collections.sort_by_key(|key| key.info.name.clone());
+    let config = hac_config::load_config();
+
     let mut app = app::App::new(&colors, collections, &config, dry_run)?;
     app.run().await?;