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

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

1 files changed, 29 insertions, 12 deletions

diff --git a/src/commands/io.rs b/src/commands/io.rs
index e072f00..dd294bc 100644
--- a/src/commands/io.rs
+++ b/src/commands/io.rs
@@ -4,9 +4,9 @@ use std::io::prelude::*;
 
 use crate::{
     config::Cfg,
-    db::{lists_get, lists_get_all_ids, lists_insert, userlist_get_all_ids},
+    db::{lists_get, lists_get_all_ids, lists_insert, userlist_get_set_version, userlist_get_all_ids, userlist_get_current_version},
     error::MLE,
-    mod_add, IDSelector, List, Modloader,
+    mod_add, IDSelector, List, Modloader, AddMod,
 };
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -15,9 +15,24 @@ struct Export {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
+struct ExportVersion {
+    version: String,
+    set: bool
+}
+
+impl ExportVersion {
+    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)?
+        })
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
 struct ExportList {
     id: String,
-    mods: String,
+    versions: Vec<ExportVersion>,
     launcher: String,
     mc_version: String,
     download_folder: Option<String>,
@@ -32,11 +47,15 @@ impl ExportList {
             dl_folder = Some(list.download_folder)
         };
 
-        let mods = userlist_get_all_ids(config, list_id)?.join("|");
+        let mods = userlist_get_all_ids(config.clone(), &list_id)?;
+        let mut versions = vec![];
+        for m in mods {
+            versions.push(ExportVersion::from(config.clone(), &list_id, &m)?)
+        }
 
         Ok(Self {
             id: list.id,
-            mods,
+            versions,
             launcher: list.modloader.to_string(),
             mc_version: list.mc_version,
             download_folder: dl_folder,
@@ -86,14 +105,12 @@ pub async fn import(config: Cfg, file_str: String, direct_download: bool) -> MLE
             list.modloader.clone(),
             String::from(&list.download_folder),
         )?;
-        let mods: Vec<&str> = exportlist.mods.split('|').collect();
-        let mut mod_ids = vec![];
-        for mod_id in mods {
-            mod_ids.push(IDSelector::ModificationID(String::from(mod_id)));
+
+        let mut ver_ids = vec![];
+        for id in exportlist.versions {
+            ver_ids.push(AddMod { id: IDSelector::VersionID(id.version), set_version: id.set} );
         }
-        //TODO impl set_version and good direct download
-        //TODO impl all at once, dafuck ?done?
-        mod_add(config.clone(), mod_ids, list, direct_download, false).await?;
+        mod_add(config.clone(), ver_ids, list, direct_download).await?;
     }
     Ok(())
 }