refactor(main): improve structure

importantimport · Oct 28, 2024 · f35ba58 · f35ba58
1 parent f7a9afa
commit f35ba58
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 42 deletions.
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
@@ -0,0 +1,3 @@
+mod run;
+
+pub use run::run;
diff --git a/src/run.rs → src/commands/run.rs b/src/run.rs → src/commands/run.rs
diff --git a/src/main.rs b/src/main.rs
@@ -6,49 +6,12 @@ use clap::{Parser, Subcommand};
 use hatsu_utils::AppError;
 use human_panic::{metadata, setup_panic};
 
-mod run;
-
-pub const fn get_styles() -> clap::builder::Styles {
-    clap::builder::Styles::styled()
-        .usage(
-            anstyle::Style::new()
-                .bold()
-                .underline()
-                .fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::BrightCyan))),
-        )
-        .header(
-            anstyle::Style::new()
-                .bold()
-                .underline()
-                .fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::BrightCyan))),
-        )
-        .literal(
-            anstyle::Style::new().fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Magenta))),
-        )
-        .invalid(
-            anstyle::Style::new()
-                .bold()
-                .fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Red))),
-        )
-        .error(
-            anstyle::Style::new()
-                .bold()
-                .fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Red))),
-        )
-        .valid(
-            anstyle::Style::new()
-                .bold()
-                .underline()
-                .fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Magenta))),
-        )
-        .placeholder(
-            anstyle::Style::new().fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::White))),
-        )
-}
+mod commands;
+mod utils;
 
 #[derive(Debug, Parser)]
 #[command(
-    styles = get_styles(),
+    styles = utils::styles(),
     name = "hatsu",
     version = hatsu_utils::VERSION,
     about,
@@ -71,9 +34,9 @@ async fn main() -> Result<(), AppError> {
 
     if let Some(command) = args.command {
         match command {
-            Commands::Run => run::run().await,
+            Commands::Run => commands::run().await,
         }
     } else {
-        run::run().await
+        commands::run().await
     }
 }
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -0,0 +1,3 @@
+mod styles;
+
+pub use styles::styles;
diff --git a/src/utils/styles.rs b/src/utils/styles.rs
@@ -0,0 +1,37 @@
+use anstyle::{AnsiColor, Color, Style};
+use clap::builder::Styles;
+
+#[must_use]
+pub const fn styles() -> Styles {
+    Styles::styled()
+        .usage(
+            Style::new()
+                .bold()
+                .underline()
+                .fg_color(Some(Color::Ansi(AnsiColor::BrightCyan))),
+        )
+        .header(
+            Style::new()
+                .bold()
+                .underline()
+                .fg_color(Some(Color::Ansi(AnsiColor::BrightCyan))),
+        )
+        .literal(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Magenta))))
+        .invalid(
+            Style::new()
+                .bold()
+                .fg_color(Some(Color::Ansi(AnsiColor::Red))),
+        )
+        .error(
+            Style::new()
+                .bold()
+                .fg_color(Some(Color::Ansi(AnsiColor::Red))),
+        )
+        .valid(
+            Style::new()
+                .bold()
+                .underline()
+                .fg_color(Some(Color::Ansi(AnsiColor::Magenta))),
+        )
+        .placeholder(Style::new().fg_color(Some(Color::Ansi(AnsiColor::White))))
+}