refactor: strict types & improve performance

Signed-off-by: The1111mp <[email protected]>

Author: 1111mp

Cargo.lock

@@ -9,12 +9,12 @@ authors = ["[email protected]"]
 [dependencies]
 anyhow = "1.0"
 cfg-if = "1.0"
-chrono = "0.4"
 clap = { version = "4.5", features = ["derive"] }
 dirs = "5.0"
 fs_extra = "1.3"
 lazy_static = "1"
 regex = "1.10"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+time = { version = "0.3", features = ["local-offset"] }
 version-compare = "0.2"

Cargo.toml

@@ -1,11 +1,8 @@
-use anyhow::{bail, Context, Result};
-#[cfg(windows)]
-use fs_extra::file::{copy, CopyOptions};
-use fs_extra::file::{read_to_string, remove};
+use anyhow::{Context, Result};
+use fs_extra::file::read_to_string;
 use lazy_static::lazy_static;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::{from_str, Value};
-use std::{collections::HashMap, env, ffi::OsString, fs, path::PathBuf};
+use std::{env, ffi::OsString, path::PathBuf};
 
 lazy_static! {
     pub static ref NVMD_PATH: Option<PathBuf> = get_nvmd_path().ok();
@@ -50,13 +47,13 @@ fn get_installation_path() -> Result<Option<PathBuf>> {
 
         let json_obj: Value = from_str(&setting_content)?;
         if let Some(directory) = json_obj["directory"].as_str() {
-            Ok(Some(PathBuf::from(directory)))
+            return Ok(Some(PathBuf::from(directory)));
         } else {
-            Ok(DEFAULT_INSTALLATION_PATH.clone())
+            return Ok(DEFAULT_INSTALLATION_PATH.clone());
         }
-    } else {
-        Ok(None)
     }
+
+    Ok(None)
 }
 
 fn get_default_installation_path() -> Option<PathBuf> {
@@ -105,132 +102,3 @@ fn get_nvmd_path() -> Result<PathBuf> {
     home.push(".nvmd");
     Ok(home)
 }
-
-pub fn package_can_be_removed(name: &String) -> Result<bool> {
-    if let Some(mut packages_path) = NVMD_PATH.clone() {
-        packages_path.push("packages.json");
-        let packages = read_json::<Packages>(&packages_path)?;
-        if packages.is_empty() {
-            return Ok(true);
-        }
-        if let Some(package) = packages.get(name) {
-            if package.is_empty() {
-                return Ok(true);
-            }
-
-            if package.len() == 1 && package.contains(&VERSION.clone().unwrap()) {
-                return Ok(true);
-            }
-        }
-        return Ok(true);
-    }
-    Ok(true)
-}
-
-#[derive(Debug, Default, Clone, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Project {
-    /// is it active
-    pub active: bool,
-
-    /// project name
-    pub name: String,
-
-    /// project path
-    pub path: String,
-
-    /// the node version of project used
-    pub version: Option<String>,
-
-    /// create date
-    pub create_at: Option<String>,
-
-    /// update date
-    pub update_at: Option<String>,
-}
-
-pub type Packages = HashMap<String, Vec<String>>;
-
-pub fn read_json<T: DeserializeOwned>(path: &PathBuf) -> Result<T> {
-    if !path.exists() {
-        bail!("file not found \"{}\"", path.display());
-    }
-
-    let json_str = fs::read_to_string(path)
-        .with_context(|| format!("failed to read the file \"{}\"", path.display()))?;
-
-    serde_json::from_str::<T>(&json_str).with_context(|| {
-        format!(
-            "failed to read the file with json format \"{}\"",
-            path.display()
-        )
-    })
-}
-
-#[cfg(unix)]
-pub fn link_package(name: &str) -> Result<()> {
-    use std::os::unix::fs;
-    if let Some(path) = NVMD_PATH.clone() {
-        let mut source = path.clone();
-        source.push("bin");
-        source.push("nvmd");
-        let mut alias = path.clone();
-        alias.push("bin");
-        alias.push(name);
-
-        fs::symlink(source, alias)?;
-    }
-    Ok(())
-}
-
-#[cfg(windows)]
-pub fn link_package(name: &str) -> Result<()> {
-    if let Some(path) = NVMD_PATH.clone() {
-        let mut exe_source = path.clone();
-        exe_source.push("bin");
-        exe_source.push("nvmd.exe");
-        let mut cmd_source = path.clone();
-        cmd_source.push("bin");
-        cmd_source.push("npm.cmd");
-
-        let mut exe_alias = path.clone();
-        exe_alias.push("bin");
-        exe_alias.push(format!("{}.exe", name));
-        let mut cmd_alias = path.clone();
-        cmd_alias.push("bin");
-        cmd_alias.push(format!("{}.cmd", name));
-
-        let mut options = CopyOptions::new();
-        options.skip_exist = true;
-        copy(&exe_source, &exe_alias, &options)?;
-        copy(&cmd_source, &cmd_alias, &options)?;
-    }
-    Ok(())
-}
-
-#[cfg(unix)]
-pub fn unlink_package(name: &str) -> Result<()> {
-    if let Some(mut alias) = NVMD_PATH.clone() {
-        alias.push("bin");
-        alias.push(name);
-
-        remove(alias)?;
-    }
-    Ok(())
-}
-
-#[cfg(windows)]
-pub fn unlink_package(name: &str) -> Result<()> {
-    if let Some(path) = NVMD_PATH.clone() {
-        let mut exe_alias = path.clone();
-        exe_alias.push("bin");
-        exe_alias.push(format!("{}.exe", name));
-        let mut cmd_alias = path.clone();
-        cmd_alias.push("bin");
-        cmd_alias.push(format!("{}.cmd", name));
-
-        remove(exe_alias)?;
-        remove(cmd_alias)?;
-    }
-    Ok(())
-}

src/common.rs

@@ -1,14 +1,16 @@
 use super::Result;
 use super::{ExitStatus, OsStr, OsString};
 
-use anyhow::bail;
-use lazy_static::lazy_static;
-
+use crate::utils::help::{link_package, unlink_package};
+use crate::utils::package::package_can_be_removed;
 use crate::{
     command as CommandTool,
-    common::{link_package, package_can_be_removed, unlink_package, ENV_PATH, VERSION},
+    common::{ENV_PATH, VERSION},
 };
 
+use anyhow::bail;
+use lazy_static::lazy_static;
+
 lazy_static! {
     static ref ENABLE: OsString = OsString::from("enable");
     static ref DISABLE: OsString = OsString::from("disable");