From e1720778ab326779c4298c07c4ac9d25d3d7733c Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 1 May 2026 20:29:20 +0300 Subject: [PATCH] cli: use multiplatform client for project adds Signed-off-by: NotAShelf Change-Id: I8059a38fab1a587e4564998f332ce7766a6a6964 --- src/cli/commands/add.rs | 15 +++++---------- src/cli/commands/add_prj.rs | 10 ++++------ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/cli/commands/add.rs b/src/cli/commands/add.rs index ae0b140..b162158 100644 --- a/src/cli/commands/add.rs +++ b/src/cli/commands/add.rs @@ -13,18 +13,13 @@ fn get_loaders(lockfile: &LockFile) -> Vec { pub fn create_all_platforms() -> HashMap> { - const MODRINTH: &str = "modrinth"; - const CURSEFORGE: &str = "curseforge"; - let mut platforms = HashMap::new(); - if let Ok(platform) = create_platform(MODRINTH, None) { - platforms.insert(MODRINTH.to_owned(), platform); - } - if let Ok(platform) = - create_platform(CURSEFORGE, std::env::var("CURSEFORGE_API_KEY").ok()) - { - platforms.insert(CURSEFORGE.to_owned(), platform); + let curseforge_key = std::env::var("CURSEFORGE_API_KEY").ok(); + if let Ok(platform) = create_platform("multiplatform", curseforge_key) { + platforms.insert("multiplatform".to_owned(), platform); + } else if let Ok(platform) = create_platform("modrinth", None) { + platforms.insert("modrinth".to_owned(), platform); } platforms diff --git a/src/cli/commands/add_prj.rs b/src/cli/commands/add_prj.rs index 0135391..2c90bef 100644 --- a/src/cli/commands/add_prj.rs +++ b/src/cli/commands/add_prj.rs @@ -315,14 +315,12 @@ fn create_all_platforms() -> HashMap> { let mut platforms = HashMap::new(); - if let Ok(platform) = create_platform("modrinth", None) { + let curseforge_key = std::env::var("CURSEFORGE_API_KEY").ok(); + if let Ok(platform) = create_platform("multiplatform", curseforge_key) { + platforms.insert("multiplatform".to_string(), platform); + } else if let Ok(platform) = create_platform("modrinth", None) { platforms.insert("modrinth".to_string(), platform); } - if let Ok(platform) = - create_platform("curseforge", std::env::var("CURSEFORGE_API_KEY").ok()) - { - platforms.insert("curseforge".to_string(), platform); - } if let Ok(platform) = create_platform("github", std::env::var("GITHUB_TOKEN").ok()) {