1 files changed, 10 insertions, 11 deletions

diff --git a/src/db.rs b/src/db.rs
index 5d82271..6b1e3ab 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -2,7 +2,7 @@ use std::io::{Error, ErrorKind};
 
 use rusqlite::Connection;
 
-use crate::{Modloader, config::Cfg, List, get_modloader};
+use crate::{Modloader, config::Cfg, List};
 
 //mods
 pub fn mods_insert(config: Cfg, id: String, name: String, versions: Vec<String>) -> Result<(), Box<dyn std::error::Error>> {
@@ -226,14 +226,14 @@ pub fn userlist_get_all_downloads(config: Cfg, list_id: String) -> Result<Vec<St
 }
 
 //lists
-pub fn lists_insert(config: Cfg, id: String, mc_version: String, mod_loader: Modloader) -> Result<(), Box<dyn std::error::Error>> {
+pub fn lists_insert(config: Cfg, id: String, mc_version: String, mod_loader: Modloader, download_folder: String) -> Result<(), Box<dyn std::error::Error>> {
     println!("Creating list {}", id);
 
     let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
-    connection.execute("INSERT INTO lists VALUES (?1, ?2, ?3)", [id.clone(), mc_version, mod_loader.stringify()])?;
-    connection.execute(format!("CREATE TABLE {}( 'mod_id' TEXT, 'current_version' TEXT, 'applicable_versions' BLOB, 'current_download' TEXT)", id).as_str(), [])?;
+    connection.execute("INSERT INTO lists VALUES (?1, ?2, ?3, ?4)", [id.clone(), mc_version, mod_loader.stringify(), download_folder])?;
+    connection.execute(format!("CREATE TABLE {}( 'mod_id' TEXT, 'current_version' TEXT, 'applicable_versions' BLOB, 'current_download' TEXT )", id).as_str(), [])?;
 
     Ok(())
 }
@@ -251,16 +251,16 @@ pub fn lists_get(config: Cfg, list_id: String) -> Result<List, Box<dyn std::erro
     let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
-    let mut list = List { id: String::new(), mc_version: String::new(), modloader: Modloader::Fabric };
-    let mut stmt = connection.prepare("SELECT mc_version, modloader FROM lists WHERE id = ?")?;
+    let mut list = List { id: String::new(), mc_version: String::new(), modloader: Modloader::Fabric, download_folder: String::new() };
+    let mut stmt = connection.prepare("SELECT mc_version, modloader, download_folder FROM lists WHERE id = ?")?;
 
     let list_iter = stmt.query_map([&list_id], |row| {
-        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?])
+        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?, row.get::<usize, String>(2)?])
     })?;
 
     for l in list_iter {
         let li = l?;
-        list = List { id: String::from(&list_id), mc_version: String::from(&li[0]), modloader: get_modloader(String::from(&li[1]))? };
+        list = List { id: String::from(&list_id), mc_version: String::from(&li[0]), modloader: Modloader::from(&li[1])?, download_folder: String::from(&li[2]) };
     };
 
     if list.id.is_empty() { return Err(Box::new(Error::new(ErrorKind::Other, "LIST_NOT_FOUND"))); }
@@ -378,11 +378,10 @@ pub fn db_setup(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
     connection.execute_batch(
         "CREATE TABLE 'user_config' ( 'id' TEXT, 'value' TEXT );
          CREATE TABLE 'mods' ( 'id' TEXT, 'name' TEXT, 'versions' TEXT );
-         CREATE TABLE 'lists' ( 'id' TEXT, 'mc_version' TEXT, 'modloader' TEXT );
-         INSERT INTO 'user_config' VALUES ( 'db_version', '0.2' );
+         CREATE TABLE 'lists' ( 'id' TEXT, 'mc_version' TEXT, 'modloader' TEXT, 'download_folder' TEXT );
+         INSERT INTO 'user_config' VALUES ( 'db_version', '0.3' );
          INSERT INTO 'user_config' VALUES ( 'current_list', '...' )",
     )?;
     
     Ok(())
 }
-