feat(arg,deps): fixed spinner on conflict detect // subcommand to che…

…ck for installed pkgs

src/commands/list.rs

@@ -0,0 +1,29 @@
+use crate::engine::dirs;
+use std::fs;
+use std::io;
+use std::path::Path;
+use std::sync::Arc;
+
+pub fn print_installed_pkgs() -> Result<(), anyhow::Error> {
+    let installed_pkgs = get_installed_pkgs()?;
+    for pkg in installed_pkgs.iter() {
+        println!("{}", pkg);
+    }
+    Ok(())
+}
+
+fn get_installed_pkgs() -> Result<Arc<Vec<String>>, io::Error> {
+    let bin_dir: &Path = dirs::HYSP_BIN_DIR.as_ref();
+    let mut binaries = Vec::new();
+
+    if let Ok(entries) = fs::read_dir(bin_dir) {
+        for entry in entries {
+            if let Ok(entry) = entry {
+                if let Some(file_name) = entry.file_name().to_str() {
+                    binaries.push(file_name.to_string());
+                }
+            }
+        }
+    }
+    Ok(Arc::new(binaries))
+}

src/commands/mod.rs

@@ -1,4 +1,5 @@
 pub mod install;
+pub mod list;
 pub mod search;
 pub mod uninstall;
 

src/engine/args.rs

@@ -1,7 +1,7 @@
 use crate::engine::show_splashes;
 use clap::{Args, Parser, Subcommand};
 
-/// The SEREN CLI.
+/// The HYSP CLI.
 #[derive(Parser)]
 #[command(author, version, about = show_splashes(), long_about = show_splashes())]
 #[command(propagate_version = true)]
@@ -24,6 +24,10 @@ pub enum CommandChoice {
     #[clap(name = "remove")]
     Remove(RemoveArgs),
 
+    /// List installed pkgs
+    #[clap(name = "list")]
+    List,
+
     /// Search a package
     #[command(arg_required_else_help = true)]
     #[clap(name = "search")]

src/engine/dirs.rs

@@ -1,23 +1,37 @@
-use lazy_static::lazy_static;
 use std::env;
+use std::fs;
 use std::path::PathBuf;
 
-pub fn get_xdg_path(key: &str, default: &str) -> PathBuf {
-    match env::var(key) {
-        Ok(val) => PathBuf::from(val),
-        Err(_) => {
-            let xdg_home = env::var("XDG_DATA_HOME").unwrap_or_else(|_| {
-                format!("{}/.local/share", env::var("HOME").unwrap_or_default())
-            });
-            PathBuf::from(format!("{}/{}", xdg_home, default))
-        }
-    }
+lazy_static::lazy_static! {
+    pub static ref HYSP_HOME_DIR: PathBuf = {
+        let hysp_home = match env::var("HYSP_HOME_DIR") {
+            Ok(val) => PathBuf::from(val),
+            Err(_) => {
+                let xdg_home = env::var("XDG_DATA_HOME").unwrap_or_else(|_| {
+                    format!("{}/.local/share", env::var("HOME").unwrap_or_default())
+                });
+                PathBuf::from(format!("{}/{}", xdg_home, "hysp"))
+            }
+        };
+        create_if_not_exists(&hysp_home);
+        hysp_home
+    };
+    pub static ref HYSP_BIN_DIR: PathBuf = {
+        let bin_dir = HYSP_HOME_DIR.join("bin");
+        create_if_not_exists(&bin_dir);
+        bin_dir
+    };
+    pub static ref HYSP_DATA_DIR: PathBuf = {
+        let data_dir = HYSP_HOME_DIR.join("data");
+        create_if_not_exists(&data_dir);
+        data_dir
+    };
 }
 
-lazy_static! {
-    pub static ref HYSP_HOME_DIR: PathBuf = get_xdg_path("HYSP_HOME_DIR", "hysp");
-    pub static ref HYSP_BIN_DIR: PathBuf = get_xdg_path(" HYSP_BIN_DIR", "hysp/bin");
-    pub static ref HYSP_DATA_DIR: PathBuf = get_xdg_path("HYSP_DATA_DIR", "hysp/data");
+fn create_if_not_exists(dir: &PathBuf) {
+    if let Err(_) = fs::create_dir_all(&dir) {
+        println!("Failed to create directory: {:?}", dir);
+    }
 }
 
 #[cfg(test)]

src/engine/essentials.rs

@@ -13,17 +13,16 @@ pub async fn check_conflicts(install_pkgs: InstallArgs) -> Result<()> {
     let pkgname = &install_pkgs.package;
 
     let toml_info = fetch_package_info(pkgname).await?;
+    let mut spinner_02 = Spinner::new_with_stream(
+        spinners::Runner,
+        "Checking for conflicts ...",
+        Color::Blue,
+        Streams::Stderr,
+    );
     if let Some(conflicts) = toml_info.package.conditions.and_then(|c| c.conflicts) {
-        let mut spinner = Spinner::new_with_stream(
-            spinners::Line,
-            "Checking for conflicts ...",
-            Color::Blue,
-            Streams::Stderr,
-        );
-
         for conflict_pkg in conflicts {
+            spinner_02.stop_and_persist("  ", "Done");
             if is_pkg_installed(&conflict_pkg) {
-                spinner.stop_and_persist("  ", "Done");
                 return Err(anyhow::Error::msg(format!(
                     "Confliction detected aborting .. {conflict_pkg}"
                 )));
@@ -39,7 +38,7 @@ pub async fn check_dependencies(install_pkgs: &InstallArgs) -> Result<()> {
 
     let toml_info = fetch_package_info(pkgname).await?;
     if let Some(dependencies) = toml_info.package.conditions.and_then(|c| c.dependencies) {
-        let mut spinner = Spinner::new_with_stream(
+        let mut spinner_04 = Spinner::new_with_stream(
             spinners::Line,
             "Checking for dependencies  ...",
             Color::Green,
@@ -48,7 +47,7 @@ pub async fn check_dependencies(install_pkgs: &InstallArgs) -> Result<()> {
 
         for dependency_pkg in dependencies {
             if !is_pkg_installed(&dependency_pkg) {
-                spinner.stop_and_persist("  ", "Done");
+                spinner_04.stop_and_persist("  ", "Done");
                 return Err(anyhow::anyhow!("Dependency '{}' not found", dependency_pkg));
             }
         }

src/init.rs

@@ -10,10 +10,10 @@ pub async fn start() {
         crate::engine::CommandChoice::Remove(pkg_uninstall_args) => {
             crate::commands::uninstall::remove_pkgs(pkg_uninstall_args).await
         }
-
         crate::engine::CommandChoice::Search(pkg_search_args) => {
             crate::commands::search::fetch_available(pkg_search_args).await
         }
+        crate::engine::CommandChoice::List => crate::commands::list::print_installed_pkgs()
     };
 
     if let Err(err) = result {