Add argument for profile/modpack to switch to when deleting

Also add the formatting to the picker for deletion too

Author: theRookieCoder

src/cli.rs

@@ -150,6 +150,9 @@ pub enum ProfileSubCommands {
     Delete {
         /// The name of the profile to delete
         profile_name: Option<String>,
+        /// The name of the profile to switch to afterwards
+        #[clap(long, short)]
+        switch_to: Option<String>,
     },
     /// Show information about the current profile
     Info,
@@ -201,6 +204,9 @@ pub enum ModpackSubCommands {
     Delete {
         /// The name of the modpack to delete
         modpack_name: Option<String>,
+        /// The name of the profile to switch to afterwards
+        #[clap(long, short)]
+        switch_to: Option<String>,
     },
     /// Show information about the current modpack
     Info,

src/main.rs

@@ -361,8 +361,11 @@ async fn actual_main(mut cli_app: Ferium) -> Result<()> {
                         install_overrides,
                     )?;
                 }
-                ModpackSubCommands::Delete { modpack_name } => {
-                    subcommands::modpack::delete(&mut config, modpack_name)?;
+                ModpackSubCommands::Delete {
+                    modpack_name,
+                    switch_to,
+                } => {
+                    subcommands::modpack::delete(&mut config, modpack_name, switch_to)?;
                 }
                 ModpackSubCommands::Info => {
                     subcommands::modpack::info(get_active_modpack(&mut config)?, true);
@@ -436,8 +439,11 @@ async fn actual_main(mut cli_app: Ferium) -> Result<()> {
                     )
                     .await?;
                 }
-                ProfileSubCommands::Delete { profile_name } => {
-                    subcommands::profile::delete(&mut config, profile_name)?;
+                ProfileSubCommands::Delete {
+                    profile_name,
+                    switch_to,
+                } => {
+                    subcommands::profile::delete(&mut config, profile_name, switch_to)?;
                 }
                 ProfileSubCommands::Info => {
                     subcommands::profile::info(get_active_profile(&mut config)?, true);

src/subcommands/modpack/delete.rs

@@ -1,10 +1,15 @@
 use super::switch;
 use crate::THEME;
 use anyhow::{bail, Result};
+use colored::Colorize;
 use dialoguer::Select;
-use libium::config::structs::Config;
+use libium::config::structs::{Config, ModpackIdentifier};
 
-pub fn delete(config: &mut Config, modpack_name: Option<String>) -> Result<()> {
+pub fn delete(
+    config: &mut Config,
+    modpack_name: Option<String>,
+    switch_to: Option<String>,
+) -> Result<()> {
     // If the modpack name has been provided as an option
     let selection = if let Some(modpack_name) = modpack_name {
         match config
@@ -19,7 +24,18 @@ pub fn delete(config: &mut Config, modpack_name: Option<String>) -> Result<()> {
         let modpack_names = config
             .modpacks
             .iter()
-            .map(|modpack| &modpack.name)
+            .map(|modpack| {
+                format!(
+                    "{} {}",
+                    match &modpack.identifier {
+                        ModpackIdentifier::CurseForgeModpack(id) =>
+                            format!("{} {:8}", "CF".red(), id.to_string().dimmed()),
+                        ModpackIdentifier::ModrinthModpack(id) =>
+                            format!("{} {:8}", "MR".green(), id.dimmed()),
+                    },
+                    modpack.name.bold(),
+                )
+            })
             .collect::<Vec<_>>();
 
         let selection = Select::with_theme(&*THEME)
@@ -40,7 +56,7 @@ pub fn delete(config: &mut Config, modpack_name: Option<String>) -> Result<()> {
         // And there is more than one modpack
         if config.modpacks.len() > 1 {
             // Let the user pick which modpack to switch to
-            switch(config, None)?;
+            switch(config, switch_to)?;
         } else {
             config.active_modpack = 0;
         }

src/subcommands/profile/delete.rs

@@ -1,10 +1,15 @@
 use super::switch;
 use crate::THEME;
 use anyhow::{bail, Result};
+use colored::Colorize;
 use dialoguer::Select;
 use libium::config::structs::Config;
 
-pub fn delete(config: &mut Config, profile_name: Option<String>) -> Result<()> {
+pub fn delete(
+    config: &mut Config,
+    profile_name: Option<String>,
+    switch_to: Option<String>,
+) -> Result<()> {
     // If the profile name has been provided as an option
     let selection = if let Some(profile_name) = profile_name {
         match config
@@ -19,7 +24,15 @@ pub fn delete(config: &mut Config, profile_name: Option<String>) -> Result<()> {
         let profile_names = config
             .profiles
             .iter()
-            .map(|profile| &profile.name)
+            .map(|profile| {
+                format!(
+                    "{:6} {:7} {} {}",
+                    format!("{:?}", profile.mod_loader).purple(),
+                    profile.game_version.green(),
+                    profile.name.bold(),
+                    format!("({} mods)", profile.mods.len()).yellow(),
+                )
+            })
             .collect::<Vec<_>>();
 
         let selection = Select::with_theme(&*THEME)
@@ -40,7 +53,7 @@ pub fn delete(config: &mut Config, profile_name: Option<String>) -> Result<()> {
         // And there is more than one profile
         if config.profiles.len() > 1 {
             // Let the user pick which profile to switch to
-            switch(config, None)?;
+            switch(config, switch_to)?;
         } else {
             config.active_profile = 0;
         }