cw2 magwells not in magazines

BrettMayson · Oct 14, 2023 · d389e49 · d389e49
1 parent 6a6111e
commit d389e49
Show file tree

Hide file tree

Showing 37 changed files with 371 additions and 129 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,6 +8,7 @@ members = [
     "libs/config",
     "libs/pbo",
     "libs/preprocessor",
+    "libs/project",
     "libs/signing",
 ]
 resolver = "2"

diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -20,6 +20,7 @@ hemtt-common = { path = "../libs/common", version = "1.0.0" }
 hemtt-config = { path = "../libs/config", version = "1.0.0" }
 hemtt-pbo = { path = "../libs/pbo", version = "1.0.1" }
 hemtt-preprocessor = { path = "../libs/preprocessor", version = "1.0.0" }
+hemtt-project = { path = "../libs/project", version = "1.0.0" }
 hemtt-signing = { path = "../libs/signing", version = "1.0.0" }
 
 anyhow = "1.0.75"
@@ -42,7 +43,6 @@ serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 steamlocate = "2.0.0-alpha.0"
 time = { version = "0.3.29", features = ["formatting"] }
-toml = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3.17", features = ["json"] }
 vfs = { workspace = true }

diff --git a/bin/src/addons.rs b/bin/src/addons.rs
@@ -1,14 +1,15 @@
 use std::{fs::DirEntry, path::PathBuf, str::FromStr};
 
 use hemtt_common::prefix::{self, Prefix};
+use hemtt_project::AddonConfig;
 
-use crate::{config::addon::Configuration, error::Error};
+use crate::error::Error;
 
 #[derive(Debug, Clone)]
 pub struct Addon {
     name: String,
     location: Location,
-    config: Option<Configuration>,
+    config: Option<AddonConfig>,
     prefix: Prefix,
 }
 
@@ -26,7 +27,7 @@ impl Addon {
             config: {
                 let path = path.join("addon.toml");
                 if path.exists() {
-                    Some(Configuration::from_file(&path)?)
+                    Some(AddonConfig::from_file(&path)?)
                 } else {
                     None
                 }
@@ -86,7 +87,7 @@ impl Addon {
     }
 
     #[must_use]
-    pub const fn config(&self) -> Option<&Configuration> {
+    pub const fn config(&self) -> Option<&AddonConfig> {
         self.config.as_ref()
     }
 

diff --git a/bin/src/commands/launch.rs b/bin/src/commands/launch.rs
@@ -1,9 +1,10 @@
 use std::path::{Path, PathBuf};
 
 use clap::{ArgMatches, Command};
+use hemtt_project::ProjectConfig;
 use steamlocate::SteamDir;
 
-use crate::{config::project::Configuration, error::Error, utils::create_link};
+use crate::{error::Error, utils::create_link};
 
 use super::dev;
 
@@ -37,7 +38,7 @@ pub fn cli() -> Command {
 /// # Errors
 /// [`Error`] depending on the modules
 pub fn execute(matches: &ArgMatches) -> Result<(), Error> {
-    let config = Configuration::from_file(&Path::new(".hemtt").join("project.toml"))?;
+    let config = ProjectConfig::from_file(&Path::new(".hemtt").join("project.toml"))?;
     let Some(mainprefix) = config.mainprefix() else {
         return Err(Error::MainPrefixNotFound(String::from(
             "Required for launch",

diff --git a/bin/src/config/mod.rs b/bin/src/config/mod.rs
diff --git a/bin/src/context.rs b/bin/src/context.rs
@@ -5,12 +5,13 @@ use std::{
 };
 
 use hemtt_common::workspace::{Workspace, WorkspacePath};
+use hemtt_project::ProjectConfig;
 
-use crate::{addons::Addon, config::project::Configuration, error::Error};
+use crate::{addons::Addon, error::Error};
 
 #[derive(Debug, Clone)]
 pub struct Context {
-    config: Configuration,
+    config: ProjectConfig,
     folder: String,
     addons: Vec<Addon>,
     workspace: WorkspacePath,
@@ -37,7 +38,7 @@ impl Context {
             if !path.exists() {
                 return Err(Error::ConfigNotFound);
             }
-            Configuration::from_file(&path)?
+            ProjectConfig::from_file(&path)?
         };
         let tmp = {
             let mut tmp = temp_dir().join("hemtt");
@@ -80,12 +81,12 @@ impl Context {
         };
         {
             let version = config.version().get(workspace.vfs());
-            if let Err(Error::Git(_)) = version {
+            if let Err(hemtt_project::Error::Git(_)) = version {
                 error!("Failed to find a git repository with at least one commit, if you are not using git add the following to your project.toml");
                 println!("\n[version]\ngit_hash = 0\n");
                 std::process::exit(1);
             };
-            info!("Config loaded for {} {}", config.name(), version?,);
+            info!("Config loaded for {} {}", config.name(), version?);
         }
         Ok(Self {
             config,
@@ -102,7 +103,7 @@ impl Context {
     #[must_use]
     pub fn filter<F>(self, mut filter: F) -> Self
     where
-        F: FnMut(&Addon, &Configuration) -> bool,
+        F: FnMut(&Addon, &ProjectConfig) -> bool,
     {
         let config = self.config.clone();
         Self {
@@ -116,7 +117,7 @@ impl Context {
     }
 
     #[must_use]
-    pub const fn config(&self) -> &Configuration {
+    pub const fn config(&self) -> &ProjectConfig {
         &self.config
     }
 

diff --git a/bin/src/error.rs b/bin/src/error.rs
@@ -4,8 +4,6 @@ use hemtt_common::error::thiserror;
 pub enum Error {
     #[error("`.hemtt/project.toml` not found")]
     ConfigNotFound,
-    #[error("Invalid config: {0}")]
-    ConfigInvalid(String),
     #[error("Launch config not found: {0}")]
     LaunchConfigNotFound(String),
 
@@ -53,6 +51,8 @@ pub enum Error {
     Pbo(#[from] hemtt_pbo::Error),
     #[error("Prefix error: {0}")]
     Prefix(#[from] hemtt_common::prefix::Error),
+    #[error("`a hemtt project file is invalid: {0}")]
+    Project(#[from] hemtt_project::Error),
     #[error("Signing error: {0}")]
     Signing(#[from] hemtt_signing::Error),
     #[error("Version Error: {0}")]
@@ -75,8 +75,6 @@ pub enum Error {
     Io(#[from] std::io::Error),
     #[error("serde_json Error: {0}")]
     SerdeJson(#[from] serde_json::Error),
-    #[error("Toml Error: {0}")]
-    Toml(#[from] toml::de::Error),
     #[error("Vfs Error {0}")]
     Vfs(Box<vfs::VfsError>),
     #[error("Walkdir Error: {0}")]

diff --git a/bin/src/lib.rs b/bin/src/lib.rs
@@ -10,7 +10,6 @@ extern crate tracing;
 
 pub mod addons;
 pub mod commands;
-pub mod config;
 pub mod context;
 pub mod error;
 pub mod executor;

diff --git a/bin/src/modules/rapifier.rs b/bin/src/modules/rapifier.rs
@@ -79,7 +79,7 @@ impl Module for Rapifier {
     }
 }
 
-pub fn rapify(path: WorkspacePath, _ctx: &Context) -> (Vec<String>, Result<(), Error>) {
+pub fn rapify(path: WorkspacePath, ctx: &Context) -> (Vec<String>, Result<(), Error>) {
     let processed = match Processor::run(&path) {
         Ok(processed) => processed,
         Err(e) => {
@@ -92,7 +92,7 @@ pub fn rapify(path: WorkspacePath, _ctx: &Context) -> (Vec<String>, Result<(), E
             messages.push(warning);
         }
     }
-    let configreport = parse(&processed);
+    let configreport = parse(Some(ctx.config()), &processed);
     if let Err(errors) = configreport {
         for e in &errors {
             eprintln!("{e}");

diff --git a/libs/config/Cargo.toml b/libs/config/Cargo.toml
@@ -12,6 +12,7 @@ bench = false
 hemtt-common = { path = "../common", version = "1.0.0" }
 
 hemtt-preprocessor = { path = "../preprocessor", version = "1.0.0" }
+hemtt-project = { path = "../project", version = "1.0.0" }
 
 ariadne = { workspace = true }
 byteorder = { workspace = true }