groundwork for downloads; cleanup

3 files changed, 17 insertions, 18 deletions

diff --git a/src/commands/download.rs b/src/commands/download.rs
index b0efdc2..421f058 100644
--- a/src/commands/download.rs
+++ b/src/commands/download.rs
@@ -1,9 +1,22 @@
-use crate::{modrinth::Version, files::download_file};
+use crate::{files::get_downloaded_versions, db::{userlist_get_all_applicable_versions_with_mods, userlist_get_all_current_versions_with_mods}};
 #[allow(unused_imports)]
 use crate::{List, get_current_list, config::Cfg, db::userlist_get_all_downloads, input::Input};
 
-pub async fn download(_config: Cfg, _input: Input) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn download(config: Cfg, _input: Input) -> Result<(), Box<dyn std::error::Error>> {
+
+    let current_list = get_current_list(config.clone())?;
+
     println!("NO IMPLEMENTATION FOR DOWNLOAD YET");
+
+    let downloaded_versions = get_downloaded_versions(current_list.clone())?;
+    println!("DL: {:?}", downloaded_versions);
+
+    let current_version_ids = userlist_get_all_current_versions_with_mods(config.clone(), String::from(&current_list.id))?;
+    println!("CU: {:?}", current_version_ids);
+
+    let applicable_version_ids = userlist_get_all_applicable_versions_with_mods(config, current_list.id)?;
+    println!("AP: {:?}", applicable_version_ids);
+    
     /*
     let list = get_current_list(config.clone())?;
 
@@ -34,18 +47,4 @@ async fn download_links(_config: Cfg, _input: Input, _current_list: List, _links
     Ok(String::new())
 }
 
-pub async fn download_versions(current_list: List, versions: Vec<Version>) -> Result<String, Box<dyn std::error::Error>> {
-
-    let dl_path = String::from(&current_list.download_folder);
-
-    for ver in versions {
-        let primary_file = ver.files.into_iter().find(|file| file.primary).unwrap();
-        let mut splitname: Vec<&str> = primary_file.filename.split('.').collect();
-        let extension = splitname.pop().ok_or("NO_FILE_EXTENSION")?;
-        let filename = format!("{}.mr{}.{}", splitname.join("."), ver.id, extension);
-        download_file(primary_file.url, current_list.clone().download_folder, filename).await?;
-    }
-
-    Ok(dl_path)
-}
 
diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index f36c8c6..91243fc 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,6 +1,6 @@
 use std::io::{Error, ErrorKind};
 
-use crate::{modrinth::{project, versions, extract_current_version, Version}, config::Cfg, db::{mods_insert, userlist_remove, mods_get_id, userlist_insert, mods_get_all_ids, userlist_get_all_ids, userlist_get_current_version, lists_get_all_ids, mods_remove}, input::{Input, Subcmd}, get_current_list, download_versions, files::delete_version};
+use crate::{modrinth::{project, versions, extract_current_version, Version}, config::Cfg, db::{mods_insert, userlist_remove, mods_get_id, userlist_insert, mods_get_all_ids, userlist_get_all_ids, userlist_get_current_version, lists_get_all_ids, mods_remove}, input::{Input, Subcmd}, get_current_list, files::{delete_version, download_versions}};
 
 pub async fn modification(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
     
diff --git a/src/commands/update.rs b/src/commands/update.rs
index bf13319..eeb5a4d 100644
--- a/src/commands/update.rs
+++ b/src/commands/update.rs
@@ -1,6 +1,6 @@
 use std::{io::{Error, ErrorKind}, fs::rename};
 
-use crate::{config::Cfg, modrinth::{projects, Project, versions, extract_current_version, Version}, get_current_list, db::{userlist_get_all_ids, mods_get_versions, userlist_get_applicable_versions, userlist_change_versions, lists_get_all_ids, lists_get, userlist_get_current_version, userlist_add_disabled_versions, mods_change_versions}, List, input::Input, files::{get_file_path, delete_version}, download_versions};
+use crate::{config::Cfg, modrinth::{projects, Project, versions, extract_current_version, Version}, get_current_list, db::{userlist_get_all_ids, mods_get_versions, userlist_get_applicable_versions, userlist_change_versions, lists_get_all_ids, lists_get, userlist_get_current_version, userlist_add_disabled_versions, mods_change_versions}, List, input::Input, files::{get_file_path, delete_version, download_versions}};
 
 pub async fn update(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {