feat(newDir): Better new direcory flag, allows normal and eet install to work (#150)

dark0dave · web-flow · commit 718bfc53f97b · 2025-03-28T17:48:17.000Z
diff --git a/.envrc-sample b/.envrc-sample
@@ -1 +1,3 @@
+set -a
 use nix
+mkdir -p $TMPDIR
diff --git a/shell.nix b/shell.nix
@@ -2,14 +2,8 @@ with import <nixpkgs> {};
 
 stdenv.mkDerivation {
   name = "rust-env";
-  nativeBuildInputs = [
-    # Build-time Additional Dependencies
-    cargo
-    pkg-config
-    rustc
-  ];
   buildInputs = [
-    # Run-time Additional Dependencies
+    cargo
     git
     gnupg
     pre-commit
diff --git a/src/config/args.rs b/src/config/args.rs
@@ -2,7 +2,6 @@ use std::env::{split_paths, var_os};
 use std::fmt::Debug;
 use std::fs;
 use std::path::PathBuf;
-use std::time::{SystemTime, UNIX_EPOCH};
 
 use clap::Subcommand;
 use clap::{builder::BoolishValueParser, builder::OsStr, Parser};
@@ -67,6 +66,10 @@ pub(crate) struct Normal {
     #[clap(env, short, long, value_parser = parse_absolute_path, required = true)]
     pub(crate) game_directory: PathBuf,
 
+    /// Instead of operating on an existing directory, create a new one with this flag as its name and then copy the original contents into it.
+    #[clap(env, long, short = 'n', required = false)]
+    pub(crate) new_game_directory: Option<PathBuf>,
+
     /// CommonOptions
     #[clap(flatten)]
     pub(crate) options: Options,
@@ -92,26 +95,23 @@ pub(crate) struct Eet {
     #[clap(env, short='z', long, value_parser = path_must_exist, required = true)]
     pub(crate) bg2_log_file: PathBuf,
 
-    /// Instead of using given directories create new ones with files copied into them
+    /// Instead of operating on an existing directory, create a new one with this flag as its name and then copy the original contents into it.
     #[clap(
         env,
-        short='g',
+        short,
         long,
         action = clap::ArgAction::SetTrue,
         required = false,
     )]
-    pub(crate) create_directories: bool,
+    pub(crate) generate_directories: bool,
 
-    /// When create_directories is true, this is the prefix which the created directories have
-    #[clap(
-        env,
-        long,
-        short = 'p',
-        default_value_t = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs().to_string(),
-        default_missing_value = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs().to_string(),
-        required = false
-    )]
-    pub(crate) create_directories_prefix: String,
+    /// If generate_directories is true. This is the path for the new pre-eet directory.
+    #[clap(env, short = 'p', long, value_parser = path_must_exist)]
+    pub(crate) new_pre_eet_dir: Option<PathBuf>,
+
+    /// If generate_directories is true. This is the path for the new eet directory.
+    #[clap(env, short = 'n', long, value_parser = path_must_exist)]
+    pub(crate) new_eet_dir: Option<PathBuf>,
 
     /// CommonOptions
     #[clap(flatten)]
@@ -185,15 +185,26 @@ pub(crate) struct Options {
     pub(crate) timeout: usize,
 
     /// Weidu log setting "--autolog" is default
-    #[clap(env, long, short='u', default_value = "autolog", value_parser = parse_weidu_log_mode, required = false)]
+    #[clap(
+        env,
+        long,
+        short='u',
+        default_value = "autolog",
+        value_parser = parse_weidu_log_mode,
+        required = false
+    )]
     pub(crate) weidu_log_mode: String,
 
     /// Strict Version and Component/SubComponent matching
     #[clap(
         env,
         short = 'x',
         long,
+        num_args=0..=1,
         action = clap::ArgAction::SetTrue,
+        default_value_t = false,
+        default_missing_value = "false",
+        value_parser = BoolishValueParser::new(),
         required = false,
     )]
     pub(crate) strict_matching: bool,
@@ -324,6 +335,7 @@ mod tests {
                 command: InstallType::Normal(Normal {
                     log_file: fake_log_file.clone(),
                     game_directory: fake_game_dir.clone(),
+                    new_game_directory: None,
                     options: Options {
                         weidu_binary: fake_weidu_bin.clone(),
                         mod_directories: vec![fake_mod_dirs.clone()],
@@ -333,7 +345,7 @@ mod tests {
                         abort_on_warnings: expected_flag_value,
                         timeout: 3600,
                         weidu_log_mode: "--autolog".to_string(),
-                        strict_matching: true,
+                        strict_matching: false,
                     },
                 }),
             };
@@ -360,7 +372,7 @@ mod tests {
         let fake_game_dir = std::env::current_dir().unwrap().join("fixtures");
         let fake_weidu_bin = fake_game_dir.clone().join("weidu");
         let fake_log_file = fake_game_dir.clone().join("weidu.log");
-        let prefix = "prefix";
+        let new_dir = PathBuf::new().join("test");
         let expected_flag_value = true;
 
         let expected = Args {
@@ -380,18 +392,19 @@ mod tests {
                     weidu_log_mode: "--autolog".to_string(),
                     strict_matching: !expected_flag_value,
                 },
-                create_directories: true,
-                create_directories_prefix: prefix.to_string(),
+                generate_directories: false,
+                new_pre_eet_dir: None,
+                new_eet_dir: Some("test".into()),
             }),
         };
         let test_arg_string = format!(
-            "mod_installer eet -w {} -1 {} -y {} -2 {} -z {} -g -p {}",
+            "mod_installer eet -w {} -1 {} -y {} -2 {} -z {} -n {}",
             fake_weidu_bin.to_str().unwrap_or_default(),
             fake_game_dir.to_str().unwrap_or_default(),
             fake_log_file.to_str().unwrap_or_default(),
             fake_game_dir.to_str().unwrap_or_default(),
             fake_log_file.to_str().unwrap_or_default(),
-            prefix,
+            new_dir.to_str().unwrap_or_default(),
         );
         let result = Args::parse_from(test_arg_string.split(' '));
         assert_eq!(
diff --git a/src/installers.rs b/src/installers.rs
@@ -0,0 +1,133 @@
+use std::path::PathBuf;
+use std::{collections::HashMap, error::Error, path::Path, sync::Arc};
+
+use crate::{
+    config::args::{Eet, Options},
+    config::parser_config::ParserConfig,
+    utils::{
+        clone_directory, copy_folder, find_mods, find_parent_folder,
+        mod_folder_present_in_game_directory, search_mod_folders,
+    },
+    weidu::{install, InstallationResult},
+};
+
+const EET: &str = "eet";
+const PRE_EET: &str = "pre-eet";
+
+pub(crate) fn normal_install(
+    log_file: &Path,
+    game_dir: &Path,
+    new_game_directory: &Option<PathBuf>,
+    options: &Options,
+    parser_config: Arc<ParserConfig>,
+) -> Result<(), Box<dyn Error>> {
+    let game_directory = if let Some(new_game_dir) = new_game_directory.clone() {
+        clone_directory(game_dir, &new_game_dir)?
+    } else {
+        game_dir.to_path_buf()
+    };
+
+    let mods_to_be_installed = match find_mods(
+        log_file,
+        options.skip_installed,
+        &game_directory,
+        options.strict_matching,
+    ) {
+        Ok(mods) => mods,
+        Err(err) => {
+            return Err(format!("Failed to find weidu log file, {:?}", err).into());
+        }
+    };
+
+    let mut mod_folder_cache = HashMap::new();
+    for weidu_mod in &mods_to_be_installed {
+        let mod_folder = mod_folder_cache
+            .entry(weidu_mod.tp_file.clone())
+            .or_insert_with(|| {
+                search_mod_folders(&options.mod_directories, weidu_mod, options.depth).unwrap()
+            });
+
+        log::debug!("Found mod folder {:?}, for mod {:?}", mod_folder, weidu_mod);
+
+        if !mod_folder_present_in_game_directory(&game_directory, &weidu_mod.name) {
+            log::info!(
+                "Copying mod directory, from {:?} to, {:?}",
+                mod_folder,
+                game_directory.join(&weidu_mod.name)
+            );
+            copy_folder(mod_folder, game_directory.join(&weidu_mod.name))?;
+        }
+        log::info!("Installing mod {:?}", &weidu_mod);
+        match install(
+            &options.weidu_binary,
+            &game_directory,
+            parser_config.clone(),
+            weidu_mod,
+            &options.language,
+            &options.weidu_log_mode,
+            options.timeout,
+        ) {
+            InstallationResult::Fail(message) => {
+                return Err(format!(
+                    "Failed to install mod {}, error is '{}'",
+                    weidu_mod.name, message
+                )
+                .into());
+            }
+            InstallationResult::Success => {
+                log::info!("Installed mod {:?}", &weidu_mod);
+            }
+            InstallationResult::Warnings => {
+                if options.abort_on_warnings {
+                    return Err(
+                        format!("Installed mod {:?} with warnings, stopping", weidu_mod).into(),
+                    );
+                } else {
+                    log::warn!("Installed mod {:?} with warnings, keep going", weidu_mod);
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
+pub(crate) fn eet_install(
+    command: &Eet,
+    parser_config: Arc<ParserConfig>,
+) -> Result<(), Box<dyn Error>> {
+    log::info!("Beginning pre eet install process");
+    let new_game_directory: Option<PathBuf> = if command.generate_directories {
+        if command.new_pre_eet_dir.is_none() {
+            Some(find_parent_folder(&command.bg1_game_directory)?.join(PRE_EET))
+        } else {
+            command.new_pre_eet_dir.clone()
+        }
+    } else {
+        None
+    };
+    normal_install(
+        &command.bg1_log_file,
+        &command.bg1_game_directory,
+        &new_game_directory,
+        &command.options,
+        parser_config.clone(),
+    )?;
+
+    log::info!("Beginning eet install process");
+    let new_game_directory: Option<PathBuf> = if command.generate_directories {
+        if command.new_eet_dir.is_none() {
+            Some(find_parent_folder(&command.bg2_game_directory)?.join(EET))
+        } else {
+            command.new_eet_dir.clone()
+        }
+    } else {
+        None
+    };
+    normal_install(
+        &command.bg2_log_file,
+        &command.bg2_game_directory,
+        &new_game_directory,
+        &command.options,
+        parser_config.clone(),
+    )
+}
diff --git a/src/main.rs b/src/main.rs
diff --git a/src/utils.rs b/src/utils.rs

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+set -a`
`1`	`2`	`use nix`
	`3`	`+mkdir -p $TMPDIR`