From fdc912f806d3f8cb2528ca7a82a1633e80eedb7e Mon Sep 17 00:00:00 2001
From: theMackabu <theMackabu@gmail.com>
Date: Sun, 24 Nov 2024 22:17:29 -0800
Subject: [PATCH] remove redundant files
---
maid/client/helpers/mod.rs | 1 -
maid/client/main.rs | 1 -
maid/client/{helpers => server}/logger.rs | 0
maid/client/server/mod.rs | 9 ++++----
maid/server/helpers/logger.rs | 25 -----------------------
maid/server/helpers/mod.rs | 1 -
6 files changed, 5 insertions(+), 32 deletions(-)
delete mode 100644 maid/client/helpers/mod.rs
rename maid/client/{helpers => server}/logger.rs (100%)
delete mode 100644 maid/server/helpers/logger.rs
diff --git a/maid/client/helpers/mod.rs b/maid/client/helpers/mod.rs
deleted file mode 100644
index cbcf28e..0000000
--- a/maid/client/helpers/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub(crate) mod logger;
diff --git a/maid/client/main.rs b/maid/client/main.rs
index f493e1a..4c7f0ed 100644
--- a/maid/client/main.rs
+++ b/maid/client/main.rs
@@ -1,6 +1,5 @@
mod cli;
mod globals;
-mod helpers;
mod parse;
mod server;
mod shell;
diff --git a/maid/client/helpers/logger.rs b/maid/client/server/logger.rs
similarity index 100%
rename from maid/client/helpers/logger.rs
rename to maid/client/server/logger.rs
diff --git a/maid/client/server/mod.rs b/maid/client/server/mod.rs
index b0a1e38..fa04cc0 100644
--- a/maid/client/server/mod.rs
+++ b/maid/client/server/mod.rs
@@ -1,4 +1,5 @@
-pub mod api;
-pub mod cli;
-pub mod file;
-pub mod parse;
+pub(crate) mod api;
+pub(crate) mod cli;
+pub(crate) mod file;
+pub(crate) mod logger;
+pub(crate) mod parse;
diff --git a/maid/server/helpers/logger.rs b/maid/server/helpers/logger.rs
deleted file mode 100644
index 992efb1..0000000
--- a/maid/server/helpers/logger.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#[macro_export]
-macro_rules! log {
- ($level:expr, $($arg:tt)*) => {
- let level_colors: std::collections::HashMap<&str, (&str, &str)> = [
- ("fatal", ("FATAL", "bright red")),
- ("error", ("ERROR", "red")),
- ("warning", ("WARN", "yellow")),
- ("success", ("SUCCESS", "green")),
- ("notice", ("NOTICE", "bright blue")),
- ("info", ("INFO", "cyan")),
- ("debug", ("DEBUG", "magenta")),
- ]
- .iter()
- .cloned()
- .collect();
-
- match level_colors.get($level) {
- Some((level_text, color_func)) => {
- let level_text = level_text.color(color_func.to_string());
- println!("{} {}", level_text, format_args!($($arg)*).to_string())
- }
- None => println!("Unknown log level: {}", $level),
- }
- };
-}
diff --git a/maid/server/helpers/mod.rs b/maid/server/helpers/mod.rs
index fb8c6f9..62f120c 100644
--- a/maid/server/helpers/mod.rs
+++ b/maid/server/helpers/mod.rs
@@ -1,3 +1,2 @@
pub mod format;
-pub mod logger;
pub mod os;
--
GitLab