feat: 去掉 cli config

crates/nsv/src/cli/mod.rs

@@ -1,7 +1,6 @@
 use clap::Parser;
 
 use crate::command::Commands;
-use crate::config::NsvConfig;
 
 
 
@@ -10,9 +9,6 @@ use crate::config::NsvConfig;
 pub struct Cli {
     // pub core: NsvCore,
 
-    #[clap(flatten)]
-    pub config: NsvConfig,
-
     #[clap(subcommand)]
     pub subcmd: Commands,
 }

crates/nsv/src/command/add.rs

@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use root::core::{node::NsvCoreError, NsvCore};
 
 use super::Command;
-use crate::{config::NsvConfig, print_log_1};
+use crate::{ print_log_1};
 use root::core::add::AddVersion;
 use thiserror::Error;
 
@@ -13,7 +13,7 @@ pub struct Add {
 
 #[async_trait]
 impl Command for Add {
-    async fn apply(&self, _config: &NsvConfig, core: &mut NsvCore) -> Result<(), NsvCoreError> {
+    async fn apply(&self, core: &mut NsvCore) -> Result<(), NsvCoreError> {
 
         core.add_version(self.version.clone()).await?;
 

crates/nsv/src/command/mod.rs

@@ -5,7 +5,7 @@ use r#use::Use;
 use root::core::{NsvCore, node::NsvCoreError};
 use add::Add;
 
-use crate::{config::NsvConfig, print_log_err};
+use crate::{print_log_err};
 
 #[derive(clap::Parser, Debug)]
 pub enum Commands {
@@ -18,28 +18,28 @@ pub enum Commands {
     Add(Add),
 }
 impl Commands {
-    pub async fn call(&self, config: NsvConfig, core: &mut NsvCore) {
+    pub async fn call(&self, core: &mut NsvCore) {
         match self {
-            Self::Use(cmd) => cmd.call(config, core).await,
-            Self::Add(cmd) => cmd.call(config, core).await,
+            Self::Use(cmd) => cmd.call( core).await,
+            Self::Add(cmd) => cmd.call( core).await,
         }
     }
 }
 
 #[async_trait]
 pub trait Command {
-    async fn call(&self, config: NsvConfig, core: &mut NsvCore) {
-        match self.apply(&config, core).await {
+    async fn call(&self, core: &mut NsvCore) {
+        match self.apply(core).await {
             Ok(()) => (),
-            Err(err) => self.handle_err(err, &config, core),
+            Err(err) => self.handle_err(err, core),
         }
     }
 
-    async fn apply(&self, config: &NsvConfig, core: &mut NsvCore) -> Result<(), NsvCoreError>;
+    async fn apply(&self, core: &mut NsvCore) -> Result<(), NsvCoreError>;
 
-    fn handle_err(&self, err: NsvCoreError, config: &NsvConfig, core: &mut NsvCore) {
+    fn handle_err(&self, err: NsvCoreError, core: &mut NsvCore) {
         let err_s = format!("{:?}", err);
-        print_log_err!("{}.\nconfig: {:?} \ncontext: {:?}", err_s, config, core.context);
+        print_log_err!("{}.\ncontext: {:?}", err_s, core.context);
         std::process::exit(1);
     }
 }

crates/nsv/src/command/use.rs

@@ -1,7 +1,6 @@
 use async_trait::async_trait;
 use root::core::{NsvCore, r#use::UseVersion, node::NsvCoreError};
 
-use crate::config::NsvConfig;
 use thiserror::Error;
 
 use super::Command;
@@ -14,7 +13,7 @@ pub struct Use {
 
 #[async_trait]
 impl Command for Use {
-    async fn apply(&self, _config: &NsvConfig, core: &mut NsvCore) -> Result<(), NsvCoreError> {
+    async fn apply(&self, core: &mut NsvCore) -> Result<(), NsvCoreError> {
         if let Err(err) = core.use_version(self.version.clone()).await {
             println!("err1: {:?}", err)
         }

crates/nsv/src/config/mod.rs

@@ -1,28 +0,0 @@
-use url::Url;
-
-#[derive(clap::Parser, Debug)]
-pub struct NsvConfig {
-
-    // /// 标签
-    // #[clap(
-    //     long,
-    //     env = "TARGET",
-    //     short = 't',
-    //     hide_env_values = true,
-    //     value_parser = ["lts", "current", "latest"],
-    // )]
-    // pub target: String,
-
-    /// 下载node源地址
-    #[clap(
-        long,
-        env = "ORIGIN",
-        default_value = "https://nodejs.org/dist",
-        global = true,
-        hide_env_values = true,
-        short = 'o',
-    )]
-    pub origin: Url,
-
-
-}

crates/nsv/src/main.rs

@@ -17,5 +17,5 @@ async fn main() {
 
     let mut nsv_core = NsvCore::build(config);
     nsv_core.init().await;
-    cli.subcmd.call(cli.config, &mut nsv_core).await
+    cli.subcmd.call(&mut nsv_core).await
 }

crates/root/src/config/mod.rs

@@ -2,7 +2,7 @@
 #[derive(Debug, Clone)]
 pub struct Config {
     pub origin: &'static str,
-    // pub version: String,
+
 }
 
 impl Config {

crates/root/src/core/node.rs

@@ -142,7 +142,8 @@ pub trait NodeVersion {
 
 #[async_trait]
 impl NodeVersion for NsvCore {
-    async fn unzip_node_item(&self, node_item: &NodeVersionItem) -> Result<(), NsvCoreError> {
+
+      async fn unzip_node_item(&self, node_item: &NodeVersionItem) -> Result<(), NsvCoreError> {
         let node_file_dir = self.get_node_file_path(node_item);
 
         if !node_file_dir.exists() {
@@ -170,6 +171,7 @@ impl NodeVersion for NsvCore {
 
         Ok(())
     }
+
     async fn vail_and_download_file(&self, node_item: &NodeVersionItem) -> bool {
         let local_node_item_dir = self.get_node_file_path(node_item);
         if !local_node_item_dir.exists() {

crates/root/src/lib.rs

@@ -3,3 +3,4 @@ pub mod util;
 pub mod core;
 pub mod config;
 pub mod context;
+pub mod node;