Specify config file, not config directory in cli.

Author: Dirbaio

java-spaghetti-gen/src/config.rs

@@ -249,6 +249,13 @@ impl Config {
         }
     }
 
+    /// Read configuration from a specific file path.
+    pub fn from_file(path: &Path) -> io::Result<Self> {
+        let mut file = fs::File::open(path)?;
+        let config_dir = path.parent().unwrap_or(Path::new("."));
+        Self::read(&mut file, config_dir)
+    }
+
     pub fn resolve_class(&self, class: &str) -> ClassConfig<'_> {
         let mut res = ClassConfig {
             include: false,

java-spaghetti-gen/src/main.rs

@@ -6,14 +6,12 @@ mod emit;
 mod identifiers;
 mod parser_util;
 
-fn main() {
-    entry::main();
-}
-
 use std::error::Error;
 use std::fs::File;
 use std::io::{self, Read};
-use std::path::Path;
+use std::path::{Path, PathBuf};
+
+use clap::{Parser, Subcommand};
 
 use crate::config::Config;
 use crate::parser_util::JavaClass;
@@ -97,49 +95,48 @@ fn gather_file(context: &mut emit::Context, path: &Path) -> Result<(), Box<dyn E
     Ok(())
 }
 
-mod entry {
-    use std::path::PathBuf;
-
-    use clap::{Parser, Subcommand};
-
-    use crate::{config, run};
-
-    /// Autogenerate glue code for access Android JVM APIs from Rust
-    #[derive(Parser, Debug)]
-    #[command(version, about)]
-    struct Cli {
-        #[command(subcommand)]
-        cmd: Cmd,
-    }
-
-    /// Doc comment
-    #[derive(Subcommand, Debug)]
-    enum Cmd {
-        Generate(GenerateCmd),
-    }
+/// Autogenerate glue code for access Android JVM APIs from Rust
+#[derive(Parser, Debug)]
+#[command(version, about)]
+struct Cli {
+    #[command(subcommand)]
+    cmd: Cmd,
+}
 
-    #[derive(Parser, Debug)]
-    struct GenerateCmd {
-        /// Log in more detail
-        #[arg(short, long)]
-        verbose: bool,
+/// Doc comment
+#[derive(Subcommand, Debug)]
+enum Cmd {
+    Generate(GenerateCmd),
+}
 
-        /// Sets a custom directory
-        #[arg(short, long, default_value = ".")]
-        directory: PathBuf,
-    }
+#[derive(Parser, Debug)]
+struct GenerateCmd {
+    /// Log in more detail
+    #[arg(short, long)]
+    verbose: bool,
 
-    pub fn main() {
-        let cli = Cli::parse();
+    /// Sets a custom config file
+    #[arg(short, long)]
+    config: Option<PathBuf>,
+}
 
-        match cli.cmd {
-            Cmd::Generate(cmd) => {
-                let mut config = config::Config::from_directory(&cmd.directory).unwrap();
-                if cmd.verbose {
-                    config.logging_verbose = true;
-                }
-                run(config).unwrap();
+pub fn main() {
+    let cli = Cli::parse();
+
+    match cli.cmd {
+        Cmd::Generate(cmd) => {
+            let mut config = if let Some(config_path) = cmd.config {
+                // Use specified config file
+                config::Config::from_file(&config_path).unwrap()
+            } else {
+                // Search from current working directory
+                config::Config::from_current_directory().unwrap()
+            };
+
+            if cmd.verbose {
+                config.logging_verbose = true;
             }
+            run(config).unwrap();
         }
     }
 }