warren/MCModpackManager
1
0
Fork 0
mirror of https://github.com/WarrenHood/MCModpackManager.git synced 2025-04-30 00:04:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added option to forcefully remove a mod

Browse source
This commit is contained in:
Warren Hood 2024-08-19 01:24:36 +02:00
parent a2c50b743a
commit e0b1b5bcb1
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.rs
View file

@ -74,6 +74,9 @@ enum Commands {
Remove { Remove {
/// Name of the mod to remove from the modpack /// Name of the mod to remove from the modpack
name: String, name: String,
/// Forcefully remove the mod without checking if anything depends on it
#[arg(long, short, action)]
force: bool,
}, },
/// Download the mods in the pack to a specified folder /// Download the mods in the pack to a specified folder
Download { Download {
@ -87,7 +90,7 @@ enum Commands {
/// Use exact transitive mod dependency versions /// Use exact transitive mod dependency versions
#[arg(long, short, action)] #[arg(long, short, action)]
locked: bool, locked: bool,
} },
} }
#[tokio::main(flavor = "multi_thread")] #[tokio::main(flavor = "multi_thread")]
@ -194,7 +197,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
match resolver::PinnedPackMeta::load_from_current_directory(!locked).await { match resolver::PinnedPackMeta::load_from_current_directory(!locked).await {
Ok(mut modpack_lock) => { Ok(mut modpack_lock) => {
let remove_result = modpack_lock.remove_mod(&mod_meta.name, &modpack_meta); let remove_result =
modpack_lock.remove_mod(&mod_meta.name, &modpack_meta, true);
if let Err(e) = remove_result { if let Err(e) = remove_result {
revert_modpack_meta(e); revert_modpack_meta(e);
} }
@ -215,7 +219,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
} }
}; };
} }
Commands::Remove { name } => { Commands::Remove { name, force } => {
let mut modpack_meta = ModpackMeta::load_from_current_directory()?; let mut modpack_meta = ModpackMeta::load_from_current_directory()?;
let old_modpack_meta = modpack_meta.clone(); let old_modpack_meta = modpack_meta.clone();
@ -232,7 +236,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
match resolver::PinnedPackMeta::load_from_current_directory(true).await { match resolver::PinnedPackMeta::load_from_current_directory(true).await {
Ok(mut modpack_lock) => { Ok(mut modpack_lock) => {
let remove_result = modpack_lock.remove_mod(&name, &modpack_meta); let remove_result = modpack_lock.remove_mod(&name, &modpack_meta, force);
if let Err(e) = remove_result { if let Err(e) = remove_result {
revert_modpack_meta(e); revert_modpack_meta(e);
} }

15
src/resolver.rs
View file

@ -259,15 +259,20 @@ impl PinnedPackMeta {
&mut self, &mut self,
mod_name: &str, mod_name: &str,
pack_metadata: &ModpackMeta, pack_metadata: &ModpackMeta,
force: bool,
) -> Result<(), Box<dyn Error>> { ) -> Result<(), Box<dyn Error>> {
let dependent_mods = self.get_dependent_mods(mod_name); let dependent_mods = self.get_dependent_mods(mod_name);
if dependent_mods.len() > 0 { if dependent_mods.len() > 0 {
return Err(format!( if force {
"Cannot remove mod {}.The following mods depend on it:\n{:#?}", println!("Forcefully removing mod {} even though it is depended on by the following mods:\n{:#?}", mod_name, dependent_mods);
mod_name, dependent_mods } else {
) return Err(format!(
.into()); "Cannot remove mod {}.The following mods depend on it:\n{:#?}",
mod_name, dependent_mods
)
.into());
}
} }
let removed_mod = self.mods.remove(mod_name); let removed_mod = self.mods.remove(mod_name);
if let Some(removed_mod) = removed_mod { if let Some(removed_mod) = removed_mod {