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

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

1 files changed, 28 insertions, 23 deletions

diff --git a/src/config.rs b/src/config.rs
index e1049d1..f0eb8f7 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -4,9 +4,12 @@ use std::{
     path::Path,
 };
 
+use indicatif::{ProgressBar, ProgressStyle};
 use serde::{Deserialize, Serialize};
 
-use crate::{db::db_setup, error::MLE, Modloader, VersionLevel, check_game_versions};
+use crate::{
+    check_game_versions, db::db_setup, error::MLE, Modloader, VersionLevel,
+};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Cfg {
@@ -31,7 +34,7 @@ pub struct Defaults {
 impl Cfg {
     pub async fn init(path: Option<String>) -> MLE<Self> {
         let configfile = match path.clone() {
-            Some(p) => String::from(p),
+            Some(p) => p,
             None => dirs::config_dir()
                 .unwrap()
                 .join("modlist")
@@ -43,7 +46,8 @@ impl Cfg {
         let mut file = match File::open(&configfile) {
             Ok(file) => file,
             Err(err) => {
-                if err.kind() == std::io::ErrorKind::NotFound && path.is_none() {
+                if err.kind() == std::io::ErrorKind::NotFound && path.is_none()
+                {
                     create_config(&configfile)?;
                     File::open(&configfile)?
                 } else {
@@ -71,16 +75,18 @@ impl Cfg {
             Err(..) => {
                 create_versions_dummy(&versionfile).await?;
                 check_game_versions(&versionfile, true).await?;
-            },
+            }
         }
+
         Ok(config)
     }
 }
 
 fn create_config(path: &str) -> MLE<()> {
-    print!("No config file found, create default");
-    //Force flush of stdout, else print! doesn't print instantly
-    std::io::stdout().flush()?;
+    let p = ProgressBar::new(1);
+    p.set_style(ProgressStyle::with_template("{wide_msg}").unwrap());
+    p.set_message("Create default config");
+
     let cache_dir = dirs::cache_dir()
         .unwrap()
         .join("modlist")
@@ -89,10 +95,10 @@ fn create_config(path: &str) -> MLE<()> {
     let default_cfg = Cfg {
         data: cache_dir.clone(),
         cache: format!("{}/cache", cache_dir),
-        versions: cache_dir.clone(),
+        versions: cache_dir,
         defaults: Defaults {
             modloader: Modloader::Fabric,
-            version: VersionLevel::Release
+            version: VersionLevel::Release,
         },
         apis: Apis {
             modrinth: String::from("https://api.modrinth.com/v2/"),
@@ -101,37 +107,36 @@ fn create_config(path: &str) -> MLE<()> {
     create_dir_all(path.split("config.toml").collect::<Vec<&str>>()[0])?;
     let mut file = File::create(path)?;
     file.write_all(toml::to_string(&default_cfg)?.as_bytes())?;
-    println!(" ✓");
+    p.finish_with_message(format!("Created default config ({})", path));
     Ok(())
 }
 
 fn create_database(path: &str) -> MLE<()> {
-    print!("No database found, create base");
-    //Force flush of stdout, else print! doesn't print instantly
-    std::io::stdout().flush()?;
+    let p = ProgressBar::new(1);
+    p.set_style(ProgressStyle::with_template("{wide_msg}").unwrap());
+    p.set_message("Create database");
 
     File::create(path)?;
     db_setup(path)?;
-    println!(" ✓");
+    p.finish_with_message(format!("Created database ({})", path));
     Ok(())
 }
 
 fn create_cache(path: &str) -> MLE<()> {
-    print!("No cache direcory found, create one");
-    //Force flush of stdout, else print! doesn't print instantly
-    std::io::stdout().flush()?;
+    let p = ProgressBar::new(1);
+    p.set_style(ProgressStyle::with_template("{wide_msg}").unwrap());
+    p.set_message("Create cache");
 
     create_dir_all(path)?;
-    println!(" ✓");
+    p.finish_with_message(format!("Created cache ({})", path));
     Ok(())
 }
 
 async fn create_versions_dummy(path: &str) -> MLE<()> {
-    print!("No version file found, create dummy");
-    //Force flush of stdout, else print! doesn't print instantly
-    std::io::stdout().flush()?;
-
+    let p = ProgressBar::new(1);
+    p.set_style(ProgressStyle::with_template("{wide_msg}").unwrap());
+    p.set_message("Create version file");
     File::create(path)?;
-    println!(" ✓");
+    p.finish_with_message(format!("Created version file ({})", path));
     Ok(())
 }