优化日志的注册逻辑

crates/cli/src/execute_cli.rs

@@ -1,12 +1,14 @@
 use std::env::current_exe;
+use std::{fs, ops::Not};
 
+use clap::CommandFactory;
+use colored::*;
 use snm_config::snm_config::SnmConfig;
 use snm_pm::pm::PackageManager;
 use snm_utils::exec::exec_cli;
 use tracing::trace;
 
 use crate::cli::SnmCli;
-use crate::fig::fig_spec_impl;
 use crate::manage_command::NodeManageCommands;
 use crate::snm_command::SnmCommands;
 
@@ -51,39 +53,95 @@ pub async fn execute_cli(cli: SnmCli, snm_config: SnmConfig) -> anyhow::Result<(
       exec_cli(&commands, &vec![], false)?;
     }
 
-    SnmCommands::FigSpec => {
-      fig_spec_impl()?;
-    }
     SnmCommands::SetUp => {
-      let exe = current_exe()?;
-      let exe_dir = exe.parent().unwrap();
-
-      const SHIM_TARGETS: &[&str] = &["npm", "npx", "yarn", "pnpm", "pnpx", "node"];
-
-      #[cfg(windows)]
-      let source = exe_dir.join("snm-shim.exe");
-      #[cfg(not(windows))]
-      let source = exe_dir.join("snm-shim");
-
-      // let source = exe_dir.join("snm-shim");
-      for target in SHIM_TARGETS {
-        // let target = exe_dir.join(target);
-        #[cfg(windows)]
-        let target = exe_dir.join(format!("{}.exe", target));
-        #[cfg(not(windows))]
-        let target = exe_dir.join(target);
-        if target.try_exists()? {
-          std::fs::remove_file(&target)?;
-        }
-        #[cfg(unix)]
-        {
-          std::os::unix::fs::symlink(&source, &target)?;
-        }
-        #[cfg(windows)]
-        {
-          std::os::windows::fs::symlink_file(&source, &target)?;
-        }
-      }
+      setup_fig()?;
+      setup_symlink()?;
+    }
+  }
+
+  Ok(())
+}
+
+fn setup_fig() -> anyhow::Result<()> {
+  let mut output = Vec::new();
+  clap_complete::generate(
+    clap_complete_fig::Fig,
+    &mut SnmCli::command(),
+    "snm",
+    &mut output,
+  );
+  let mut output_string = String::from_utf8(output).unwrap();
+
+  output_string = output_string.replace("const completion: Fig.Spec = {", "const completion = {");
+
+  if let Some(home) = dirs::home_dir() {
+    let dir = home.join(".fig").join("autocomplete").join("build");
+
+    if dir.exists().not() {
+      fs::create_dir_all(&dir)
+        .expect(format!("fig_spec_impl create_dir_all error {:?}", &dir.display()).as_str());
+    }
+
+    let spec_path_buf = dir.join("snm.js");
+
+    if spec_path_buf.exists() {
+      fs::remove_file(&spec_path_buf).expect(
+        format!(
+          "fig_spec_impl remove_file error {:?}",
+          &spec_path_buf.display()
+        )
+        .as_str(),
+      );
+    }
+
+    fs::write(&spec_path_buf, &output_string)?;
+
+    let message = format!(
+      r##"
+    🎉 Fig spec file create successful. 
+
+    🔔 Now ! Fig rename to {}
+
+                                    {}
+            "##,
+      "Amazon Q".green().bold(),
+      "Powered by snm".bright_black(),
+    );
+
+    eprintln!("{message}");
+  }
+
+  Ok(())
+}
+
+fn setup_symlink() -> anyhow::Result<()> {
+  let exe = current_exe()?;
+  let exe_dir = exe.parent().unwrap();
+
+  const SHIM_TARGETS: &[&str] = &["npm", "npx", "yarn", "pnpm", "pnpx", "node"];
+
+  #[cfg(windows)]
+  let source = exe_dir.join("snm-shim.exe");
+  #[cfg(not(windows))]
+  let source = exe_dir.join("snm-shim");
+
+  // let source = exe_dir.join("snm-shim");
+  for target in SHIM_TARGETS {
+    // let target = exe_dir.join(target);
+    #[cfg(windows)]
+    let target = exe_dir.join(format!("{}.exe", target));
+    #[cfg(not(windows))]
+    let target = exe_dir.join(target);
+    if target.try_exists()? {
+      std::fs::remove_file(&target)?;
+    }
+    #[cfg(unix)]
+    {
+      std::os::unix::fs::symlink(&source, &target)?;
+    }
+    #[cfg(windows)]
+    {
+      std::os::windows::fs::symlink_file(&source, &target)?;
     }
   }
 

crates/cli/src/main.rs

@@ -3,33 +3,17 @@ use std::env::current_dir;
 use clap::Parser;
 use cli::SnmCli;
 use snm_config::snm_config::SnmConfig;
-use snm_utils::consts::SNM_PREFIX;
+use snm_utils::{consts::SNM_PREFIX, log::init_snm_log};
 use tracing::trace;
-use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
 
 mod cli;
 mod execute_cli;
-mod fig;
 mod manage_command;
 mod snm_command;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-  if let Some(home) = dirs::home_dir() {
-    let file = std::fs::File::create(home.join("snm.log"))?;
-
-    let file_layer = fmt::layer()
-      .with_writer(file)
-      .with_filter(EnvFilter::from_env("SNM_LOG"));
-
-    // 创建控制台写入器
-    let stdout_layer = fmt::layer().with_filter(EnvFilter::from_env("SNM_LOG"));
-
-    tracing_subscriber::registry()
-      .with(file_layer)
-      .with(stdout_layer)
-      .try_init()?;
-  }
+  init_snm_log()?;
 
   trace!("Start snm");
 

crates/cli/src/snm_command.rs

@@ -13,10 +13,6 @@ pub enum SnmCommands {
   )]
   Install(InstallArgs),
 
-  // #[command(about = "Alias to snm install --frozen-lockfile.")]
-  // C(InstallArgs),
-  // #[command(about = "Add a package and any packages that it depends on.")]
-  // Add(AddArgs),
   #[command(
     visible_aliases=["un"],
     about = "Remove a package.",
@@ -26,23 +22,12 @@ pub enum SnmCommands {
   #[command(about = "Run a command.")]
   Run(RunArgs),
 
-  // #[command(about = "Hot load a package, and runs whatever default command binary it exposes..")]
-  // X(XArgs),
-
-  // #[command(about = "Run a command from a local package.")]
-  // E(EArgs),
-
-  // #[command(about = "Run some script.")]
-  // R(RArgs),
   #[command(about = "Manage node versions.")]
   Node {
     #[command(subcommand)]
     command: NodeManageCommands,
   },
 
-  #[command(about = "write fig spec to autocomplete build directory.")]
-  FigSpec,
-
   #[command(name = "setup", about = "Setup snm.")]
   SetUp,
 }

crates/snm_shim/src/main.rs

@@ -4,29 +4,14 @@ use anyhow::bail;
 use node_shim::load_node;
 use pm_shim::load_pm;
 use snm_config::snm_config::SnmConfig;
-use snm_utils::{consts::SNM_PREFIX, trace_if};
+use snm_utils::{consts::SNM_PREFIX, log::init_snm_log, trace_if};
 use tracing::trace;
-use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
 mod node_shim;
 mod pm_shim;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-  if let Some(home) = dirs::home_dir() {
-    let file = std::fs::File::create(home.join("snm_shim.log"))?;
-
-    let file_layer = fmt::layer()
-      .with_writer(file)
-      .with_filter(EnvFilter::from_env("SNM_LOG"));
-
-    // 创建控制台写入器
-    let stdout_layer = fmt::layer().with_filter(EnvFilter::from_env("SNM_LOG"));
-
-    tracing_subscriber::registry()
-      .with(file_layer)
-      .with(stdout_layer)
-      .try_init()?;
-  }
+  init_snm_log()?;
 
   trace!("Start snm_shim");
 

crates/snm_utils/Cargo.toml

@@ -19,8 +19,10 @@ serde_json   = "1.0.114"
 tar          = "0.4.40"
 termcolor    = "1.4.1"
 thiserror    = "1.0.58"
-tracing      = { workspace = true }
 wait-timeout = { workspace = true }
 which        = { workspace = true }
 xz2          = { version = "0.1.7", features = ["static"] }
 zip          = "2.1.3"
+dirs         = { workspace = true }
+tracing      = { workspace = true }
+tracing-subscriber = { workspace = true }

crates/snm_utils/src/log.rs

@@ -1,3 +1,5 @@
+use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
+
 #[macro_export]
 macro_rules! trace_if {
     // 闭包形式，直接执行闭包内的代码
@@ -13,3 +15,22 @@ macro_rules! trace_if {
         }
     };
 }
+
+pub fn init_snm_log() -> anyhow::Result<()> {
+  if let Some(home) = dirs::home_dir() {
+    let file = std::fs::File::create(home.join("snm.log"))?;
+
+    let file_layer = fmt::layer()
+      .with_writer(file)
+      .with_filter(EnvFilter::from_env("SNM_LOG"));
+
+    // 创建控制台写入器
+    let stdout_layer = fmt::layer().with_filter(EnvFilter::from_env("SNM_LOG"));
+
+    tracing_subscriber::registry()
+      .with(file_layer)
+      .with(stdout_layer)
+      .try_init()?;
+  }
+  Ok(())
+}