feat(validate): Add validation to installer (#171)

Author: dark0dave

.envrc-sample

@@ -1,3 +1,3 @@
 set -a
 use nix
-mkdir -p $TMPDIR
+[[ -f "${TMPDIR}" ]] && mkdir -p "${TMPDIR}"

.github/workflows/main.yaml

@@ -52,8 +52,16 @@ jobs:
         with:
           name: mod_installer-${{ matrix.target }}${{ matrix.suffix }}
           path: ./target/release/mod_installer${{ matrix.suffix }}
+  build-nix:
+   runs-on: ubuntu-latest
+   steps:
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v31
+      with:
+        nix_path: nixpkgs=channel:nixos-25.05
+    - run: nix build -f default.nix
   release:
-    needs: [build, pre-commit]
+    needs: [build, build-nix, pre-commit]
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
     outputs:

Cargo.lock

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

Cargo.toml

@@ -372,14 +372,13 @@ See the `example_config.toml` for defaults parser uses. Here we provide a brief
 
 Name|Category|Description|Example
 ----|----|:----|----
-| in_progress_words | A list of words | Checks if weidu is currently running | ["installing", "creating",]
-| useful_status_words | A list of words | Provides feedback on the weidu process | ["copied", "copying",]
-| choice_words | A list of words | Words which check if weidu wants user input | ["choice", "choose",]
-| choice_phrase | A list of phrases | Phrases which check if weidu wants user input | ["do you want", "would you like",]
-| completed_with_warnings | A single phrase | Standard phrase wiedu uses if it finishes with warning | "installed with warnings"
-| failed_with_error | A single phrase | Standard phrase wiedu uses if it finishes with an error | "not installed due to errors"
-| finished | A single phrase | Standard phrase wiedu uses if it finishes successfully | "successfully installed"
-| eet_finished | A single phrase | A special exemption for EET for EET Core install | "process ended"
+| in_progress_words | A list of words | Checks if weidu is currently running | ["installing", "creating", ...]
+| useful_status_words | A list of words | Provides feedback on the weidu process | ["copied", "copying", ...]
+| choice_words | A list of words | Words which check if weidu wants user input | ["choice", "choose", ...]
+| choice_phrase | A list of phrases | Phrases which check if weidu wants user input | ["do you want", "would you like", ...]
+| completed_with_warnings | A list of phrases | Phrases which wiedu uses if it finishes with warning | ["installed with warnings", ...]
+| failed_with_error | A list of phrases | Phrases which wiedu uses if it finishes with an error | ["not installed due to errors", ...]
+| finished | A list of phrases | Phrases which wiedu uses if it finishes successfully | ["successfully installed","process ended", ...]
 
 Note: **All words/phrases are compared in lowercase ascii.**
 

README.md

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

default.nix

@@ -23,7 +23,14 @@ choice_phrase = [
     "do you want",
     "would you like",
 ]
-completed_with_warnings = "installed with warnings"
-failed_with_error = "not installed due to errors"
-finished = "successfully installed"
-eet_finished = "process ended"
+completed_with_warnings = [
+    "installed with warnings",
+]
+failed_with_error = [
+    "not installed due to errors",
+    "installation aborted",
+]
+finished = [
+    "successfully installed",
+    "process ended",
+]

example_config.toml

@@ -40,8 +40,7 @@ impl TryFrom<String> for Component {
         let install_path = parts
             .nth(1)
             .ok_or(format!(
-                "Could not get full name of mod, from provided string: {}",
-                line
+                "Could not get full name of mod, from provided string: {line}"
             ))?
             .to_string();
 
@@ -51,8 +50,7 @@ impl TryFrom<String> for Component {
                 .split('\\')
                 .next()
                 .ok_or(format!(
-                    "Could not split {} into mod into name and component",
-                    line
+                    "Could not split {line} into mod into name and component"
                 ))?
                 .to_ascii_lowercase();
             (windows_path.to_string(), name)
@@ -61,42 +59,34 @@ impl TryFrom<String> for Component {
                 .split('/')
                 .next()
                 .ok_or(format!(
-                    "Could not split {} into mod into name and component",
-                    line
+                    "Could not split {line} into mod into name and component"
                 ))?
                 .to_ascii_lowercase();
             (linux_path.to_string(), name)
         } else {
-            return Err(format!(
-                "Could not find tp2 file name, from provided string: {}",
-                line
-            )
-            .into());
+            return Err(
+                format!("Could not find tp2 file name, from provided string: {line}").into(),
+            );
         };
 
         let mut tail = parts
             .next()
             .ok_or(format!(
-                "Could not find lang and component, from provided string {}",
-                line
+                "Could not find lang and component, from provided string {line}"
             ))?
             .split("//");
 
         let mut lang_and_component = tail.next().unwrap_or_default().split(' ');
 
         let lang = lang_and_component
             .nth(1)
-            .ok_or(format!(
-                "Could not find lang, from provided string: {}",
-                line
-            ))?
+            .ok_or(format!("Could not find lang, from provided string: {line}"))?
             .replace('#', "");
 
         let component = lang_and_component
             .next()
             .ok_or(format!(
-                "Could not find component, from provided string {}",
-                line
+                "Could not find component, from provided string {line}"
             ))?
             .replace('#', "");
 

src/component.rs

@@ -234,7 +234,7 @@ fn parse_weidu_log_mode(arg: &str) -> Result<String, String> {
             "autolog" => output.push(format!("--{arg}")),
             "logapp" => output.push(format!("--{arg}")),
             "log-extern" => output.push(format!("--{arg}")),
-            _ => return Err(format!("{}, Provided {}", WEIDU_LOG_MODE_ERROR, arg)),
+            _ => return Err(format!("{WEIDU_LOG_MODE_ERROR}, Provided {arg}")),
         };
     }
     Ok(output.join(" "))
@@ -310,7 +310,7 @@ mod tests {
             ),
         ];
         for (test, expected) in tests {
-            println!("{:#?}", test);
+            println!("{test:#?}");
             let result = parse_weidu_log_mode(test);
             assert_eq!(
                 result, expected,