Added check overrides to add commands

Author: theRookieCoder

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog for Ferium
 
+## `v3.25.0`
+### 04.05.2022
+
+- Added `--dont_check_game_version` and `--dont_check_mod_loader` flags to add commands
+  - The check overrides are follow when checking for dependencies
+  - These check overrides will be added to the config automatically
+- Added Quilt->Fabric backwards compatibility to the add commands' dependency checking
+
 ## `v3.24.0`
 ### 03.05.2022
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "3.24.0"
+version = "3.25.0"
 edition = "2021"
 authors = ["Ilesh Thiada (theRookieCoder) <[email protected]>", "Daniel Hauck (SolidTux)"]
 description = "Ferium is a CLI program for managing Minecraft mods from Modrinth, CurseForge, and Github Releases"
@@ -31,7 +31,7 @@ dialoguer = "0.10"
 serde_json = "1.0"
 itertools = "0.10"
 colored = "2.0"
-ferinth = "2.1"
+ferinth = "2.2"
 libium = "1.11"
 anyhow = "1.0"
 online = "3.0"

Cargo.toml

@@ -24,18 +24,36 @@ pub enum SubCommands {
     AddModrinth {
         #[clap(help("The project ID is specified at the bottom of the left sidebar under 'Technical information'\nYou can also use the project slug for this"))]
         project_id: String,
+        #[clap(long)]
+        #[clap(help("Whether the game version should be checked for this mod"))]
+        dont_check_game_version: bool,
+        #[clap(long)]
+        #[clap(help("Whether the mod loader should be checked for this mod"))]
+        dont_check_mod_loader: bool,
     },
     #[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"))]
         name: String,
+        #[clap(long)]
+        #[clap(help("Whether the game version should be checked for this mod"))]
+        dont_check_game_version: bool,
+        #[clap(long)]
+        #[clap(help("Whether the mod loader should be checked for this mod"))]
+        dont_check_mod_loader: bool,
     },
     #[clap(about("Add a CurseForge mod to the profile"))]
     AddCurseforge {
         #[clap(help("The project ID is specified at the right sidebar under 'About Project'"))]
         project_id: i32,
+        #[clap(long)]
+        #[clap(help("Whether the game version should be checked for this mod"))]
+        dont_check_game_version: bool,
+        #[clap(long)]
+        #[clap(help("Whether the mod loader should be checked for this mod"))]
+        dont_check_mod_loader: bool,
     },
     #[clap(about("List all the mods in the profile, and with some their metadata if verbose"))]
     List {

src/cli.rs

@@ -107,16 +107,49 @@ async fn actual_main() -> Result<()> {
 
     // Run function(s) based on the sub(sub)command to be executed
     match cli_app.subcommand {
-        SubCommands::AddModrinth { project_id } => {
-            add::modrinth(&modrinth, profile, &project_id).await?;
+        SubCommands::AddModrinth {
+            project_id,
+            dont_check_game_version,
+            dont_check_mod_loader,
+        } => {
+            add::modrinth(
+                &modrinth,
+                &project_id,
+                profile,
+                Some(!dont_check_game_version),
+                Some(!dont_check_mod_loader),
+            )
+            .await?;
         },
-        SubCommands::AddGithub { owner, name } => {
+        SubCommands::AddGithub {
+            owner,
+            name,
+            dont_check_game_version,
+            dont_check_mod_loader,
+        } => {
             eprint!("Adding mod... ");
-            let repo = libium::add::github(github.repos(owner, name), profile).await?;
+            let repo = libium::add::github(
+                github.repos(owner, name),
+                profile,
+                Some(!dont_check_game_version),
+                Some(!dont_check_mod_loader),
+            )
+            .await?;
             println!("{} ({})", *TICK, repo.name);
         },
-        SubCommands::AddCurseforge { project_id } => {
-            add::curseforge(&curseforge, profile, project_id).await?;
+        SubCommands::AddCurseforge {
+            project_id,
+            dont_check_game_version,
+            dont_check_mod_loader,
+        } => {
+            add::curseforge(
+                &curseforge,
+                project_id,
+                profile,
+                Some(!dont_check_game_version),
+                Some(!dont_check_mod_loader),
+            )
+            .await?;
         },
         SubCommands::List { verbose } => {
             check_empty_profile(profile)?;

src/main.rs

@@ -4,25 +4,49 @@ use dialoguer::Confirm;
 use ferinth::structures::version_structs::DependencyType;
 use ferinth::Ferinth;
 use furse::{structures::file_structs::FileRelationType, Furse};
-use libium::{add, config};
+use libium::{add, config, upgrade};
 
 pub async fn modrinth(
     modrinth: &Ferinth,
-    profile: &mut config::structs::Profile,
     project_id: &str,
+    profile: &mut config::structs::Profile,
+    should_check_game_version: Option<bool>,
+    should_check_mod_loader: Option<bool>,
 ) -> Result<()> {
     eprint!("Adding mod... ");
-    let project = add::modrinth(modrinth, project_id, profile).await?;
+    let project = add::modrinth(
+        modrinth,
+        project_id,
+        profile,
+        should_check_game_version,
+        should_check_mod_loader,
+    )
+    .await?;
     // Add dependencies
-    let latest_version = libium::upgrade::modrinth(
+    let result = upgrade::modrinth(
         modrinth,
         &project.id,
         &profile.game_version,
         &profile.mod_loader,
-        Some(true),
-        Some(true),
+        should_check_game_version,
+        should_check_mod_loader,
     )
-    .await?;
+    .await;
+    let latest_version = if matches!(result, Err(upgrade::Error::NoCompatibleFile))
+        && profile.mod_loader == config::structs::ModLoader::Quilt
+    {
+        upgrade::modrinth(
+            modrinth,
+            &project.id,
+            &profile.game_version,
+            &config::structs::ModLoader::Fabric,
+            should_check_game_version,
+            should_check_mod_loader,
+        )
+        .await
+    } else {
+        result
+    }?;
     println!("{} ({})", *TICK, project.title);
     for dependency in latest_version.dependencies {
         let id = if let Some(project_id) = dependency.project_id {
@@ -39,7 +63,7 @@ pub async fn modrinth(
             // If it's required, add it without asking
             if dependency.dependency_type == DependencyType::Required {
                 eprint!("Adding required dependency... ");
-                let project = add::modrinth(modrinth, &id, profile).await?;
+                let project = add::modrinth(modrinth, &id, profile, None, None).await?;
                 println!("{} ({})", *TICK, project.title);
             } else if dependency.dependency_type == DependencyType::Optional {
                 let project = modrinth.get_project(&id).await?;
@@ -51,7 +75,7 @@ pub async fn modrinth(
                     .interact()?;
                 if should_add {
                     eprint!("Adding optional dependency... ");
-                    let project = add::modrinth(modrinth, &id, profile).await?;
+                    let project = add::modrinth(modrinth, &id, profile, None, None).await?;
                     println!("{} ({})", *TICK, project.title);
                 }
             }
@@ -63,21 +87,45 @@ pub async fn modrinth(
 
 pub async fn curseforge(
     curseforge: &Furse,
-    profile: &mut config::structs::Profile,
     project_id: i32,
+    profile: &mut config::structs::Profile,
+    should_check_game_version: Option<bool>,
+    should_check_mod_loader: Option<bool>,
 ) -> Result<()> {
     eprint!("Adding mod... ");
-    let project = add::curseforge(curseforge, project_id, profile).await?;
+    let project = add::curseforge(
+        curseforge,
+        project_id,
+        profile,
+        should_check_game_version,
+        should_check_mod_loader,
+    )
+    .await?;
     // Add dependencies
-    let latest_version = libium::upgrade::curseforge(
+    let result = upgrade::curseforge(
         curseforge,
         project.id,
         &profile.game_version,
         &profile.mod_loader,
-        Some(true),
-        Some(true),
+        should_check_game_version,
+        should_check_mod_loader,
     )
-    .await?;
+    .await;
+    let latest_version = if matches!(result, Err(upgrade::Error::NoCompatibleFile))
+        && profile.mod_loader == config::structs::ModLoader::Quilt
+    {
+        upgrade::curseforge(
+            curseforge,
+            project.id,
+            &profile.game_version,
+            &config::structs::ModLoader::Fabric,
+            should_check_game_version,
+            should_check_mod_loader,
+        )
+        .await
+    } else {
+        result
+    }?;
     println!("{} ({})", *TICK, project.name);
     for dependency in latest_version.dependencies {
         let id = dependency.mod_id;
@@ -90,7 +138,7 @@ pub async fn curseforge(
             // If it's required, add it without asking
             if dependency.relation_type == FileRelationType::RequiredDependency {
                 eprint!("Adding required dependency... ");
-                let project = add::curseforge(curseforge, id, profile).await?;
+                let project = add::curseforge(curseforge, id, profile, None, None).await?;
                 println!("{} ({})", *TICK, project.name);
             } else if dependency.relation_type == FileRelationType::OptionalDependency {
                 let project = curseforge.get_mod(id).await?;
@@ -102,7 +150,7 @@ pub async fn curseforge(
                     .interact()?;
                 if should_add {
                     eprint!("Adding optional dependency... ");
-                    let project = add::curseforge(curseforge, id, profile).await?;
+                    let project = add::curseforge(curseforge, id, profile, None, None).await?;
                     println!("{} ({})", *TICK, project.name);
                 }
             }