feat(writer): Create a seperate writer

Signed-off-by: dark0dave <dark0dave@mykolab.com>

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 default_install_hook_types: [pre-commit, commit-msg]
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
     - id: check-added-large-files
       exclude: (?x)^([models/fixtures|docs])
@@ -29,7 +29,7 @@ repos:
       stages: [pre-commit]
 
 - repo: https://github.com/commitizen-tools/commitizen
-  rev: v3.27.0
+  rev: v3.30.0
   hooks:
     - id: commitizen
       stages: [commit-msg]

Cargo.toml

@@ -8,8 +8,10 @@ edition = "2021"
 [workspace]
 
 [dependencies]
-binrw = "0.14.0"
-clap = { version = "4.0", features = ["derive"] }
+binrw = "^0.14.1"
+clap = { version = "^4.0", features = ["derive", "env"] }
+env_logger = "^0.11.1"
 erased-serde = "0.4"
+log = "^0.4.22"
 models = { path = "./models" }
-serde_json = "1.0"
+serde_json = "^1.0"

models/Cargo.toml

@@ -6,12 +6,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-binrw = "0.14.0"
-erased-serde = "0.4"
-flate2 = { version = "1.0.17" }
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.94"
+binrw = "^0.14.1"
+erased-serde = "^0.4"
+flate2 = { version = "^1.0.17" }
+serde = { version = "^1.0.189", features = ["derive"] }
+serde_json = "^1.0.94"
 
 [dev-dependencies]
-pretty_assertions = "1.3.0"
-tempfile = "3"
+pretty_assertions = "^1.3.0"
+tempfile = "^3"

models/src/common/types.rs

@@ -1,5 +1,7 @@
 #![allow(dead_code, unused_variables)]
 
+use std::{error::Error, path::Path};
+
 use binrw::{BinRead, BinWrite};
 use serde::{Deserialize, Serialize};
 
@@ -106,6 +108,16 @@ impl std::fmt::Display for ResourceType {
     }
 }
 
+impl TryFrom<&Path> for ResourceType {
+    type Error = Box<dyn Error>;
+    fn try_from(value: &Path) -> Result<Self, Self::Error> {
+        let extension = value.extension().ok_or("Path has no extension")?;
+        Ok(Self::from(
+            extension.to_str().ok_or("Could not convert to string")?,
+        ))
+    }
+}
+
 impl From<&str> for ResourceType {
     fn from(value: &str) -> Self {
         match value.to_ascii_lowercase().as_str() {

src/args.rs

@@ -1,20 +1,45 @@
-use clap::{ArgAction, Parser};
+use std::path::PathBuf;
+
+use clap::{error::ErrorKind, ArgAction, Error, Parser};
 
 #[derive(Parser, Debug)]
 #[clap(author, version, about, long_about = None)]
 pub struct Args {
     /// Game lang
-    #[clap(long, value_parser, default_value = "en_US")]
+    #[clap(env, short = 'l', long, value_parser, default_value = "en_US")]
     pub game_lang: String,
     /// Flag to process tiles
-    #[clap(long, short, action=ArgAction::SetTrue)]
+    #[clap(env, long, short, action=ArgAction::SetTrue)]
     pub tiles: bool,
     /// Flag to tlk file
-    #[clap(long, short, action=ArgAction::SetFalse)]
+    #[clap(env, long, short, action=ArgAction::SetTrue)]
     pub process_tlk: bool,
-    /// Json Output
-    #[clap(long, short, action=ArgAction::SetTrue)]
-    pub json: bool,
+    /// Output Format, expects json(j), binary(b), print(p), or none(empty value)
+    #[clap(env, long, short, value_parser=output_format_parser, default_value = "")]
+    pub output_format: String,
+    /// Filename or prefix to extract [WARNING: EXPERIMENTAL]
+    #[clap(env, long, short, default_value = "")]
+    pub extract: String,
+    /// Turn a json into an ie file type [WARNING: EXPERIMENTAL]
+    #[clap(env, short='i', long, action=ArgAction::SetTrue)]
+    pub to_ie_type: bool,
+    /// Read Save game
+    #[clap(env, long, short, action=ArgAction::SetTrue)]
+    pub save: bool,
+    /// Read Save game
+    #[clap(env, long, short, default_value = ".")]
+    pub destination: PathBuf,
     /// The path to the file to read
-    pub resource_file_or_dir: std::path::PathBuf,
+    #[clap(env, long, short)]
+    pub resource_file_or_dir: PathBuf,
+}
+
+fn output_format_parser(input: &str) -> Result<String, clap::Error> {
+    match input.to_lowercase().as_str() {
+        "json" | "j" => Ok("json".to_string()),
+        "binary" | "bin" | "b" => Ok("binary".to_string()),
+        "" | "n" | "no" | "none" => Ok("".to_string()),
+        "p" | "print" => Ok("print".to_string()),
+        _ => Err(Error::new(ErrorKind::ValueValidation)),
+    }
 }