From 4bf4224808ef110d42d95586fc6f00f40faa6fba Mon Sep 17 00:00:00 2001 From: Jaby Date: Fri, 11 Nov 2022 16:02:36 +0100 Subject: [PATCH] Prepare using arguments and options --- src/Tools/Tools.code-workspace | 2 +- src/Tools/psxcdgen_ex/src/file_writer/mod.rs | 4 +++- src/Tools/psxcdgen_ex/src/main.rs | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Tools/Tools.code-workspace b/src/Tools/Tools.code-workspace index cb999dea..2ddd7452 100644 --- a/src/Tools/Tools.code-workspace +++ b/src/Tools/Tools.code-workspace @@ -78,7 +78,7 @@ { "id": "cargo run args", "type": "pickString", - "options": ["", "--help"], + "options": ["", "--help", "psx bin-cue -o wuff.bin ../Tests/ISO_Planschbecken.xml"], "default": "", "description": "Argument options to pass to cargo run" } diff --git a/src/Tools/psxcdgen_ex/src/file_writer/mod.rs b/src/Tools/psxcdgen_ex/src/file_writer/mod.rs index cac02056..3eb4bd9d 100644 --- a/src/Tools/psxcdgen_ex/src/file_writer/mod.rs +++ b/src/Tools/psxcdgen_ex/src/file_writer/mod.rs @@ -35,9 +35,11 @@ pub trait SectorWriter { fn write(&mut self, sector: Sector) -> Result; } -pub fn write_image(cd_desc: CDDesc, encoder: EncoderFunction, image_type: ImageType, output_path: PathBuf) -> Result<(), Error> { +pub fn write_image(cd_desc: CDDesc, encoder: EncoderFunction, image_type: ImageType, mut output_path: PathBuf) -> Result<(), Error> { match image_type { ImageType::BinCue => { + output_path.set_extension("bin"); + let cue_output_path = { let mut cue_output_path = output_path.clone(); diff --git a/src/Tools/psxcdgen_ex/src/main.rs b/src/Tools/psxcdgen_ex/src/main.rs index 5e02d56b..1295306c 100644 --- a/src/Tools/psxcdgen_ex/src/main.rs +++ b/src/Tools/psxcdgen_ex/src/main.rs @@ -9,7 +9,7 @@ struct CommandLine { #[clap(value_enum, value_parser)] system_type: SystemType, - #[clap(value_enum, value_parser, default_value_t=OutputType::BinCue)] + #[clap(value_enum, value_parser)] output_type: OutputType, #[clap(short='o')] @@ -48,7 +48,7 @@ fn run_main() -> Result<(), Error> { } println!("\n<== Planschbecken ==>\nStart encoding"); - write_image(desc, encode_psx_image, ImageType::BinCue, PathBuf::from_str("planschi.bin")?) + write_image(desc, encode_psx_image, ImageType::BinCue, PathBuf::from_str("planschi")?) } fn main() {