fix(print): Print the last installed weidu mod from the weidu.log in the game directory (#181)

Author: dark0dave

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mod_installer"
-version = "11.4.0"
+version = "11.4.1"
 edition = "2021"
 authors = [ "dark0dave" ]
 documentation = "https://raw.githubusercontent.com/dark0dave/mod_installer/main/README.md"

Cargo.toml

@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { } }:
 pkgs.rustPlatform.buildRustPackage rec {
   pname = "mod_installer";
-  version = "11.4.0";
+  version = "11.4.1";
   cargoLock.lockFile = ./Cargo.lock;
   src = pkgs.lib.cleanSource ./.;
   buildInputs = with pkgs; [

default.nix

@@ -3,9 +3,6 @@ with import <nixpkgs> {};
 stdenv.mkDerivation {
   name = "rust-env";
   buildInputs = [
-    cargo
-    git
-    gnupg
     openssl
     pre-commit
     rustup

shell.nix

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 use std::{collections::HashMap, error::Error, path::Path, sync::Arc};
 
-use crate::utils::{delete_folder, search_or_download, validate_install};
+use crate::utils::{delete_folder, get_last_installed, search_or_download};
 use crate::{
     config::args::{Eet, Options},
     config::parser_config::ParserConfig,
@@ -56,7 +56,7 @@ pub(crate) fn normal_install(
         }
 
         if !mod_folder_present_in_game_directory(&game_directory, &weidu_mod.name) {
-            log::info!(
+            log::debug!(
                 "Copying mod directory, from {:?} to, {:?}",
                 mod_folder,
                 game_directory.join(&weidu_mod.name)
@@ -73,10 +73,14 @@ pub(crate) fn normal_install(
                 .into());
             }
             InstallationResult::Success => {
-                if options.check_last_installed {
-                    validate_install(game_dir, weidu_mod)?;
+                let last_installed = get_last_installed(game_dir)?;
+                if options.check_last_installed && last_installed.ne(weidu_mod) {
+                    return Err(format!(
+                        "Last installed {last_installed:?} does not match component installed: {weidu_mod:?}"
+                    )
+                    .into());
                 }
-                log::info!("Installed mod {:?}", &weidu_mod);
+                log::info!("Installed mod {:?}", &last_installed);
             }
             InstallationResult::Warnings(msg) => {
                 log::warn!("{msg}");

src/installers.rs

@@ -160,19 +160,11 @@ pub fn try_download_mod(weidu_mod: &Component) -> Result<PathBuf, Box<dyn Error>
     }
 }
 
-pub fn validate_install(game_dir: &Path, component: &Component) -> Result<(), Box<dyn Error>> {
+pub fn get_last_installed(game_dir: &Path) -> Result<Component, Box<dyn Error>> {
     let file = File::open(game_dir.join("weidu.log"))?;
     let reader = BufReader::new(file);
     let last_line = reader.lines().last().ok_or("")??;
-    let last_installed = Component::try_from(last_line)?;
-    if last_installed.ne(component) {
-        Err(format!(
-            "Last installed {last_installed:?} does not match component installed: {component:?}"
-        )
-        .into())
-    } else {
-        Ok(())
-    }
+    Component::try_from(last_line)
 }
 
 pub fn sleep(millis: u64) {