1 files changed, 53 insertions, 32 deletions

diff --git a/src/commands/list.rs b/src/commands/list.rs
index 4aa4306..3665446 100644
--- a/src/commands/list.rs
+++ b/src/commands/list.rs
@@ -1,11 +1,13 @@
+use indicatif::{ProgressBar, ProgressStyle};
+
 use crate::{
     config::Cfg,
     db::{
-        config_change_current_list, config_get_current_list, lists_get, lists_insert, lists_remove,
-        lists_version, lists_get_all_ids,
+        config_change_current_list, config_get_current_list, lists_get,
+        lists_get_all_ids, lists_insert, lists_remove, lists_version,
     },
-    error::{MLE, MLError, ErrorType},
-    update, Modloader,
+    error::{ErrorType, MLError, MLE},
+    update, Modloader, STYLE_OPERATION,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -16,31 +18,47 @@ pub struct List {
     pub download_folder: String,
 }
 
-pub fn get_current_list(config: Cfg) -> MLE<List> {
-    let id = config_get_current_list(config.clone())?;
-    lists_get(config, id)
+pub fn get_current_list(config: &Cfg) -> MLE<List> {
+    let id = config_get_current_list(config)?;
+    lists_get(config, &id)
 }
 
 pub fn list_add(
-    config: Cfg,
-    id: String,
-    mc_version: String,
-    modloader: Modloader,
-    directory: String,
+    config: &Cfg,
+    id: &str,
+    mc_version: &str,
+    modloader: &Modloader,
+    directory: &str,
 ) -> MLE<()> {
-    lists_insert(config, id, mc_version, modloader, directory)
+    let p = ProgressBar::new_spinner();
+    p.set_style(ProgressStyle::with_template(STYLE_OPERATION).unwrap());
+    p.set_message(format!("Create {}", id));
+    lists_insert(config, id, mc_version, modloader, directory)?;
+    p.finish_with_message(format!("Created {}", id));
+    Ok(())
 }
 
-pub fn list_change(config: Cfg, id: String) -> MLE<()> {
-    if lists_get_all_ids(config.clone())?.into_iter().find(|l| l == &id).is_none() {
+pub fn list_change(config: &Cfg, id: &str) -> MLE<()> {
+    let p = ProgressBar::new_spinner();
+    p.set_style(ProgressStyle::with_template(STYLE_OPERATION).unwrap());
+    p.set_message(format!("Change default list to {}", id));
+
+    if !lists_get_all_ids(config)?.into_iter().any(|l| l == id) {
         return Err(MLError::new(ErrorType::ArgumentError, "List not found"));
     };
-    println!("Change default list to: {}", id);
-    config_change_current_list(config, id)
+    config_change_current_list(config, id)?;
+
+    p.finish_with_message(format!("Changed default list to {}", id));
+    Ok(())
 }
 
-pub fn list_remove(config: Cfg, id: String) -> MLE<()> {
-    lists_remove(config, id)
+pub fn list_remove(config: &Cfg, id: &str) -> MLE<()> {
+    let p = ProgressBar::new_spinner();
+    p.set_style(ProgressStyle::with_template(STYLE_OPERATION).unwrap());
+    p.set_message(format!("Remove {}", id));
+    lists_remove(config, id)?;
+    p.finish_with_message(format!("Removed {}", id));
+    Ok(())
 }
 
 ///Changing the current lists version and updating it
@@ -50,31 +68,34 @@ pub fn list_remove(config: Cfg, id: String) -> MLE<()> {
 /// * `config` - The current config
 /// * `args` - All args, to extract the new version
 pub async fn list_version(
-    config: Cfg,
-    id: String,
+    config: &Cfg,
+    id: &str,
     mc_version: String,
     download: bool,
     delete: bool,
 ) -> MLE<()> {
-    println!(
+    let p = ProgressBar::new_spinner();
+    p.set_style(ProgressStyle::with_template(STYLE_OPERATION).unwrap());
+    p.set_message(format!(
         "Change version for list {} to minecraft version: {}",
         id, mc_version
-    );
+    ));
 
-    lists_version(config.clone(), &id, &mc_version)?;
+    lists_version(config, id, &mc_version)?;
+
+    p.finish_with_message(format!(
+        "Changed version for list {} to minecraft version: {}",
+        id, mc_version
+    ));
 
-    println!(
-        "\nCheck for updates for new minecraft version in list {}",
-        id
-    );
-    let list = lists_get(config.clone(), id)?;
+    let list = lists_get(config, id)?;
     update(config, vec![list], true, download, delete).await
 }
 
-pub fn list_list(config: Cfg) -> MLE<()> {
-    let lists = lists_get_all_ids(config.clone())?;
+pub fn list_list(config: &Cfg) -> MLE<()> {
+    let lists = lists_get_all_ids(config)?;
     for list in lists {
-        let l = lists_get(config.clone(), list)?;
+        let l = lists_get(config, &list)?;
         println!("{}: | {} | {}", l.id, l.mc_version, l.modloader)
     }
     Ok(())