From 74ad7aa0365143d5f3357d65d8d97015e2436a1e Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 28 Feb 2024 01:01:04 +0100 Subject: [PATCH] cli: Add argument for output filename --- shank-cli/src/lib.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/shank-cli/src/lib.rs b/shank-cli/src/lib.rs index f1e8d4f..6f4ae33 100644 --- a/shank-cli/src/lib.rs +++ b/shank-cli/src/lib.rs @@ -25,6 +25,11 @@ pub enum Command { #[clap(short, long, default_value = "idl")] out_dir: String, + /// Output filename for the IDL JSON [default: .json, + /// e.g. "my_program.json"] + #[clap(long)] + out_filename: Option, + /// Directory of program crate for which to generate the IDL. #[clap(short = 'r', long)] crate_root: Option, @@ -39,9 +44,10 @@ pub fn entry(opts: Opts) -> Result<()> { match opts.command { Command::Idl { out_dir, + out_filename, crate_root, program_id, - } => idl(out_dir, crate_root, program_id), + } => idl(out_dir, out_filename, crate_root, program_id), } } @@ -66,6 +72,7 @@ pub fn try_resolve_path(p: Option, label: &str) -> Result { pub fn idl( out_dir: String, + out_filename: Option, crate_root: Option, program_id: Option, ) -> Result<()> { @@ -107,8 +114,12 @@ pub fn idl( let idl_json = idl.try_into_json()?; // Write to JSON file - let name = manifest.lib_name()?; - let idl_json_path = out_dir.join(format!("{}.json", name)); + let out_filename = if let Some(out_filename) = out_filename { + out_filename + } else { + format!("{}.json", manifest.lib_name()?) + }; + let idl_json_path = out_dir.join(out_filename); let mut idl_json_file = File::create(&idl_json_path)?; info!("Writing IDL to {}", &idl_json_path.display());