Update to Libium 1.6

Author: theRookieCoder

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog for Ferium
 
+## [3.19.0] - 02.04.2022
+
+> WARNING!
+> 
+> The config format has changed, your previous (pre-3.19) configs will not work!
+> Use [Frigate](https://github.com/theRookieCoder/frigate) to update your old config to the new format
+
+- Updated to Libium 1.6
+- Improved the upgrading code in `main.rs`, taking advantage of the improved config format
+- Updated `remove.rs` to support the new libium version
+- Updated the test configs to the new format
+
 ## [3.18.2] - 31.03.2022
 
 - Improved readme

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "3.18.2"
+version = "3.19.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"

Cargo.toml

@@ -8,7 +8,7 @@ use colored::{ColoredString, Colorize};
 use ferinth::Ferinth;
 use furse::Furse;
 use lazy_static::lazy_static;
-use libium::{add, config};
+use libium::{add, config, upgrade};
 use tokio::{
 	fs::{create_dir_all, remove_dir_all},
 	io::AsyncReadExt,
@@ -116,19 +116,20 @@ async fn actual_main() -> Result<()> {
 			check_empty_profile(profile)?;
 			for mod_ in &profile.mods {
 				if verbose {
-					match mod_ {
-						config::structs::Mod::CurseForgeProject { project_id, .. } => {
+					use config::structs::ModIdentifier;
+					match &mod_.identifier {
+						ModIdentifier::CurseForgeProject(project_id) => {
 							subcommands::list::curseforge(&curseforge, *project_id).await
 						},
-						config::structs::Mod::ModrinthProject { project_id, .. } => {
+						ModIdentifier::ModrinthProject(project_id) => {
 							subcommands::list::modrinth(&modrinth, project_id).await
 						},
-						config::structs::Mod::GitHubRepository { full_name, .. } => {
+						ModIdentifier::GitHubRepository(full_name) => {
 							subcommands::list::github(&github, full_name).await
 						},
 					}?;
 				} else {
-					println!("{}", mod_.name());
+					println!("{}", mod_.name);
 				}
 			}
 		},
@@ -169,60 +170,44 @@ async fn actual_main() -> Result<()> {
 			create_dir_all(&profile.output_dir).await?;
 			let mut error = false;
 			for mod_ in &profile.mods {
-				use libium::config::structs::Mod;
-				let result = match mod_ {
-					Mod::CurseForgeProject { name, project_id } => (
-						name,
-						match libium::upgrade::curseforge(
-							&curseforge,
-							profile,
-							*project_id,
-							no_patch_check,
-						)
-						.await
+				use libium::config::structs::ModIdentifier;
+				let result = match &mod_.identifier {
+					ModIdentifier::CurseForgeProject(project_id) => {
+						match upgrade::curseforge(&curseforge, profile, *project_id, no_patch_check)
+							.await
 						{
 							Ok(file) => Ok(file.file_name),
 							Err(err) => Err(err),
-						},
-					),
-					Mod::ModrinthProject { name, project_id } => (
-						name,
-						match libium::upgrade::modrinth(
-							&modrinth,
-							profile,
-							project_id,
-							no_patch_check,
-						)
-						.await
+						}
+					},
+					ModIdentifier::ModrinthProject(project_id) => {
+						match upgrade::modrinth(&modrinth, profile, project_id, no_patch_check)
+							.await
 						{
 							Ok(version) => Ok(version.files[0].filename.clone()),
 							Err(err) => Err(err),
-						},
-					),
-					Mod::GitHubRepository { name, full_name } => (
-						name,
-						match libium::upgrade::github(
-							&github.repos(&full_name.0, &full_name.1),
-							profile,
-						)
-						.await
+						}
+					},
+					ModIdentifier::GitHubRepository(full_name) => {
+						match upgrade::github(&github.repos(&full_name.0, &full_name.1), profile)
+							.await
 						{
 							Ok(asset) => Ok(asset.name),
 							Err(err) => Err(err),
-						},
-					),
+						}
+					},
 				};
 				match result {
-					(name, Ok(file_name)) => {
+					Ok(file_name) => {
 						println!(
 							"{} {:40}{}",
 							*TICK,
-							name,
+							mod_.name,
 							format!("({})", file_name).dimmed()
 						);
 					},
-					(name, Err(err)) => {
-						eprintln!("{}", format!("× {:40}{}", name, err).red());
+					Err(err) => {
+						eprintln!("{}", format!("× {:40}{}", mod_.name, err).red());
 						error = true;
 					},
 				}

src/main.rs

@@ -1,13 +1,17 @@
 use anyhow::{bail, Result};
 use dialoguer::{theme::ColorfulTheme, MultiSelect};
-use libium::config::{self, structs::Mod};
+use libium::config;
 
 /// Display a list of mods and repos in the profile to select from and remove selected ones
 pub fn remove(
 	profile: &mut config::structs::Profile,
 	mod_names: Option<Vec<String>>,
 ) -> Result<()> {
-	let names: Vec<&str> = profile.mods.iter().map(Mod::name).collect();
+	let names = profile
+		.mods
+		.iter()
+		.map(|mod_| &mod_.name)
+		.collect::<Vec<_>>();
 	let mut items_to_remove = Vec::new();
 
 	match mod_names {

src/subcommands/remove.rs

@@ -8,21 +8,21 @@
 			"mod_loader": "Fabric",
 			"mods": [
 				{
-					"ModrinthProject": {
-						"name": "Starlight (Fabric)",
-						"project_id": "H8CaAYZC"
+					"name": "Starlight (Fabric)",
+					"identifier": {
+						"ModrinthProject": "H8CaAYZC"
 					}
 				},
 				{
-					"CurseForgeProject": {
-						"name": "Terralith",
-						"project_id": 513688
+					"name": "Terralith",
+					"identifier": {
+						"CurseForgeProject": 513688
 					}
 				},
 				{
-					"GitHubRepository": {
-						"name": "sodium-fabric",
-						"full_name": [
+					"name": "sodium-fabric",
+					"identifier": {
+						"GitHubRepository": [
 							"CaffeineMC",
 							"sodium-fabric"
 						]

tests/configs/one_profile_full.json

@@ -8,21 +8,21 @@
 			"mod_loader": "Fabric",
 			"mods": [
 				{
-					"ModrinthProject": {
-						"name": "Starlight (Fabric)",
-						"project_id": "H8CaAYZC"
+					"name": "Starlight (Fabric)",
+					"identifier": {
+						"ModrinthProject": "H8CaAYZC"
 					}
 				},
 				{
-					"CurseForgeProject": {
-						"name": "Terralith",
-						"project_id": 513688
+					"name": "Terralith",
+					"identifier": {
+						"CurseForgeProject": 513688
 					}
 				},
 				{
-					"GitHubRepository": {
-						"name": "sodium-fabric",
-						"full_name": [
+					"name": "sodium-fabric",
+					"identifier": {
+						"GitHubRepository": [
 							"CaffeineMC",
 							"sodium-fabric"
 						]