Fix dependency adding bug and 2 QOL enchancements

Author: theRookieCoder

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog for Ferium
 
+## `v3.28.6`
+### 11.05.2022
+
+- `add-github` now accepts the `theRookieCoder/ferium` format (only one argument)
+  - This makes it easier to copy paste the name from the URL
+- Fixed a bug when adding dependencies
+- Improved the non-verbose list command by showing the source and identifier
+
 ## `v3.28.5`
 ### 11.05.2022
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "3.28.5"
+version = "3.28.6"
 edition = "2021"
 authors = ["Ilesh Thiada (theRookieCoder) <[email protected]>", "薛詠謙 (KyleUltimate)", "Daniel Hauck (SolidTux)"]
 description = "Ferium is a CLI program for managing Minecraft mods from Modrinth, CurseForge, and Github Releases"

Cargo.toml

@@ -36,9 +36,7 @@ pub enum SubCommands {
     },
     #[clap(about("Add a GitHub repository to the profile"))]
     AddGithub {
-        #[clap(help("The repository owner's username"))]
-        owner: String,
-        #[clap(help("The name of the repository"))]
+        #[clap(help("The full name of the repository, e.g. `theRookieCoder/ferium`"))]
         name: String,
         #[clap(long)]
         #[clap(help("Whether the game version should be checked for this mod"))]

src/cli.rs

@@ -10,7 +10,7 @@ use ferinth::Ferinth;
 use furse::Furse;
 use indicatif::ProgressStyle;
 use lazy_static::lazy_static;
-use libium::config;
+use libium::config::{self, structs::ModIdentifier};
 use octocrab::OctocrabBuilder;
 use std::sync::Arc;
 use subcommands::{add, upgrade};
@@ -124,14 +124,17 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
             .await?;
         },
         SubCommands::AddGithub {
-            owner,
             name,
             dont_check_game_version,
             dont_check_mod_loader,
         } => {
             check_internet().await?;
+            let name = name.split('/').collect::<Vec<_>>();
+            if name.len() != 2 {
+                bail!("Invalid repository name")
+            }
             add::github(
-                github.repos(owner, name),
+                github.repos(name[0], name[1]),
                 profile,
                 Some(!dont_check_game_version),
                 Some(!dont_check_mod_loader),
@@ -159,7 +162,6 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
                 check_internet().await?;
                 let mut tasks = Vec::new();
                 for mod_ in &profile.mods {
-                    use config::structs::ModIdentifier;
                     match &mod_.identifier {
                         ModIdentifier::CurseForgeProject(project_id) => tasks.push(spawn(
                             subcommands::list::curseforge(curseforge.clone(), *project_id),
@@ -177,7 +179,22 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
                 }
             } else {
                 for mod_ in &profile.mods {
-                    println!("{}", mod_.name);
+                    println!(
+                        "{:45} {:10} {}",
+                        mod_.name.bold(),
+                        match &mod_.identifier {
+                            ModIdentifier::CurseForgeProject(_) => "CurseForge".red(),
+                            ModIdentifier::ModrinthProject(_) => "Modrinth".green(),
+                            ModIdentifier::GitHubRepository(_) => "GitHub".purple(),
+                        },
+                        match &mod_.identifier {
+                            ModIdentifier::CurseForgeProject(id) => id.to_string(),
+                            ModIdentifier::ModrinthProject(id) => id.into(),
+                            ModIdentifier::GitHubRepository(name) =>
+                                format!("{}/{}", name.0, name.1),
+                        }
+                        .dimmed()
+                    );
                 }
             }
         },

src/main.rs

@@ -1,10 +1,14 @@
 use crate::{THEME, TICK};
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, bail, Result};
 use dialoguer::Confirm;
 use ferinth::structures::version_structs::DependencyType;
 use ferinth::Ferinth;
 use furse::{structures::file_structs::FileRelationType, Furse};
-use libium::{add, config, upgrade};
+use libium::{
+    add,
+    config::{self, structs::ModIdentifier},
+    upgrade,
+};
 use octocrab::repos::RepoHandler;
 use std::sync::Arc;
 
@@ -68,28 +72,36 @@ pub async fn modrinth(
         } else {
             break;
         };
-        // Check if the dependency has already been added
-        if !profile.mods.iter().any(|mod_| {
-            config::structs::ModIdentifier::ModrinthProject(id.clone()) == mod_.identifier
-        }) {
-            // If it's required, add it without asking
-            if dependency.dependency_type == DependencyType::Required {
-                eprint!("Adding required dependency... ");
+        // If it's required, add it without asking
+        if dependency.dependency_type == DependencyType::Required {
+            eprint!("Adding required dependency... ");
+            match add::modrinth(modrinth.clone(), &id, profile, None, None).await {
+                Ok(project) => println!("{} ({})", *TICK, project.title),
+                Err(err) => {
+                    if matches!(err, add::Error::AlreadyAdded) {
+                        println!("{} Already added", *TICK);
+                    } else {
+                        bail!(err);
+                    }
+                },
+            };
+        } else if dependency.dependency_type == DependencyType::Optional {
+            let project = modrinth.get_project(&id).await?;
+            // If it is not already added:
+            if profile.mods.iter().any(|mod_| {
+                mod_.name == project.title
+                    || ModIdentifier::ModrinthProject(id.clone()) == mod_.identifier
+                // And the user wants to add it:
+            }) && Confirm::with_theme(&*THEME)
+                .with_prompt(format!(
+                    "Add optional dependency {} (https://modrinth.com/mod/{})?",
+                    project.title, project.slug
+                ))
+                .interact()?
+            {
+                eprint!("Adding optional dependency... ");
                 let project = add::modrinth(modrinth.clone(), &id, profile, None, None).await?;
                 println!("{} ({})", *TICK, project.title);
-            } else if dependency.dependency_type == DependencyType::Optional {
-                let project = modrinth.get_project(&id).await?;
-                let should_add = Confirm::with_theme(&*THEME)
-                    .with_prompt(format!(
-                        "Add optional dependency {} (https://modrinth.com/mod/{})?",
-                        project.title, project.slug
-                    ))
-                    .interact()?;
-                if should_add {
-                    eprint!("Adding optional dependency... ");
-                    let project = add::modrinth(modrinth.clone(), &id, profile, None, None).await?;
-                    println!("{} ({})", *TICK, project.title);
-                }
             }
         }
     }
@@ -125,31 +137,35 @@ pub async fn curseforge(
     println!("{} ({})", *TICK, project.name);
     for dependency in &latest_file.dependencies {
         let id = dependency.mod_id;
-        // Check if the dependency has already been added
-        if !profile
-            .mods
-            .iter()
-            .any(|mod_| config::structs::ModIdentifier::CurseForgeProject(id) == mod_.identifier)
-        {
-            // If it's required, add it without asking
-            if dependency.relation_type == FileRelationType::RequiredDependency {
-                eprint!("Adding required dependency... ");
+        // If it's required, add it without asking
+        if dependency.relation_type == FileRelationType::RequiredDependency {
+            eprint!("Adding required dependency... ");
+            match add::curseforge(curseforge.clone(), id, profile, None, None).await {
+                Ok(project) => println!("{} ({})", *TICK, project.name),
+                Err(err) => {
+                    if matches!(err, add::Error::AlreadyAdded) {
+                        println!("{} Already added", *TICK);
+                    } else {
+                        bail!(err);
+                    }
+                },
+            };
+        } else if dependency.relation_type == FileRelationType::OptionalDependency {
+            let project = curseforge.get_mod(id).await?;
+            // If it is not already added:
+            if !profile.mods.iter().any(|mod_| {
+                mod_.name == project.name || ModIdentifier::CurseForgeProject(id) == mod_.identifier
+                // And the user wants to add it:
+            }) && Confirm::with_theme(&*THEME)
+                .with_prompt(format!(
+                    "Add optional dependency {} ({})?",
+                    project.name, project.links.website_url
+                ))
+                .interact()?
+            {
+                eprint!("Adding optional dependency... ");
                 let project = add::curseforge(curseforge.clone(), id, profile, None, None).await?;
                 println!("{} ({})", *TICK, project.name);
-            } else if dependency.relation_type == FileRelationType::OptionalDependency {
-                let project = curseforge.get_mod(id).await?;
-                let should_add = Confirm::with_theme(&*THEME)
-                    .with_prompt(format!(
-                        "Add optional dependency {} ({})?",
-                        project.name, project.links.website_url
-                    ))
-                    .interact()?;
-                if should_add {
-                    eprint!("Adding optional dependency... ");
-                    let project =
-                        add::curseforge(curseforge.clone(), id, profile, None, None).await?;
-                    println!("{} ({})", *TICK, project.name);
-                }
             }
         }
     }

src/subcommands/add.rs

@@ -141,7 +141,7 @@ fn add_curseforge() -> Result {
 fn add_github() -> Result {
     // Add Sodium to config
     run_command(
-        vec!["add-github", "CaffeineMC", "sodium-fabric"],
+        vec!["add-github", "CaffeineMC/sodium-fabric"],
         Some("empty_profile"),
     )
 }