fix(profile): check existence and type

Author: ryanccn

Cargo.lock

@@ -13,8 +13,8 @@ publish = false
 [dependencies]
 async-recursion = "1.1.1"
 bzip2 = "0.4.4"
-clap = { version = "4.5.19", features = ["derive"] }
-clap_complete = "4.5.32"
+clap = { version = "4.5.20", features = ["derive"] }
+clap_complete = "4.5.33"
 color-eyre = "0.6.3"
 dirs = "5.0.1"
 enum_dispatch = "0.3.13"

Cargo.toml

@@ -49,7 +49,7 @@ impl super::Command for ConfigCommand {
                 let uc = config
                     .userchromes
                     .iter()
-                    .find(|d| d.name.eq(name))
+                    .find(|d| &d.name == name)
                     .ok_or_else(|| eyre!("no userchrome with name {} exists", name))?;
 
                 for c in &uc.configs {
@@ -69,7 +69,7 @@ impl super::Command for ConfigCommand {
                 let chrome = config
                     .userchromes
                     .iter_mut()
-                    .find(|d| d.name.eq(name))
+                    .find(|d| &d.name == name)
                     .ok_or_else(|| eyre!("no userchrome with name {} exists", name))?;
 
                 let existing = chrome.configs.iter_mut().find(|c| c.key == *key);
@@ -95,7 +95,7 @@ impl super::Command for ConfigCommand {
                 let chrome = config
                     .userchromes
                     .iter_mut()
-                    .find(|d| d.name.eq(name))
+                    .find(|d| &d.name == name)
                     .ok_or_else(|| eyre!("no userchrome with name {} exists", name))?;
 
                 let existing = chrome.configs.iter_mut().position(|c| c.key == *key);

flake.lock

@@ -5,7 +5,7 @@
 use std::path::PathBuf;
 
 use clap::{Parser, ValueHint};
-use eyre::Result;
+use eyre::{bail, Result};
 use owo_colors::OwoColorize as _;
 
 use crate::config;
@@ -20,6 +20,10 @@ pub struct ProfileCommand {
 impl super::Command for ProfileCommand {
     async fn action(&self, global_options: &super::Cli) -> Result<()> {
         if let Some(path) = &self.path {
+            if !path.is_dir() {
+                bail!("profile does not exist");
+            }
+
             let mut config = config::get_config(&global_options.config).await?;
             config.profile = Some(path.clone());
             config::set_config(&global_options.config, &config).await?;

src/cmd/config.rs

@@ -24,7 +24,7 @@ impl super::Command for RemoveCommand {
             .userchromes
             .iter()
             .enumerate()
-            .find(|(_, uchrome)| uchrome.name.eq(&self.name));
+            .find(|(_, uchrome)| uchrome.name == self.name);
 
         match res {
             Some((i, uchrome)) => {

src/cmd/profile.rs

@@ -17,12 +17,12 @@ impl super::Command for SwitchCommand {
     async fn action(&self, global_options: &super::Cli) -> Result<()> {
         let config = config::get_config(&global_options.config).await?;
 
-        utils::check_firefox()?;
+        utils::check_firefox();
 
         if let Some(profile) = &config.profile {
             if self.name == "out" {
                 switch::switch(None, profile).await?;
-            } else if let Some(u) = config.userchromes.iter().find(|c| c.name.eq(&self.name)) {
+            } else if let Some(u) = config.userchromes.iter().find(|c| c.name == self.name) {
                 switch::switch(Some(u), profile).await?;
             } else {
                 bail!("no userchrome with name {} found!", self.name);

src/cmd/remove.rs

@@ -16,7 +16,7 @@ impl super::Command for UpdateCommand {
     async fn action(&self, global_options: &super::Cli) -> Result<()> {
         let config = config::get_config(&global_options.config).await?;
 
-        utils::check_firefox()?;
+        utils::check_firefox();
 
         if let Some(profile) = &config.profile {
             let current = fs::read_to_string(profile.join("chrome").join(".nyoom-chrome-name"))

src/cmd/switch.rs

@@ -5,12 +5,7 @@
 use eyre::{bail, Result};
 use temp_dir::TempDir;
 
-use std::{
-    env,
-    path::{Path, PathBuf},
-    process::Stdio,
-    sync::LazyLock,
-};
+use std::{env, path::Path, process::Stdio, sync::LazyLock};
 use tokio::{fs, process::Command};
 
 use owo_colors::OwoColorize as _;
@@ -78,8 +73,8 @@ async fn patch_user_file(f: &Path, userchrome: Option<&Userchrome>) -> Result<()
     }
 
     let mut ret_lines: Vec<String> = Vec::new();
-    let start_idx = lines.iter().position(|k| k.eq(&START_LINE));
-    let end_idx = lines.iter().position(|k| k.eq(&END_LINE));
+    let start_idx = lines.iter().position(|k| k == START_LINE);
+    let end_idx = lines.iter().position(|k| k == END_LINE);
 
     let mut ret_set = false;
 
@@ -173,12 +168,12 @@ async fn handle_source(source: &str, target_dir: &Path) -> Result<()> {
 
         utils::download_archive(&url, target_dir).await?;
     } else if let Some(path) = source.strip_prefix("path:") {
-        let source = PathBuf::from(path);
+        let source = Path::new(path);
         if !source.is_dir() {
             bail!("provided path {path:?} is not a directory");
         }
 
-        utils::copy_dir_all(&source, target_dir).await?;
+        utils::copy_dir_all(source, target_dir).await?;
     } else if let Some(url) = source.strip_prefix("url:") {
         utils::download_archive(url, target_dir).await?;
     } else if source.starts_with("https://") || source.starts_with("http://") {

src/cmd/update.rs

@@ -31,18 +31,13 @@ pub async fn copy_dir_all(src: &Path, dst: &Path) -> Result<()> {
     Ok(())
 }
 
-pub fn check_firefox() -> Result<()> {
+pub fn check_firefox() {
     let system =
         System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new()));
-    let is_running = system
-        .processes_by_name(&"firefox".parse::<OsString>()?)
-        .count()
-        != 0;
+    let is_running = system.processes_by_name(&OsString::from("firefox")).count() != 0;
 
     if is_running {
         println!("{}", "Firefox is running, refusing to continue!".yellow());
         exit(1);
     }
-
-    Ok(())
 }