mods without a fomod config can now be installed

This commit is contained in:
2026-03-03 16:02:06 +01:00
parent d84db4b0c1
commit f2042be088

View File

@@ -1,15 +1,18 @@
use clap::Parser;
use log::debug;
use std::{error::Error, path::Path};
use std::{
error::Error,
fs,
path::{Path, PathBuf},
};
use crate::{
basic_types::{ModConfig, ModFile, ModdedInstance, RootConfig},
cli::Args,
fomod::Config,
linker::{create_plugins_txt, link_game_to_target, link_instance_to_target},
load_order::LoadOrder,
mod_config_installer::FomodInstaller,
utils::resolve_case_insensitive,
utils::{resolve_case_insensitive, walk_files_recursive},
};
mod basic_types;
@@ -22,31 +25,92 @@ mod load_order;
mod mod_config_installer;
mod utils;
pub fn load_mod_config(mod_root: impl AsRef<Path>) -> Result<fomod::Config, Box<dyn Error>> {
let path = resolve_case_insensitive(&mod_root, "fomod/ModuleConfig.xml")?;
let mod_config = Config::load_from_file(path)?;
Ok(mod_config)
}
pub fn gen_filelist_for_mod(
root_config: &RootConfig,
instance: &ModdedInstance,
mod_config: &ModConfig,
) -> Result<Vec<ModFile>, Box<dyn Error>> {
let mod_location = root_config.get_mod_location(mod_config);
let module_config = load_mod_config(&mod_location)?;
let module_config_path = resolve_case_insensitive(&mod_location, "fomod/ModuleConfig.xml")?;
let files: Vec<ModFile> = match module_config_path {
Some(path) => {
debug!("Found a ModuleConfig.xml");
gen_filelist_from_fomod(instance, path, &mod_location)?
}
None => {
debug!("Did not find a ModuleConfig.xml");
gen_filelist_from_mod_dir(&mod_location)?
}
};
Ok(files)
}
pub fn gen_filelist_from_mod_dir(
mod_location: impl AsRef<Path>,
) -> Result<Vec<ModFile>, Box<dyn Error>> {
// Check for Data dir in root
let files = match resolve_case_insensitive(&mod_location, "data")? {
Some(data_path) => gen_filelist_from_dir(data_path),
None => gen_filelist_from_dir(&mod_location),
}?;
let mod_files: Vec<_> = files
.iter()
.filter(|e| should_be_included(e))
.map(|e| ModFile::new(e, PathBuf::from("Data").join(e), 0))
.collect();
Ok(mod_files)
}
fn should_be_included(path: impl AsRef<Path>) -> bool {
matches!(
path.as_ref().extension().and_then(|e| e.to_str()),
Some(
"esp"
| "esm"
| "esl"
| "bsa"
| "ba2"
| "bsl"
| "ini"
| "pex"
| "psc"
| "strings"
| "ilstrings"
| "dlstrings"
| "dll"
)
)
}
pub fn gen_filelist_from_dir(path: impl AsRef<Path>) -> Result<Vec<PathBuf>, Box<dyn Error>> {
let files: Vec<_> = walk_files_recursive(&path)?
.map(|file| file.path().strip_prefix(&path).unwrap().to_owned())
.collect();
Ok(files)
}
pub fn gen_filelist_from_fomod(
instance: &ModdedInstance,
xml_path: impl AsRef<Path>,
mod_location: impl AsRef<Path>,
) -> Result<Vec<ModFile>, Box<dyn Error>> {
let module_config = fomod::Config::load_from_file(xml_path)?;
// TODO: add active plugins from instance config
let installer = FomodInstaller::new(module_config, vec![], install_prompt::prompt);
let files = installer.run();
let converted_files: Vec<_> = files
let mod_files: Vec<_> = files
.iter()
.flat_map(|f| ModFile::from_installer(f.clone(), &mod_location).unwrap())
.collect();
Ok(converted_files)
Ok(mod_files)
}
pub fn activate_instance(