Merge branch 'main' of https://github.com/geode-sdk/cli into main

Author: HJfod

src/file.rs

@@ -8,7 +8,8 @@ pub fn read_dir_recursive(src: &PathBuf) -> Result<Vec<PathBuf>, io::Error> {
 	for item in fs::read_dir(src)? {
 		let path = item?.path();
 		if path.is_dir() {
-			res.extend(read_dir_recursive(src)?);
+			res.extend(read_dir_recursive(&path)?);
+			res.push(path);
 		} else {
 			res.push(path);
 		}

src/index.rs

@@ -1,5 +1,5 @@
 use crate::config::Config;
-use crate::file::copy_dir_recursive;
+use crate::file::{copy_dir_recursive, read_dir_recursive};
 use crate::util::logging::ask_value;
 use crate::util::mod_file::{parse_mod_info, try_parse_mod_info};
 use crate::{done, fatal, info, warn, NiceUnwrap};
@@ -180,11 +180,12 @@ pub fn index_mods_dir(config: &Config) -> PathBuf {
 }
 
 pub fn get_entry(config: &Config, id: &String, version: &VersionReq) -> Option<Entry> {
-	for dir in index_mods_dir(config)
-		.read_dir()
-		.nice_unwrap("Unable to read index")
-	{
-		let path = dir.unwrap().path();
+	let dir = index_mods_dir(config).join(id);
+
+	for path in {
+		read_dir_recursive(&dir)
+			.nice_unwrap("Unable to read index")
+	} {
 		let Ok(mod_info) = try_parse_mod_info(&path) else {
 			continue;
 		};
@@ -198,6 +199,7 @@ pub fn get_entry(config: &Config, id: &String, version: &VersionReq) -> Option<E
 			);
 		}
 	}
+
 	None
 }
 

src/project.rs

@@ -150,14 +150,25 @@ impl Found {
 fn find_dependency(
 	dep: &Dependency,
 	dir: &PathBuf,
-	search_recursive: bool
+	search_recursive: bool,
+	mods_v2: bool
 ) -> Result<Found, std::io::Error> {
 	// for checking if the id was possibly misspelled, it must be at most 3 
 	// steps away from the searched one
 	let mut closest_score = 4usize;
 	let mut found = Found::None;
+	let mut dir = dir.clone();
+	
+	// this doesnt work with the fuzzy search misspelling check or whatever
+	// someone else can fix it i dont care kthx
+	if mods_v2 {
+		dir = dir.join(&dep.id);
+		if !dir.exists() {
+			return Ok(Found::None);
+		}
+	}
 	for dir in if search_recursive {
-		read_dir_recursive(dir)?
+		read_dir_recursive(&dir)?
 	} else {
 		dir.read_dir()?.map(|d| d.unwrap().path()).collect()
 	} {
@@ -273,12 +284,12 @@ pub fn check_dependencies(
 
 		// check index
 		let found_in_index = find_dependency(
-			&dep, &index_mods_dir(config), false
+			&dep, &index_mods_dir(config), true, true
 		).nice_unwrap("Unable to read index");
 
 		// check installed mods
 		let found_in_installed = find_dependency(
-			&dep, &config.get_current_profile().mods_dir(), true
+			&dep, &config.get_current_profile().mods_dir(), true, false
 		).nice_unwrap("Unable to read installed mods");
 
 		// if not found in either        hjfod  code

src/project_build.rs

@@ -80,6 +80,9 @@ pub fn build_project(
 				if cfg!(target_os = "windows") && !extra_conf_args.contains(&"-G".to_owned()) {
 					conf_args.extend(["-G", "Ninja"].map(String::from));
 				}
+				conf_args.push("-DCMAKE_EXPORT_COMPILE_COMMANDS=1".into());
+				// TODO: cli cant install to a mobile device, yet
+				conf_args.push("-DGEODE_DONT_INSTALL_MODS=1".into());
 			}
 		}
 		_ => unreachable!("invalid platform"),