Shorten everything

Author: savannstm

src/main.rs

@@ -1,99 +1,66 @@
-use clap::{value_parser, Arg, ArgAction, ArgMatches, Command};
+use clap::{value_parser, ArgAction, Parser};
 use rpgmad_lib::Decrypter;
 use std::{
-    fs::read,
-    path::{Path, PathBuf},
+    fs::{read, read_dir},
+    path::PathBuf,
     time::Instant,
 };
 
-struct Localization<'a> {
-    // Arg descriptions
-    input_path_arg_desc: &'a str,
-    output_path_arg_desc: &'a str,
-    force_arg_desc: &'a str,
-    help_arg_desc: &'a str,
-    about: &'a str,
-
-    // Messages
-    input_path_missing_msg: &'a str,
-    output_path_missing_msg: &'a str,
+#[derive(Parser, Debug)]
+#[command(
+    about = "Extract encrypted .rgss RPG Maker archives.",
+    term_width = 120
+)]
+struct Cli {
+    /// Path to the .rgss file or directory containing it.
+    #[arg(short, long, value_parser = value_parser!(PathBuf), default_value = "./", hide_default_value = true)]
+    input_path: PathBuf,
+
+    /// Output directory.
+    #[arg(short, long, value_parser = value_parser!(PathBuf), default_value = "./", hide_default_value = true)]
+    output_path: PathBuf,
+
+    /// Overwrite existing files.
+    #[arg(short, long, action = ArgAction::SetTrue)]
+    force: bool,
 }
 
 fn main() {
     let start_time: Instant = Instant::now();
+    let mut cli: Cli = Cli::parse();
 
-    const LOCALIZATION: Localization = Localization {
-        input_path_arg_desc: "Path to the .rgss file.",
-        output_path_arg_desc: "Path to put output files.",
-        force_arg_desc: "Forcefully overwrite existing Data, Graphics and other files.",
-        help_arg_desc: "Prints the help message.",
-        about: "A tool to extract encrypted .rgss RPG Maker archives.",
-
-        input_path_missing_msg: "Input file does not exist.",
-        output_path_missing_msg: "Output path does not exist.",
-    };
-
-    let input_path_arg: Arg = Arg::new("input-path")
-        .short('i')
-        .long("input-file")
-        .help(LOCALIZATION.input_path_arg_desc)
-        .value_parser(value_parser!(PathBuf))
-        .default_value("./")
-        .hide_default_value(true);
-
-    let output_path_arg: Arg = Arg::new("output-path")
-        .short('o')
-        .long("output-dir")
-        .help(LOCALIZATION.output_path_arg_desc)
-        .value_parser(value_parser!(PathBuf))
-        .default_value("./")
-        .hide_default_value(true);
-
-    let force: Arg = Arg::new("force")
-        .short('f')
-        .long("force")
-        .help(LOCALIZATION.force_arg_desc)
-        .action(ArgAction::SetTrue);
-
-    let help: Arg = Arg::new("help")
-        .short('h')
-        .long("help")
-        .help(LOCALIZATION.help_arg_desc)
-        .action(ArgAction::Help);
-
-    let cli: Command = Command::new("")
-        .about(LOCALIZATION.about)
-        .disable_version_flag(true)
-        .disable_help_subcommand(true)
-        .disable_help_flag(true)
-        .next_line_help(true)
-        .term_width(120)
-        .args([input_path_arg, output_path_arg, force, help]);
-
-    let matches: ArgMatches = cli.get_matches();
-
-    let input_path: &Path = matches.get_one::<PathBuf>("input-path").unwrap();
-
-    if !input_path.exists() {
-        panic!("{}", LOCALIZATION.input_path_missing_msg)
+    if !cli.input_path.exists() {
+        panic!("Input path does not exist.");
     }
 
-    let mut output_path: &Path = matches.get_one::<PathBuf>("output-path").unwrap();
-    if *output_path.as_os_str() == *"./" {
-        output_path = unsafe { input_path.parent().unwrap_unchecked() }
+    if !cli.output_path.exists() {
+        panic!("Output path does not exist.");
     }
 
-    if !output_path.exists() {
-        panic!("{}", LOCALIZATION.output_path_missing_msg);
+    if cli
+        .input_path
+        .extension()
+        .and_then(|e| e.to_str())
+        .is_none_or(|e| !e.starts_with("rgss"))
+    {
+        cli.input_path = read_dir(&cli.input_path)
+            .unwrap()
+            .flatten()
+            .find(|e| {
+                e.path()
+                    .extension()
+                    .and_then(|ext| ext.to_str())
+                    .is_some_and(|ext| ext.starts_with("rgss"))
+            })
+            .map(|e| e.path())
+            .expect("No .rgss archive found in the directory.");
     }
 
-    let force_flag: bool = matches.get_flag("force");
-
-    let bytes: Vec<u8> = read(input_path).unwrap();
+    let bytes: Vec<u8> = read(&cli.input_path).unwrap();
 
     Decrypter::new(bytes)
-        .extract(output_path, force_flag)
+        .extract(&cli.output_path, cli.force)
         .unwrap();
 
-    println!("Elapsed: {}", start_time.elapsed().as_secs_f64())
+    println!("Elapsed: {:.2}s", start_time.elapsed().as_secs_f32());
 }