Merge pull request 'multithreaded' (#6) from multithreaded into master

Reviewed-on: http://raspberrypi.fritz.box:7920/fx/modlist/pulls/6

1 files changed, 48 insertions, 24 deletions

diff --git a/src/commands/io.rs b/src/commands/io.rs
index dd294bc..8e44b2b 100644
--- a/src/commands/io.rs
+++ b/src/commands/io.rs
@@ -1,12 +1,16 @@
+use indicatif::{ProgressBar, ProgressStyle};
 use serde::{Deserialize, Serialize};
 use std::fs::File;
 use std::io::prelude::*;
 
 use crate::{
     config::Cfg,
-    db::{lists_get, lists_get_all_ids, lists_insert, userlist_get_set_version, userlist_get_all_ids, userlist_get_current_version},
+    db::{
+        lists_get, lists_get_all_ids, lists_insert, userlist_get_all_ids,
+        userlist_get_current_version, userlist_get_set_version,
+    },
     error::MLE,
-    mod_add, IDSelector, List, Modloader, AddMod,
+    mod_add, AddMod, IDSelector, List, Modloader, STYLE_OPERATION,
 };
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -17,14 +21,14 @@ struct Export {
 #[derive(Debug, Serialize, Deserialize)]
 struct ExportVersion {
     version: String,
-    set: bool
+    set: bool,
 }
 
 impl ExportVersion {
-    fn from(config: Cfg, list_id: &str, mod_id: &str) -> MLE<Self> {
+    fn from(config: &Cfg, list_id: &str, mod_id: &str) -> MLE<Self> {
         Ok(Self {
-            version: userlist_get_current_version(config.clone(), list_id, mod_id)?,
-            set: userlist_get_set_version(config.clone(), list_id, mod_id)?
+            version: userlist_get_current_version(config, list_id, mod_id)?,
+            set: userlist_get_set_version(config, list_id, mod_id)?,
         })
     }
 }
@@ -39,18 +43,18 @@ struct ExportList {
 }
 
 impl ExportList {
-    pub fn from(config: Cfg, list_id: String, download: bool) -> MLE<Self> {
-        let list = lists_get(config.clone(), String::from(&list_id))?;
+    pub fn from(config: &Cfg, list_id: &str, download: bool) -> MLE<Self> {
+        let list = lists_get(config, list_id)?;
 
         let mut dl_folder = None;
         if download {
             dl_folder = Some(list.download_folder)
         };
 
-        let mods = userlist_get_all_ids(config.clone(), &list_id)?;
+        let mods = userlist_get_all_ids(config, list_id)?;
         let mut versions = vec![];
         for m in mods {
-            versions.push(ExportVersion::from(config.clone(), &list_id, &m)?)
+            versions.push(ExportVersion::from(config, list_id, &m)?)
         }
 
         Ok(Self {
@@ -63,29 +67,46 @@ impl ExportList {
     }
 }
 
-pub fn export(config: Cfg, list: Option<String>) -> MLE<()> {
+pub fn export(config: &Cfg, list: Option<String>) -> MLE<()> {
+    let progress = ProgressBar::new_spinner();
+    progress.set_style(ProgressStyle::with_template(STYLE_OPERATION).unwrap());
+
     let mut list_ids: Vec<String> = vec![];
     if list.is_none() {
-        list_ids = lists_get_all_ids(config.clone())?;
+        list_ids = lists_get_all_ids(config)?;
     } else {
-        list_ids.push(lists_get(config.clone(), list.unwrap())?.id);
+        list_ids.push(lists_get(config, &list.unwrap())?.id);
     }
+
     let mut lists: Vec<ExportList> = vec![];
     for list_id in list_ids {
-        lists.push(ExportList::from(config.clone(), list_id, true)?);
+        progress.set_message(format!("Export {}", list_id));
+        //TODO download option/ new download on import
+        lists.push(ExportList::from(config, &list_id, true)?);
     }
 
     let toml = toml::to_string(&Export { lists })?;
 
-    let filestr = dirs::home_dir().unwrap().join("mlexport.toml");
+    let filestr = dirs::home_dir()
+        .unwrap()
+        .join("mlexport.toml")
+        .into_os_string()
+        .into_string()
+        .unwrap();
 
-    let mut file = File::create(filestr.into_os_string().into_string().unwrap().as_str())?;
+    progress.set_message("Create file");
+    let mut file = File::create(&filestr)?;
     file.write_all(toml.as_bytes())?;
+    progress.finish_with_message(format!("Exported to {}", filestr));
 
     Ok(())
 }
 
-pub async fn import(config: Cfg, file_str: String, direct_download: bool) -> MLE<()> {
+pub async fn import(
+    config: &Cfg,
+    file_str: &str,
+    direct_download: bool,
+) -> MLE<()> {
     let mut file = File::open(file_str)?;
     let mut content = String::new();
     file.read_to_string(&mut content)?;
@@ -99,18 +120,21 @@ pub async fn import(config: Cfg, file_str: String, direct_download: bool) -> MLE
             download_folder: exportlist.download_folder.ok_or("NO_DL").unwrap(),
         };
         lists_insert(
-            config.clone(),
-            list.id.clone(),
-            list.mc_version.clone(),
-            list.modloader.clone(),
-            String::from(&list.download_folder),
+            config,
+            &list.id,
+            &list.mc_version,
+            &list.modloader,
+            &list.download_folder,
         )?;
 
         let mut ver_ids = vec![];
         for id in exportlist.versions {
-            ver_ids.push(AddMod { id: IDSelector::VersionID(id.version), set_version: id.set} );
+            ver_ids.push(AddMod {
+                id: IDSelector::VersionID(id.version),
+                set_version: id.set,
+            });
         }
-        mod_add(config.clone(), ver_ids, list, direct_download).await?;
+        mod_add(config, ver_ids, list, direct_download).await?;
     }
     Ok(())
 }