Merge pull request 'todos' (#5) from todos into master

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

1 files changed, 48 insertions, 20 deletions

diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index 216a06e..9a1a651 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,4 +1,4 @@
-use std::io::Write;
+use std::{io::Write, collections::HashMap};
 
 use crate::{
     config::Cfg,
@@ -12,6 +12,12 @@ use crate::{
     List,
 };
 
+#[derive(Debug, Clone)]
+pub struct AddMod {
+    pub id: IDSelector,
+    pub set_version: bool
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum IDSelector {
     ModificationID(String),
@@ -26,26 +32,26 @@ pub struct ProjectInfo {
     pub current_version: Option<Version>,
     pub applicable_versions: Vec<String>,
     pub download_link: String,
+    pub set_version: bool,
 }
 
 pub async fn mod_add(
     config: Cfg,
-    ids: Vec<IDSelector>,
+    mods: Vec<AddMod>,
     list: List,
     direct_download: bool,
-    set_version: bool,
 ) -> MLE<()> {
     println!("Add mods to {}", list.id);
     println!("  └Add mods:");
 
-    let mut mod_ids: Vec<String> = Vec::new();
-    let mut ver_ids: Vec<String> = Vec::new();
+    let mut mod_ids: Vec<(String, bool)> = Vec::new();
+    let mut ver_ids: Vec<(String, bool)> = Vec::new();
 
     //"Sort" project ids from version ids to be able to handle them differently but in a batch
-    for id in ids {
-        match id {
-            IDSelector::ModificationID(pid) => mod_ids.push(pid),
-            IDSelector::VersionID(vid) => ver_ids.push(vid),
+    for m in mods {
+        match m.id {
+            IDSelector::ModificationID(pid) => mod_ids.push((pid, m.set_version)),
+            IDSelector::VersionID(vid) => ver_ids.push((vid, m.set_version)),
         }
     }
 
@@ -83,7 +89,7 @@ pub async fn mod_add(
             &current_version_id,
             project.clone().applicable_versions,
             &project.download_link,
-            set_version,
+            project.set_version,
         ) {
             Err(e) => {
                 let expected_err = format!("SQL: UNIQUE constraint failed: {}.mod_id", list.id);
@@ -128,13 +134,23 @@ pub async fn mod_add(
     Ok(())
 }
 
-async fn get_mod_infos(config: Cfg, mod_ids: Vec<String>, list: List) -> MLE<Vec<ProjectInfo>> {
+async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) -> MLE<Vec<ProjectInfo>> {
+
+    let mut setmap: HashMap<String, bool> = HashMap::new();
+
+    let mut ids = vec![];
+
+    for id in mod_ids {
+        setmap.insert(id.0.to_string(), id.1);
+        ids.push(id.0);
+    }
+
     let mut projectinfo: Vec<ProjectInfo> = Vec::new();
 
     //Get required information from mod_ids
-    let m_projects = match mod_ids.len() {
-        1 => vec![project(&config.apis.modrinth, &mod_ids[0]).await],
-        2.. => projects(&config.apis.modrinth, mod_ids).await,
+    let m_projects = match ids.len() {
+        1 => vec![project(&config.apis.modrinth, &ids[0]).await],
+        2.. => projects(&config.apis.modrinth, ids).await,
         _ => panic!("PANIC"),
     };
     for project in m_projects {
@@ -180,12 +196,13 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<String>, list: List) -> MLE<Vec
             }
 
             projectinfo.push(ProjectInfo {
-                mod_id: project.id,
+                mod_id: String::from(&project.id),
                 slug: project.slug,
                 title: project.title,
                 current_version,
                 applicable_versions: available_versions_vec,
                 download_link: file,
+                set_version: setmap.get(&project.id).unwrap().clone(),
             })
         } else {
             println!("\t  └There's currently no mod version for your specified target");
@@ -193,12 +210,13 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<String>, list: List) -> MLE<Vec
             file = String::from("NONE");
             available_versions_vec.push(String::from("NONE"));
             projectinfo.push(ProjectInfo {
-                mod_id: project.id,
+                mod_id: String::from(&project.id),
                 slug: project.slug,
                 title: project.title,
                 current_version,
                 applicable_versions: available_versions_vec,
                 download_link: file,
+                set_version: setmap.get(&project.id).unwrap().clone(),
             })
         }
     }
@@ -206,11 +224,20 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<String>, list: List) -> MLE<Vec
     Ok(projectinfo)
 }
 
-async fn get_ver_info(config: Cfg, ver_ids: Vec<String>) -> MLE<Vec<ProjectInfo>> {
+async fn get_ver_info(config: Cfg, ver_ids: Vec<(String, bool)>) -> MLE<Vec<ProjectInfo>> {
+
+    let mut setmap: HashMap<String, bool> = HashMap::new();
+
+    let mut ids = vec![];
+
+    for id in ver_ids {
+        setmap.insert(id.0.to_string(), id.1);
+        ids.push(id.0);
+    }
     let mut projectinfo: Vec<ProjectInfo> = Vec::new();
 
     //Get required information from ver_ids
-    let mut v_versions = get_raw_versions(&config.apis.modrinth, ver_ids).await;
+    let mut v_versions = get_raw_versions(&config.apis.modrinth, ids).await;
     let mut v_mod_ids: Vec<String> = Vec::new();
     for ver in v_versions.clone() {
         v_mod_ids.push(ver.project_id);
@@ -230,12 +257,13 @@ async fn get_ver_info(config: Cfg, ver_ids: Vec<String>) -> MLE<Vec<ProjectInfo>
             .unwrap()
             .url;
         projectinfo.push(ProjectInfo {
-            mod_id: project.id,
+            mod_id: String::from(&project.id),
             slug: project.slug,
             title: project.title,
             current_version: Some(version.clone()),
             applicable_versions: vec![String::from(&version.id)],
             download_link: file,
+            set_version: setmap.get(&version.id).unwrap().clone(),
         })
     }
     Ok(projectinfo)
@@ -281,7 +309,7 @@ pub fn mod_remove(config: Cfg, id: &str, list: List) -> MLE<()> {
     // Remove mod from main list if not used elsewhere
     let mut mod_used = false;
     for id in list_ids {
-        let mods = match userlist_get_all_ids(config.clone(), id) {
+        let mods = match userlist_get_all_ids(config.clone(), &id) {
             Ok(m) => m,
             Err(err) => {
                 if err.to_string() ==  "Database: NO_MODS_USERLIST" {