refactor: add log proxy, and with_kv field to OmaFormatter

Author: NotEvenANeko

oma-console/src/print.rs

@@ -138,25 +138,29 @@ fn term_color<D>(input: D, color: Action) -> StyledObject<D> {
 ///
 /// # Example:
 /// ```
-/// use spdlog::{info, sink::StdStreamSink, Logger};
+/// use spdlog::{info, sink::StdStreamSink, Logger, Result};
 /// use oma_console::OmaLayer;
 ///
-/// let mut logger_builder = Logger::builder();
+/// fn main() -> Result<()> {
+///   let mut logger_builder = Logger::builder();
 ///
-/// let logger = logger_builder.sink(Arc::new(
-///     StdStreamSink::builder().formatter(Box::new(OmaLayer::default())).build().unwrap()
-/// )).build().unwrap();
+///   let logger = logger_builder.sink(Arc::new(
+///       StdStreamSink::builder().formatter(Box::new(OmaLayer::default())).build()?
+///   )).build()?;
 ///
-/// spdlog::set_default_logger(Arc::new(logger));
+///   spdlog::set_default_logger(Arc::new(logger));
 ///
-/// info!("My name is oma!");
+///   info!("My name is oma!");
+/// }
 /// ```
 ///
 #[derive(Clone)]
 pub struct OmaFormatter {
     with_ansi: bool,
     with_time: bool,
     with_file: bool,
+    #[allow(unused)]
+    with_kv: bool,
     prefix_len: u16,
 }
 
@@ -166,6 +170,7 @@ impl Default for OmaFormatter {
             with_ansi: true,
             with_file: false,
             with_time: false,
+            with_kv: false,
             prefix_len: 10,
         }
     }
@@ -194,6 +199,12 @@ impl OmaFormatter {
         self
     }
 
+    #[allow(unused)]
+    pub fn with_kv(mut self, with_kv: bool) -> Self {
+        self.with_kv = with_kv;
+        self
+    }
+
     fn format_impl(
         &self,
         record: &spdlog::Record,

src/main.rs

@@ -39,7 +39,9 @@ use reqwest::Client;
 use rustix::stdio::stdout;
 // FIXME: `spdlog::error` is conflict with `mod error`
 use spdlog::{
-    Level, LevelFilter, Logger, debug, default_logger, error as error2, info, set_default_logger,
+    Level, LevelFilter, Logger, debug, default_logger, info, init_log_crate_proxy,
+    prelude::error,
+    set_default_logger,
     sink::{AsyncPoolSink, RotatingFileSink, RotationPolicy, StdStreamSink},
     warn,
 };
@@ -296,9 +298,9 @@ fn init_logger(
             .expect("Failed to get state dir")
             .join("oma")
     })
-    .join("oma.log")
-    .to_string_lossy()
-    .to_string();
+    .join("oma.log");
+
+    // TODO: We need `spdlog-rs` implements `EnvFilter` first
 
     let (level_filter, formatter) = if !debug && !dry_run {
         let level_filter = LevelFilter::MoreSevereEqual(Level::Info);
@@ -348,6 +350,7 @@ fn init_logger(
     let logger = logger_builder.build().unwrap();
 
     set_default_logger(Arc::new(logger));
+    init_log_crate_proxy()?;
 
     (Some(default_logger()), Ok(log_file))
 }